Merge lp:~bratsche/oif/evince-smooth-dragging into lp:~oif-team/oif/evince-gestures-trunk

[Cody Russell]

Currently supports 1-finger panning around the view. 2-fingers are used for flinging to the next/previous page, so 1-finger made sense to me.

[Mohamed IKBEL Boulabiar (boulabiar)]

The patch works pretty nice, but when trying it, it looks like the movement are inverted.

Moving a document/paper by touch seems a better metaphor than moving the camera.
In okular it's like that, so what you think ?

review: Needs Information

[Cody Russell (bratsche)]

Yeah, you're right. I didn't notice so much using the Magic Trackpad, but if I were using a touchscreen this would feel very wrong. I'll fix it now.

[Cody Russell (bratsche)]

Fixed in rev 4211.

[lp:~bratsche/oif/evince-smooth-dragging]

4211. By Cody Russell on 2010-11-30

Invert the y axis when dragging.

[Mohamed IKBEL Boulabiar (boulabiar)]

Thanks.

review: Approve

=== modified file 'libview/ev-view.c'
--- libview/ev-view.c	2010-11-17 21:58:16 +0000
+++ libview/ev-view.c	2010-11-30 15:13:11 +0000
@@ -5065,6 +5065,24 @@
 	ev_view_handle_cursor_over_xy (view, x, y);
 }
 
+void
+ev_view_drag (EvView  *view,
+	      gdouble  x,
+	      gdouble  y)
+{
+	gdouble value;
+
+	value = gtk_adjustment_get_value (view->vadjustment);
+	value = CLAMP (value + y, 0,
+		       gtk_adjustment_get_upper (view->vadjustment) - gtk_adjustment_get_page_size (view->vadjustment));
+	gtk_adjustment_set_value (view->vadjustment, value);
+
+	value = gtk_adjustment_get_value (view->hadjustment);
+	value = CLAMP (value + x, 0,
+		       gtk_adjustment_get_upper (view->hadjustment) - gtk_adjustment_get_page_size (view->hadjustment));
+	gtk_adjustment_set_value (view->hadjustment, value);
+}
+
 static void
 ev_view_document_changed_cb (EvDocumentModel *model,
 			     GParamSpec      *pspec,

=== modified file 'libview/ev-view.h'
--- libview/ev-view.h	2010-11-17 21:58:16 +0000
+++ libview/ev-view.h	2010-11-30 15:13:11 +0000
@@ -105,6 +105,11 @@
                                            gint          page,
                                            GdkRectangle *page_area,
                                            GtkBorder    *border);
+
+void           ev_view_drag               (EvView       *view,
+                                           gdouble       x,
+                                           gdouble       y);
+
 /* Annotations */
 void           ev_view_focus_annotation      (EvView          *view,
 					      EvMapping       *annot_mapping);

=== modified file 'shell/ev-window.c'
--- shell/ev-window.c	2010-11-29 17:44:15 +0000
+++ shell/ev-window.c	2010-11-30 15:13:11 +0000
@@ -5520,6 +5520,16 @@
 			break;
 		}
 
+		case GRIP_GESTURE_DRAG: {
+			GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
+
+			if (drag->fingers == 1) {
+				ev_view_drag (EV_VIEW (priv->view),
+					      (gdouble)drag->delta_x,
+					      (gdouble)-drag->delta_y);
+			}
+		}
+
 		default:
 			break;
 		}
@@ -5551,6 +5561,13 @@
 						      ev_gesture_callback,
 						      NULL, NULL);
 
+                grip_gesture_manager_register_window (manager,
+                                                      window,
+                                                      GRIP_GESTURE_DRAG,
+                                                      1,
+                                                      ev_gesture_callback,
+                                                      NULL, NULL);
+
 		grip_gesture_manager_register_window (manager,
 						      window,
 						      GRIP_GESTURE_ROTATE,