From c869a4038fa9b8e2174dd6dd97295fab733c153f Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Sun, 7 Dec 2014 00:25:34 +0100 Subject: 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 --- src/controls/Private/EditMenu_ios.qml | 1 + 1 file changed, 1 insertion(+) 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)) { -- cgit v1.2.1