summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-06-12 05:13:54 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-06-12 05:13:54 +0000
commit793591fcf095b903700a69ea1602ac48e5b26f09 (patch)
tree3c9f58d6b0a3a85851265270a3d5d31fa5c152f8 /gtk
parent7c631d5cb0fa06ecb04129480519158829ea892f (diff)
downloadgdk-pixbuf-793591fcf095b903700a69ea1602ac48e5b26f09.tar.gz
Check start_button_mask before starting a drag. (#149058, Andreas Volz)
2005-06-12 Matthias Clasen <mclasen@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_maybe_begin_dragging_row): Check start_button_mask before starting a drag. (#149058, Andreas Volz)
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtktreeview.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 196cf895d..874413c74 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3236,15 +3236,12 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
/* see if we are near the edge. */
offset = y - (visible_rect.y + 2 * SCROLL_EDGE_SIZE);
- g_print ("offset1 %d\n", offset);
if (offset > 0)
{
offset = y - (visible_rect.y + visible_rect.height - 2 * SCROLL_EDGE_SIZE);
- g_print ("offset2 %d\n", offset);
if (offset < 0)
return;
}
- g_print ("offset3 %d\n", offset);
value = CLAMP (tree_view->priv->vadjustment->value + offset, 0.0,
tree_view->priv->vadjustment->upper - tree_view->priv->vadjustment->page_size);
@@ -5933,9 +5930,8 @@ gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view,
path))
goto out;
- /* FIXME Check whether we're a start button, if not return FALSE and
- * free path
- */
+ if (!(GDK_BUTTON1_MASK << (button - 1) & di->start_button_mask))
+ goto out;
/* Now we can begin the drag */