From 70857601ffe87ab130bc995223b33a2c4236600f Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 25 Nov 2022 17:42:42 +0100 Subject: [PATCH] Display hand cursor on radio buttons. Expand click size area on radiobuttons in call menu. --- .../ui/modules/Common/Form/RadioButton.qml | 8 ++++++++ .../ui/modules/Linphone/Menus/IncallMenu.qml | 15 +++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/linphone-app/ui/modules/Common/Form/RadioButton.qml b/linphone-app/ui/modules/Common/Form/RadioButton.qml index 8b27a6d10..449df7852 100644 --- a/linphone-app/ui/modules/Common/Form/RadioButton.qml +++ b/linphone-app/ui/modules/Common/Form/RadioButton.qml @@ -17,6 +17,14 @@ Control.RadioButton{ font.pointSize: RadioButtonStyle.pointSize spacing: 10 FontMetrics{id: fontMetrics} + + MouseArea{ + anchors.fill:parent + hoverEnabled: true + acceptedButtons: Qt.NoButton + cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor + } + indicator: Rectangle { height: fontMetrics.height - 5 width: height diff --git a/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml b/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml index 115b87b49..3a1bf0529 100644 --- a/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml +++ b/linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml @@ -166,13 +166,16 @@ Rectangle{ font.pointSize: IncallMenuStyle.list.pointSize color: IncallMenuStyle.list.color } - ActionButton{ + Icon{ Layout.minimumWidth: iconWidth Layout.rightMargin: 10 Layout.alignment: Qt.AlignVCenter - backgroundRadius: width/2 - isCustom: true - colorSet: IncallMenuStyle.buttons.next + //backgroundRadius: width/2 + + icon: IncallMenuStyle.buttons.next.icon + overwriteColor: IncallMenuStyle.buttons.next.backgroundNormalColor + iconWidth: IncallMenuStyle.buttons.next.iconSize + iconHeight: IncallMenuStyle.buttons.next.iconSize } } MouseArea{ @@ -236,6 +239,10 @@ Rectangle{ Layout.preferredHeight: Math.max(layoutIcon.height, radio.contentItem.implicitHeight) + 20 Layout.fillWidth: true enabled: mainItem.callModel && !mainItem.callModel.updating + MouseArea{ + anchors.fill: parent + onClicked: radio.clicked() + } RowLayout{ anchors.fill: parent