[Goodies-commits] r3386 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-10-15 21:28:34 +0000 (Mon, 15 Oct 2007)
New Revision: 3386

Modified:
   ristretto/trunk/src/picture_viewer.c
Log:
Modify some code that manages dragging



Modified: ristretto/trunk/src/picture_viewer.c
===================================================================
--- ristretto/trunk/src/picture_viewer.c	2007-10-15 21:11:49 UTC (rev 3385)
+++ ristretto/trunk/src/picture_viewer.c	2007-10-15 21:28:34 UTC (rev 3386)
@@ -1041,18 +1041,18 @@
         gdk_window_set_cursor(widget->window, cursor);
         gdk_cursor_unref(cursor);
 
-        if ((viewer->priv->motion.x != event->x) ||
-            (viewer->priv->motion.y != event->y))
+        if (viewer->priv->motion.x != event->x)
         {
-
-            viewer->hadjustment->value -= event->x - viewer->priv->motion.x;
+            viewer->hadjustment->value += (viewer->priv->motion.x - event->x);
             if((viewer->hadjustment->value + viewer->hadjustment->page_size) > viewer->hadjustment->upper)
             {
                 viewer->hadjustment->value = viewer->hadjustment->upper - viewer->hadjustment->page_size;
             }
             gtk_adjustment_value_changed(viewer->hadjustment);
-
-            viewer->vadjustment->value -= event->y - viewer->priv->motion.y;
+        }
+        if (viewer->priv->motion.y != event->y)
+        {
+            viewer->vadjustment->value += (viewer->priv->motion.y - event->y);
             if((viewer->vadjustment->value + viewer->vadjustment->page_size) > viewer->vadjustment->upper)
             {
                 viewer->vadjustment->value = viewer->vadjustment->upper - viewer->vadjustment->page_size;
@@ -1060,9 +1060,6 @@
             gtk_adjustment_value_changed(viewer->vadjustment);
         }
 
-        viewer->priv->motion.x = -1;
-        viewer->priv->motion.y = -1;
-
         gdk_window_set_cursor(widget->window, NULL);
     }