From 174d4fbbb85b6894e0773bc423269a5df64d3f59 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 29 Oct 2014 17:10:44 +0100 Subject: 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 --- src/controls/Private/TextInputWithHandles.qml | 4 ++-- src/controls/TextArea.qml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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) -- cgit v1.2.1