diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-10-29 17:10:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2014-10-29 21:50:20 +0100 |
| commit | 174d4fbbb85b6894e0773bc423269a5df64d3f59 (patch) | |
| tree | 9b0430bd41787c11bf0044d11176949e3844922a | |
| parent | 67609e43e19338be9bd57217ca7e0a08be319fc1 (diff) | |
| download | qtquickcontrols-174d4fbbb85b6894e0773bc423269a5df64d3f59.tar.gz | |
text input: fix disabling of action logic when there is a menu assigned
The "menu.source" check added by 38b908a is always true even
for an empty url => use "menu.item" instead.
Change-Id: Ic9004dff18c848a720ea1c414b2921158a367778
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
| -rw-r--r-- | src/controls/Private/TextInputWithHandles.qml | 4 | ||||
| -rw-r--r-- | src/controls/TextArea.qml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/Private/TextInputWithHandles.qml b/src/controls/Private/TextInputWithHandles.qml index 2ba6d693..3c8351a3 100644 --- a/src/controls/Private/TextInputWithHandles.qml +++ b/src/controls/Private/TextInputWithHandles.qml @@ -106,14 +106,14 @@ TextInput { cursorShape: Qt.IBeamCursor acceptedButtons: (input.selectByMouse ? Qt.NoButton : Qt.LeftButton) | (control.menu ? Qt.RightButton : Qt.NoButton) onClicked: { - if (editMenu.source) + if (editMenu.item) return; var pos = input.positionAt(mouse.x, mouse.y) input.moveHandles(pos, pos) input.activate() } onPressAndHold: { - if (editMenu.source) + if (editMenu.item) return; var pos = input.positionAt(mouse.x, mouse.y) input.moveHandles(pos, control.selectByMouse ? -1 : pos) diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 873417dc..8acdb6dc 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -851,14 +851,14 @@ ScrollView { cursorShape: edit.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor acceptedButtons: (edit.selectByMouse ? Qt.NoButton : Qt.LeftButton) | (area.menu ? Qt.RightButton : Qt.NoButton) onClicked: { - if (editMenu.source) + if (editMenu.item) return; var pos = edit.positionAt(mouse.x, mouse.y) edit.moveHandles(pos, pos) edit.activate() } onPressAndHold: { - if (editMenu.source) + if (editMenu.item) return; var pos = edit.positionAt(mouse.x, mouse.y) edit.moveHandles(pos, area.selectByMouse ? -1 : pos) |