Merge lp:~alan-griffiths/miral/slightly-less-broken-touch-handling into lp:miral

[Alan Griffiths]

Touch events can set active window, don't "eat" two finger gestures

Touch events can set active window, don't "eat" two finger gestures

Using "four fingers" for resize isn't ideal, but eating two finger gestures is just wrong.

[lp:~alan-griffiths/miral/slightly-less-broken-touch-handling]

181. By Alan Griffiths on 2016-06-02

Also applies to TilingWindowManagerPolicy

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'miral-shell/canonical_window_manager.cpp'
--- miral-shell/canonical_window_manager.cpp	2016-06-01 13:33:11 +0000
+++ miral-shell/canonical_window_manager.cpp	2016-06-02 13:24:22 +0000
@@ -621,7 +621,7 @@
     {
         switch (count)
         {
-        case 2:
+        case 4:
             resize(cursor);
             consumes_event = true;
             break;
@@ -632,6 +632,11 @@
             break;
         }
     }
+    else
+    {
+        if (auto const& window = tools->window_at(cursor))
+            tools->select_active_window(window);
+    }
 
     old_cursor = cursor;
     return consumes_event;
 
=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp	2016-06-01 13:41:49 +0000
+++ miral-shell/tiling_window_manager.cpp	2016-06-02 13:24:22 +0000
@@ -366,7 +366,7 @@
     {
         switch (count)
         {
-        case 2:
+        case 4:
             resize(cursor);
             consumes_event = true;
             break;
@@ -377,6 +377,11 @@
             break;
         }
     }
+    else
+    {
+        if (auto const& window = tools->window_at(cursor))
+            tools->select_active_window(window);
+    }
 
     old_cursor = cursor;
     return consumes_event;