Merge lp:~fboucault/unity-2d/shell_gestures into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Florian Boucault]

Reactivated gesture handling:
- 4 fingers tap to toggle the dash
- 3 fingers pinch to zoom in/out of the spread
- 4 fingers drag to reveal/dismiss the launcher

Missing feature:
When revealing the launcher by dragging, the launcher should lock in place if dragged further than it's shown position. By lock in place, we mean that its hideMode should be set to 0.

[Albert Astals Cid (aacid)]

Looks acceptable with the known shortcomings, can't really test more since don't have the hardware available

review: Approve

=== modified file 'libunity-2d-private/src/gesturehandler.cpp'
--- libunity-2d-private/src/gesturehandler.cpp	2011-11-14 18:40:49 +0000
+++ libunity-2d-private/src/gesturehandler.cpp	2012-02-10 16:50:50 +0000
@@ -265,15 +265,6 @@
     } else if (gestureName == GEIS_GESTURE_TYPE_DRAG4) {
         m_dragDelta += attributes[GEIS_GESTURE_ATTRIBUTE_DELTA_X].float_val;
         Q_EMIT dragDeltaChanged();
-        /* If the drag goes sufficiently above than the maximum delta then
-           lock the launcher in place by reserving the area so that no windows
-           overlap it. TODO: move to QML.
-         */
-//        if (m_dragDelta - m_launcher->delta() > 240) {
-//            m_launcher->setUseStrut(true);
-//        } else {
-//            m_launcher->setUseStrut(false);
-//        }
     }
 }
 

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-10 11:17:36 +0000
+++ shell/Shell.qml	2012-02-10 16:50:50 +0000
@@ -31,16 +31,39 @@
 
     Accessible.name: "shell"
 
+    GestureHandler {
+        id: gestureHandler
+    }
+
     LauncherLoader {
         id: launcherLoader
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         width: 65
+
+        /* Launcher visibility handling and 4 fingers dragging reveal */
+        property int hiddenX: Utils.isLeftToRight() ? -width : shell.width
+        property int shownX: Utils.isLeftToRight() ? 0 : shell.width - width
         x: {
-            if (Utils.isLeftToRight()) {
-                return visibilityController.shown ? 0 : -width
-            } else {
-                return visibilityController.shown ? shell.width - width : shell.width
+            var value
+            var delta = Utils.isLeftToRight() ? gestureHandler.dragDelta : -gestureHandler.dragDelta
+
+            if (visibilityController.shown) {
+                value = shownX
+            } else {
+                /* FIXME: it would be better to have gestureHandler disabled
+                   for dragging when hideMode is set to 0 */
+                if (launcher2dConfiguration.hideMode != 0 && gestureHandler.isDragging) {
+                    value = hiddenX + delta
+                } else {
+                    value = hiddenX
+                }
+            }
+
+            if (hiddenX <= shownX) {
+                return Utils.clamp(value, hiddenX, shownX)
+            } else {
+                return Utils.clamp(value, shownX, hiddenX)
             }
         }
 

=== modified file 'shell/app/shell.cpp'
--- shell/app/shell.cpp	2012-02-08 11:05:30 +0000
+++ shell/app/shell.cpp	2012-02-10 16:50:50 +0000
@@ -44,7 +44,6 @@
 #include "shelldeclarativeview.h"
 #include "dashclient.h"
 #include "dashdbus.h"
-#include "gesturehandler.h"
 #include "launcherdbus.h"
 
 int main(int argc, char *argv[])