Merge lp:~dandrader/unity/lp969554 into lp:unity

[Daniel d'Andrada]

Fixes bug #969554

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

How can we test this? We need either a unit test, or an autopilot test, or, as a final resort, a manual test. From the looks of it, GestureEngine is going to be tricky to write a unit test for (it contains a lot of XLib calls, and is tightly coupled with CompScreen), but perhaps we can write an autopilot test? We'd need to work out how to simulate multi-touch using python & XLib.

...If that doesn't work, we need a manual test. Please consult the README and TEST_TEMPLATE files in manual-tests/ before writing one.

Thanks

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> How can we test this? We need either a unit test, or an autopilot test, or, as
> a final resort, a manual test.[...]

It now has a unit test, but it's built on top of the commits from lp:~dandrader/unity/lp940612 (merge proposal https://code.launchpad.net/~dandrader/unity/lp940612/+merge/99956)

=== modified file 'plugins/unityshell/src/GestureEngine.cpp'
--- plugins/unityshell/src/GestureEngine.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/GestureEngine.cpp	2012-03-30 20:02:20 +0000
@@ -262,7 +262,6 @@
       return;
 
     _pinch_id = data->id;
-    _pinch_start_radius = data->radius;
 
     if (_pinch_grab)
       _screen->removeGrab(_pinch_grab, NULL);
@@ -275,17 +274,14 @@
   if (data->id != _pinch_id)
     return;
 
-  float delta_radius = data->radius - _pinch_start_radius;
-  if (delta_radius > 110.0f)
+  if (data->radius > 1.25)
   {
     _pinch_window->maximize(MAXIMIZE_STATE);
-    _pinch_start_radius = data->radius;
     EndDrag();
   }
-  else if (delta_radius < -110.0f)
+  else if (data->radius < 0.8)
   {
     _pinch_window->maximize(0);
-    _pinch_start_radius = data->radius;
     EndDrag();
   }
 }

=== modified file 'plugins/unityshell/src/GestureEngine.h'
--- plugins/unityshell/src/GestureEngine.h	2011-09-28 14:31:35 +0000
+++ plugins/unityshell/src/GestureEngine.h	2012-03-30 20:02:20 +0000
@@ -65,6 +65,5 @@
   int _pinch_id;
   int _touch_id;
 
-  float _pinch_start_radius;
   Cursor _fleur_cursor;
 };