diff --git a/src/imports/FluentUI/Controls/FluCopyableText.qml b/src/imports/FluentUI/Controls/FluCopyableText.qml index 9d81dda3..3b339175 100644 --- a/src/imports/FluentUI/Controls/FluCopyableText.qml +++ b/src/imports/FluentUI/Controls/FluCopyableText.qml @@ -14,6 +14,7 @@ TextEdit { leftPadding: 0 rightPadding: 0 topPadding: 0 + selectByMouse: true selectedTextColor: FluColors.Grey220 bottomPadding: 0 selectionColor: FluTheme.primaryColor.lightest @@ -21,9 +22,11 @@ TextEdit { onSelectedTextChanged: { control.forceActiveFocus() } - TapHandler { + MouseArea{ + anchors.fill: parent + cursorShape: Qt.IBeamCursor acceptedButtons: Qt.RightButton - onTapped: control.echoMode !== TextInput.Password && menu.popup() + onClicked: control.echoMode !== TextInput.Password && menu.popup() } FluTextBoxMenu{ id:menu diff --git a/src/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/imports/FluentUI/Controls/FluMultilineTextBox.qml index bcd83207..aa89fd30 100644 --- a/src/imports/FluentUI/Controls/FluMultilineTextBox.qml +++ b/src/imports/FluentUI/Controls/FluMultilineTextBox.qml @@ -41,9 +41,11 @@ TextArea{ Keys.onBackPressed: { control.commit() } - TapHandler { + MouseArea{ + anchors.fill: parent + cursorShape: Qt.IBeamCursor acceptedButtons: Qt.RightButton - onTapped: control.echoMode !== TextInput.Password && menu.popup() + onClicked: control.echoMode !== TextInput.Password && menu.popup() } FluTextBoxMenu{ id:menu diff --git a/src/imports/FluentUI/Controls/FluPasswordBox.qml b/src/imports/FluentUI/Controls/FluPasswordBox.qml index 2a5cdf53..3dfae874 100644 --- a/src/imports/FluentUI/Controls/FluPasswordBox.qml +++ b/src/imports/FluentUI/Controls/FluPasswordBox.qml @@ -71,10 +71,6 @@ TextField{ rightMargin: icon_end.visible ? 25 : 5 } } - TapHandler { - acceptedButtons: Qt.RightButton - onTapped: control.echoMode !== TextInput.Password && menu.popup() - } FluTextBoxMenu{ id:menu inputItem: control diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml index 1c1a7e86..2d6b06fa 100644 --- a/src/imports/FluentUI/Controls/FluTableView.qml +++ b/src/imports/FluentUI/Controls/FluTableView.qml @@ -59,7 +59,6 @@ Rectangle { } } } - ScrollView{ id:scroll_table anchors.left: header_vertical.right diff --git a/src/imports/FluentUI/Controls/FluTextBox.qml b/src/imports/FluentUI/Controls/FluTextBox.qml index 6f3b4b57..111a0388 100644 --- a/src/imports/FluentUI/Controls/FluTextBox.qml +++ b/src/imports/FluentUI/Controls/FluTextBox.qml @@ -56,6 +56,12 @@ TextField{ } } } + MouseArea{ + anchors.fill: parent + cursorShape: Qt.IBeamCursor + acceptedButtons: Qt.RightButton + onClicked: control.echoMode !== TextInput.Password && menu.popup() + } FluIconButton{ iconSource:FluentIcons.ChromeClose iconSize: 10 @@ -76,10 +82,6 @@ TextField{ control.text = "" } } - TapHandler { - acceptedButtons: Qt.RightButton - onTapped: control.echoMode !== TextInput.Password && menu.popup() - } FluTextBoxMenu{ id:menu inputItem: control