Merge pull request #3216 from NaterGator/touchsettingsfix

Fix opening QML based settings is twitchy and unreliable

Merge pull request #3216 from NaterGator/touchsettingsfix
Fix opening QML based settings is twitchy and unreliable
b612e4cd · Don Gagne · 3592063d · 495dbb6c · b612e4cd
Commit b612e4cd authored Apr 12, 2016 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

MainWindowLeftPanel.qml src/ui/MainWindowLeftPanel.qml +8 -4

No files found.
--- a/src/ui/MainWindowLeftPanel.qml
+++ b/src/ui/MainWindowLeftPanel.qml
@@ -114,7 +114,8 @@ Item {
        MouseArea {
            anchors.fill: parent
            onClicked: {
-                mainWindow.hideLeftMenu()
+                if (!__animateShowDialog.running)
+                    mainWindow.hideLeftMenu()
            }
        }
    }
@@ -264,7 +265,8 @@ Item {
        anchors.right:  parent.right
        height:         toolBar.height
        onClicked: {
-            mainWindow.hideLeftMenu()
+            if (!__animateShowDialog.running)
+                mainWindow.hideLeftMenu()
        }
    }

@@ -311,8 +313,10 @@ Item {
            MouseArea {
                anchors.fill: parent
                onClicked: {
-                    __rightPanel.source = ""
-                    mainWindow.hideLeftMenu()
+                    if (!__animateShowDialog.running) {
+                        __rightPanel.source = ""
+                        mainWindow.hideLeftMenu()
+                    }
                }
            }