Ticket #4403: swipe3.patch

src/jarabe/desktop/homewindow.py

@@ -22 +22 @@
 from gi.repository import Gdk
 from gi.repository import GdkX11
 
+from gi.repository import SugarGestures
+
 from sugar3.graphics import style
 from sugar3.graphics import palettegroup
 
@@ -99 +101 @@
         shell.get_model().zoom_level_changed.connect(
                                      self.__zoom_level_changed_cb)
 
+        x11_window = self.get_window()
+        x11_window.set_events(x11_window.get_events() |
+                              Gdk.EventMask.POINTER_MOTION_MASK |
+                              Gdk.EventMask.TOUCH_MASK)
+
+        zoom_controller = SugarGestures.ZoomController()
+        zoom_controller.connect('scale-changed', self.__scale_changed_cb)
+        zoom_controller.connect('ended', self.__scale_ended_cb)
+        zoom_controller.attach(self, SugarGestures.EventControllerFlags.NONE)
+
+        self._zoom_scale = None
+
     def _deactivate_view(self, level):
         group = palettegroup.get_group('default')
         group.popdown()
@@ -194 +208 @@
         else:
             self._update_view(new_level)
 
+    def __scale_changed_cb(self, controller, scale):
+        self._zoom_scale = scale
+
+    def __scale_ended_cb(self, controller):
+        if self._zoom_scale > 1.0:
+            shell.get_model().set_next_zoom_level()
+
+        elif self._zoom_scale < 1.0:
+            shell.get_model().set_previous_zoom_level()
+
+        self._zoom_scale = None
+
     def _transition_completed_cb(self, transition_box):
         self._update_view(shell.get_model().zoom_level)
 

src/jarabe/model/shell.py

@@ -351 +351 @@
     ZOOM_HOME = 2
     ZOOM_ACTIVITY = 3
 
+    _ZOOM_LEVELS = [ZOOM_MESH, ZOOM_GROUP, ZOOM_HOME, ZOOM_ACTIVITY]
+
     def __init__(self):
         GObject.GObject.__init__(self)
 
@@ -430 +432 @@
 
     zoom_level = property(_get_zoom_level)
 
+    def _get_zoom_level_by_index(self, idx):
+        # Use the modulo operator to iterate the list as a circular
+        # list.
+        return self._ZOOM_LEVELS[(idx) % len(self._ZOOM_LEVELS)]
+
+    def set_previous_zoom_level(self):
+        new_level = self._get_zoom_level_by_index(self.zoom_level - 1)
+        self.set_zoom_level(new_level)
+
+    def set_next_zoom_level(self):
+        new_level = self._get_zoom_level_by_index(self.zoom_level + 1)
+        self.set_zoom_level(new_level)
+
     def _get_activities_with_window(self):
         ret = []
         for i in self._activities: