From 37f85337459020b38044d416fe10b33949edd87f Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 2 May 2007 08:09:46 +0000 Subject: [PATCH] Merge from trunk: 2007-05-02 Kristian Rietveld Merge from trunk: * gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop the rubber band if it's active. svn path=/branches/gtk-2-10/; revision=17771 --- ChangeLog | 7 +++++++ gtk/gtktreeview.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b985aaf854..c8f9ace197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-05-02 Kristian Rietveld + + Merge from trunk: + + * gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop the rubber band + if it's active. + 2007-05-01 Matthias Clasen * NEWS: Updates diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 9a6b980a3d..7f7825d024 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -14565,7 +14565,12 @@ gtk_tree_view_grab_notify (GtkWidget *widget, tree_view->priv->in_grab = !was_grabbed; if (!was_grabbed) - tree_view->priv->pressed_button = -1; + { + tree_view->priv->pressed_button = -1; + + if (tree_view->priv->rubber_band_status) + gtk_tree_view_stop_rubber_band (tree_view); + } } static void