summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2014-12-07 00:25:34 +0100
committerRichard Moe Gustavsen <richard.gustavsen@theqtcompany.com>2014-12-08 10:13:37 +0100
commitc869a4038fa9b8e2174dd6dd97295fab733c153f (patch)
tree5708b26066f86ca67b1fcb920e894bc08e657f7e
parent9a88a502a101082ede63c3773d2d5905f44f9063 (diff)
downloadqtquickcontrols-c869a4038fa9b8e2174dd6dd97295fab733c153f.tar.gz
iOS: only show menu if the control got active focus
If the control looses active focus, we start a timer to update menu visibility. But when the timer fires and we do the actual update, we didn't test for active focus, which meant that we would show the menu when we really meant to close it. Change-Id: I6881e62be3a6cf4d82489663bc6d848d1dcf57d2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/Private/EditMenu_ios.qml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/Private/EditMenu_ios.qml b/src/controls/Private/EditMenu_ios.qml
index 2d74861e..44ff7709 100644
--- a/src/controls/Private/EditMenu_ios.qml
+++ b/src/controls/Private/EditMenu_ios.qml
@@ -170,6 +170,7 @@ Item {
return;
if ((__showMenuFromTouchAndHold || selectionStart !== selectionEnd)
+ && control.activeFocus
&& (!cursorHandle.pressed && !selectionHandle.pressed)
&& (!flickable || !flickable.moving)
&& (cursorHandle.delegate)) {