diff options
| author | Kristian Rietveld <kris@gtk.org> | 2003-07-12 13:58:13 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2003-07-12 13:58:13 +0000 |
| commit | 1719b20af47831294dc003a0f55cabceffc33741 (patch) | |
| tree | de51c1a8323d4b9bc0d540366c40827a78b3278b /gtk/gtktreeview.c | |
| parent | 97ddec66d63007dad350dfe3b8ca97e3f29eb2b1 (diff) | |
| download | gdk-pixbuf-1719b20af47831294dc003a0f55cabceffc33741.tar.gz | |
Merged from stable.
Sat Jul 12 15:51:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
Fixes #113904, testcase provided by Rene Seindal.
* gtk/gtktreeview.c (gtk_tree_view_button_press): set
pressed_button to -1 when a row has been activated,
(gtk_tree_view_motion_bin_window): only start a drag if there's
a button being pressed.
Diffstat (limited to 'gtk/gtktreeview.c')
| -rw-r--r-- | gtk/gtktreeview.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index fda9f095f..e6be1d0a8 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2151,6 +2151,9 @@ gtk_tree_view_button_press (GtkWidget *widget, { gtk_grab_remove (widget); gtk_tree_view_row_activated (tree_view, path, column); + + if (tree_view->priv->pressed_button == event->button) + tree_view->priv->pressed_button = -1; } gtk_tree_path_free (path); @@ -2903,7 +2906,9 @@ gtk_tree_view_motion_bin_window (GtkWidget *widget, if (tree_view->priv->tree == NULL) return FALSE; - gtk_tree_view_maybe_begin_dragging_row (tree_view, event); + /* only check for an initiated drag when a button is pressed */ + if (tree_view->priv->pressed_button >= 0) + gtk_tree_view_maybe_begin_dragging_row (tree_view, event); new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, event->y); if (new_y < 0) |