From ebbf3629ae53755c3b5dd0912585a40545f391fc Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Fri, 26 Sep 2014 14:46:06 +0200
Subject: Button: trigger menu on touch release

Change-Id: Iee9f0105ef23fcb3ed2db7228f26c93d4491ac44
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
---
 src/controls/Button.qml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index 74d46bf1..bd862d45 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -109,7 +109,11 @@ BasicButton {
     Connections {
         target: __behavior
         onEffectivePressedChanged: {
-            if (__behavior.effectivePressed && menu)
+            if (!Settings.hasTouchScreen && __behavior.effectivePressed && menu)
+                popupMenuTimer.start()
+        }
+        onReleased: {
+            if (Settings.hasTouchScreen && __behavior.containsMouse && menu)
                 popupMenuTimer.start()
         }
     }
-- 
cgit v1.2.1