Merge lp:~aacid/unity-2d/unity-2d-shell_disable_bindings_on_animation into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Disable some bindings to gain speed

Updating the monitoredArea and the inputShapedArea when the animation of the launcher
is happening is an overkill since they are quite expensive and the animation triggers them
a few times

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-09 10:08:51 +0000
+++ shell/Shell.qml	2012-02-10 11:23:19 +0000
@@ -52,7 +52,7 @@
             value: !dashLoader.item.active
         }
 
-        Behavior on x { NumberAnimation { duration: 125 } }
+        Behavior on x { NumberAnimation { id: launcherLoaderXAnimation; duration: 125 } }
 
         Connections {
             target: declarativeView
@@ -123,24 +123,7 @@
         target: declarativeView
 
         InputShapeRectangle {
-            rectangle: {
-                // FIXME: this results in a 1px wide white rectangle on the launcher edge, we should switch
-                //        to cpp-based edge detection, and later XFixes barriers to get rid of that completely
-                var somewhatShown = Utils.isLeftToRight() ? -launcherLoader.x < launcherLoader.width : launcherLoader.x < shell.width
-                if (somewhatShown) {
-                    return Qt.rect(launcherLoader.x,
-                                   launcherLoader.y,
-                                   launcherLoader.width,
-                                   launcherLoader.height)
-                } else {
-                    // The outerEdgeMouseArea is one pixel bigger on each side so use it
-                    // when the launcher is hidden to have that extra pixel in the border
-                    return Qt.rect(launcherLoader.x + launcherLoader.outerEdgeMouseArea.x,
-                                   launcherLoader.y,
-                                   launcherLoader.outerEdgeMouseArea.width,
-                                   launcherLoader.height)
-                }
-            }
+            id: launcherInputShape
             enabled: launcherLoader.status == Loader.Ready
         }
 
@@ -163,6 +146,30 @@
         }
     }
 
+    Binding {
+        target: launcherInputShape
+        property: "rectangle"
+        value: {
+            // FIXME: this results in a 1px wide white rectangle on the launcher edge, we should switch
+            //        to cpp-based edge detection, and later XFixes barriers to get rid of that completely
+            var somewhatShown = Utils.isLeftToRight() ? -launcherLoader.x < launcherLoader.width : launcherLoader.x < shell.width
+            if (somewhatShown) {
+                return Qt.rect(launcherLoader.x,
+                                launcherLoader.y,
+                                launcherLoader.width,
+                                launcherLoader.height)
+            } else {
+                // The outerEdgeMouseArea is one pixel bigger on each side so use it
+                // when the launcher is hidden to have that extra pixel in the border
+                return Qt.rect(launcherLoader.x + launcherLoader.outerEdgeMouseArea.x,
+                                launcherLoader.y,
+                                launcherLoader.outerEdgeMouseArea.width,
+                                launcherLoader.height)
+            }
+        }
+        when: !launcherLoaderXAnimation.running
+    }
+
     StrutManager {
         id: strutManager
         edge: Unity2dPanel.LeftEdge

=== modified file 'shell/launcher/LauncherLoader.qml'
--- shell/launcher/LauncherLoader.qml	2012-02-08 16:18:21 +0000
+++ shell/launcher/LauncherLoader.qml	2012-02-10 11:23:19 +0000
@@ -54,7 +54,7 @@
         target: declarativeView
         property: "monitoredArea"
         value: Qt.rect(launcherLoader.x, launcherLoader.item.y, launcherLoader.item.width, launcherLoader.item.height)
-        when: launcherBehavior.status == Loader.Ready
+        when: launcherBehavior.status == Loader.Ready && !launcherLoaderXAnimation.running
     }
 
     Binding {