Merge lp:~bratsche/oif/eog-rotate-gesture-2 into lp:~oif-team/oif/eog-gestures-trunk

[Cody Russell]

Aha, it was trying to merge into the wrong branch. That's what was causing these ridiculous diffs. Sorry. :)

[Stephen M. Webb (bregma)]

I would suggest using a constant instead of hard-coded 1.0 in "rotate->angle >= 1.0" and "rotate->angle <= -1.0" so they can be tweaked a little easier when we figure out better threshold values, and so they can be a little more self-documenting.

Other than that, this change looks clean.

review: Approve

[Henrik Rydberg (rydberg)]

I agree with Stephens comments, but would rather put that as needs fixing.

review: Needs Fixing

[lp:~bratsche/oif/eog-rotate-gesture-2]

117. By Cody Russell on 2011-01-07

Add #define for the angles.

=== modified file 'debian/control'
--- debian/control	2011-01-05 16:12:48 +0000
+++ debian/control	2011-01-07 15:29:26 +0000
@@ -20,7 +20,7 @@
                gnome-doc-utils,
                libgtk2.0-dev (>= 2.18),
                libglib2.0-dev (>= 2.25.9),
-               libgrip-0.1-0-dev (>= 0.1.1),
+               libgrip-0.1-dev (>= 0.1.1),
                librsvg2-dev,
                libgnome-desktop-dev (>= 2.25.1),
                libgconf2-dev (>= 2.6.1-2),

=== modified file 'src/eog-window.c'
--- src/eog-window.c	2010-09-20 13:04:27 +0000
+++ src/eog-window.c	2011-01-07 15:29:26 +0000
@@ -67,6 +67,7 @@
 #include <gio/gdesktopappinfo.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
+#include <libgrip/gripgesturemanager.h>
 #include <launchpad-integration.h>
 
 #if HAVE_LCMS
@@ -98,6 +99,9 @@
 
 #define EOG_WALLPAPER_FILENAME "eog-wallpaper"
 
+#define EOG_GESTURE_ROTATE_CW_ANGLE   1.0
+#define EOG_GESTURE_ROTATE_CCW_ANGLE -1.0
+
 #define is_rtl (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
 
 typedef enum {
@@ -4504,6 +4508,34 @@
 }
 
 static void
+eog_window_gesture_event (GtkWidget        *widget,
+                          GripTimeType      time_type,
+                          GripGestureEvent *event,
+                          gpointer          user_data)
+{
+       if (time_type == GRIP_TIME_END) {
+               switch (event->type) {
+               case GRIP_GESTURE_ROTATE: {
+                       GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
+
+                       if (rotate->angle >= EOG_GESTURE_ROTATE_CW_ANGLE) {
+                               apply_transformation (EOG_WINDOW (user_data),
+                                                     eog_transform_rotate_new (90));
+                       } else if (rotate->angle <= EOG_GESTURE_ROTATE_CCW_ANGLE) {
+                               apply_transformation (EOG_WINDOW (user_data),
+                                                      eog_transform_rotate_new (270));
+                       }
+
+                       break;
+               }
+
+               default:
+                       break;
+               }
+       }
+}
+
+static void
 eog_window_construct_ui (EogWindow *window)
 {
 	EogWindowPrivate *priv;
@@ -4518,6 +4550,8 @@
 
 	GConfEntry *entry;
 
+	GripGestureManager *manager;
+
 	g_return_if_fail (EOG_IS_WINDOW (window));
 
 	priv = window->priv;
@@ -4710,6 +4744,14 @@
 			  G_CALLBACK (view_zoom_changed_cb),
 			  window);
 
+	manager = grip_gesture_manager_get ();
+	grip_gesture_manager_register_window (manager,
+	                                      priv->view,
+	                                      GRIP_GESTURE_ROTATE,
+	                                      2,
+	                                      eog_window_gesture_event,
+	                                      window, NULL);
+
 	view_popup = gtk_ui_manager_get_widget (priv->ui_mgr, "/ViewPopup");
 	eog_scroll_view_set_popup (EOG_SCROLL_VIEW (priv->view),
 				   GTK_MENU (view_popup));