Merge lp:~aacid/unity-2d/sticky_edges into lp:unity-2d

[Albert Astals Cid]

Obey the sticky edges setting for creating pointer barriers

Obey the sticky edges setting for creating pointer barriers

[lp:~aacid/unity-2d/sticky_edges]

1030. By Albert Astals Cid on 2012-04-03

Merge lp:unity-2d

1031. By Albert Astals Cid on 2012-04-03

Add manual tests

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-04-02 09:11:31 +0000
+++ shell/Shell.qml	2012-04-03 10:01:20 +0000
@@ -273,15 +273,20 @@
 
     PointerBarrier {
         property int x: declarativeView.globalPosition.x + (Utils.isLeftToRight() ? 0 : shell.width)
+        property bool enableTrigger: launcherLoader.launcherInHideMode && launcherLoader.loadLauncher
+        // This enableSticky logic has a 'bug' int RTL where the right most screen will still have enableSticky
+        // set to true, but it won't cause any issue other than consuming a few bytes of mememory and calculating the 
+        // rightmost x is probably more expensive and error prone than just enabling the extra barrier
+        property bool enableSticky: unity2dConfiguration.stickyEdges && declarativeView.screen.geometry.x > 0
 
         id: leftBarrier
         triggerDirection: Utils.isLeftToRight() ? PointerBarrier.TriggerFromRight : PointerBarrier.TriggerFromLeft
-        triggerZoneEnabled: !launcherLoader.visibilityController.shown
+        triggerZoneEnabled: enableTrigger && !launcherLoader.visibilityController.shown
         p1: Qt.point(x, declarativeView.screen.geometry.y)
         p2: Qt.point(x, declarativeView.screen.geometry.y + declarativeView.screen.geometry.height)
         triggerZoneP1: Qt.point(x, declarativeView.globalPosition.y)
         triggerZoneP2: Qt.point(x, declarativeView.globalPosition.y + launcherLoader.height)
-        threshold: launcherLoader.launcherInHideMode && launcherLoader.loadLauncher ? launcher2dConfiguration.edgeStopVelocity : -1
+        threshold: (enableSticky || enableTrigger) ? launcher2dConfiguration.edgeStopVelocity : -1
         maxVelocityMultiplier: launcher2dConfiguration.edgeResponsiveness
         decayRate: launcher2dConfiguration.edgeDecayrate
         triggerPressure: launcher2dConfiguration.edgeRevealPressure
@@ -289,4 +294,16 @@
 
         onTriggered: launcherLoader.item.barrierTriggered()
     }
+
+    PointerBarrier {
+        property bool enableSticky: unity2dConfiguration.stickyEdges && declarativeView.screen.geometry.y > 0
+
+        id: topBarrier
+        p1: Qt.point(declarativeView.screen.geometry.x, declarativeView.screen.geometry.y)
+        p2: Qt.point(declarativeView.screen.geometry.x + declarativeView.screen.geometry.width, declarativeView.screen.geometry.y)
+        threshold: enableSticky ? launcher2dConfiguration.edgeStopVelocity : -1
+        maxVelocityMultiplier: launcher2dConfiguration.edgeResponsiveness
+        decayRate: launcher2dConfiguration.edgeDecayrate
+        breakPressure: launcher2dConfiguration.edgeOvercomePressure
+    }
 }

=== modified file 'tests/manual-tests/other.txt'
--- tests/manual-tests/other.txt	2012-01-18 15:48:54 +0000
+++ tests/manual-tests/other.txt	2012-04-03 10:01:20 +0000
@@ -2,3 +2,15 @@
  * Logout of a Unity-2d session
 
 -> Logout is "fast", with "fast" meaning it is not 30 seconds (gnome-session timeout) nor 10 (Qt clipboard manager timeout on app shutdown)
+
+----
+ * Have 2 screens stacked vertically
+ * Enable sticky edges
+
+-> Verify that there is a mouse barrier between the two screens
+
+----
+ * Have 2 screens stacked vertically
+ * Disable sticky edges
+
+-> Verify that there is no mouse barrier between the two screens