[gtk+/multitouch-for-3.4: 81/89] scrolledwindow: Do not handle dnd-threshold=0



commit 670af99cbbc984275496dd590987870a4156c670
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Jan 23 23:15:44 2012 +0100

    scrolledwindow: Do not handle dnd-threshold=0
    
    There's no need for it as the GtkSettings property has a lower
    limit of 1.

 gtk/gtkscrolledwindow.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index af5923c..5956316 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -2656,7 +2656,6 @@ gtk_scrolled_window_captured_button_press (GtkWidget *widget,
   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
   GtkScrolledWindowPrivate *priv = scrolled_window->priv;
   GtkWidget *child;
-  gint threshold;
   GtkWidget *event_widget;
   GdkEventButton *event;
   GdkDevice *source_device;
@@ -2722,19 +2721,7 @@ gtk_scrolled_window_captured_button_press (GtkWidget *widget,
                                (GSourceFunc) gtk_scrolled_window_release_captured_event,
                                scrolled_window);
 
-  /* If there's a zero drag threshold, start the drag immediately */
-  g_object_get (gtk_widget_get_settings (widget),
-                "gtk-dnd-drag-threshold", &threshold,
-                NULL);
-  if (threshold == 0)
-    {
-      priv->in_drag = TRUE;
-
-      /* Swallow the press event */
-      return TRUE;
-    }
-  else
-    priv->in_drag = FALSE;
+  priv->in_drag = FALSE;
 
   if (priv->kinetic_scrolling_flags & GTK_KINETIC_SCROLLING_CAPTURE_BUTTON_PRESS)
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]