[Xfce4-commits] <midori:master> Make sure x, y is set in KatzeScrolled button event

[Christian Dywan]

Updating branch refs/heads/master
         to e20a92e6ce356585c9b42ede51f616c858399c85 (commit)
       from d76b209f6883e7f5311db3c23d741308fffb9e6f (commit)

commit e20a92e6ce356585c9b42ede51f616c858399c85
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Nov 23 20:02:59 2011 +0100

    Make sure x, y is set in KatzeScrolled button event

 katze/katze-scrolled.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/katze/katze-scrolled.c b/katze/katze-scrolled.c
index 4fe090b..582142a 100644
--- a/katze/katze-scrolled.c
+++ b/katze/katze-scrolled.c
@@ -466,14 +466,12 @@ button_press_event (GtkWidget*      widget,
     gint y;
     GdkModifierType mask;
 
-    if (!priv->drag_scrolling)
-        return FALSE;
-
-    if (event->button != 1)
+    if (!priv->drag_scrolling || event->button != 1)
         return FALSE;
 
     priv->press_received = TRUE;
-
+    gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrolled)),
+                            &x, &y, &mask);
     if (event->time - priv->previous_time < priv->dragging_stopped_delay &&
         gtk_drag_check_threshold (widget, priv->previous_x, priv->previous_y, x, y))
     {
@@ -482,8 +480,6 @@ button_press_event (GtkWidget*      widget,
             g_source_remove (priv->scrolling_timeout_id);
             priv->scrolling_timeout_id = 0;
         }
-        gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrolled)),
-                                &x, &y, &mask);
         /* do_motion_scroll (scrolled, widget, x, y, event->time); */
     }
     else
@@ -499,8 +495,6 @@ button_press_event (GtkWidget*      widget,
             priv->dragged = FALSE;
             priv->previous_time = event->time;
         }
-        gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (scrolled)),
-                                &x, &y, &mask);
         priv->start_x = priv->previous_x = priv->farest_x = x;
         priv->start_y = priv->previous_y = priv->farest_y = y;
         priv->start_time  = event->time;