Make gesture allowance declarative

sailfishos · Jun 8, 2016 · 7617b68 · 7617b68
1 parent 5ae2c3d
commit 7617b68
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/qml/LayoutWindow.qml b/qml/LayoutWindow.qml
@@ -124,10 +124,7 @@ Rectangle {
         Transition {
             from: "*"
             to: "*"
-            SequentialAnimation {
-                PropertyAnimation { target: layoutWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
-                ScriptAction { script: window.updateGesturesAllowed(); }
-            }
+            PropertyAnimation { target: layoutWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
         }
     ]
 }
diff --git a/qml/Main.qml b/qml/Main.qml
@@ -29,6 +29,13 @@ Item {
 
     property string windowTitle: util.currentWindowTitle();
 
+    Binding {
+        target: util
+        property: "allowGestures"
+        value: !vkb.active && !menu.showing && urlWindow.state != "visible" && aboutDialog.state != "visible"
+               && layoutWindow.state != "visible"
+    }
+
     Item {
         id: page
 
@@ -278,9 +285,6 @@ Item {
         MenuFingerterm {
             id: menu
             anchors.fill: parent
-            onShowingChanged: {
-                window.updateGesturesAllowed();
-            }
         }
 
         TextRender {
@@ -401,7 +405,6 @@ Item {
             vkb.active = true;
             lineView.setPosition(vkb.active);
             setTextRenderAttributes();
-            updateGesturesAllowed();
         }
 
         function sleepVKB()
@@ -411,7 +414,6 @@ Item {
             vkb.active = false;
             lineView.setPosition(vkb.active);
             setTextRenderAttributes();
-            updateGesturesAllowed();
         }
 
         function setTextRenderAttributes()
@@ -479,15 +481,6 @@ Item {
             window.color = "#ffffff"
         }
 
-        function updateGesturesAllowed()
-        {
-            if(vkb.active || menu.showing || urlWindow.state=="visible" ||
-                    aboutDialog.state=="visible" || layoutWindow.state=="visible")
-                util.allowGestures = false;
-            else
-                util.allowGestures = true;
-        }
-
         function setOrientationLockMode(stringMode)
         {
             util.setSettingsValue("ui/orientationLockMode", stringMode);

diff --git a/qml/NotifyWin.qml b/qml/NotifyWin.qml
@@ -86,10 +86,7 @@ Rectangle {
         Transition {
             from: "*"
             to: "*"
-            SequentialAnimation {
-                PropertyAnimation { target: notifyWin; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
-                ScriptAction { script: window.updateGesturesAllowed(); }
-            }
+            PropertyAnimation { target: notifyWin; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
         }
     ]
 }
diff --git a/qml/UrlWindow.qml b/qml/UrlWindow.qml
@@ -125,10 +125,7 @@ Rectangle {
         Transition {
             from: "*"
             to: "*"
-            SequentialAnimation {
-                PropertyAnimation { target: urlWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
-                ScriptAction { script: window.updateGesturesAllowed(); }
-            }
+            PropertyAnimation { target: urlWindow; properties: "y"; duration: 200; easing.type: Easing.InOutCubic }
         }
     ]
 }