From f4373f4696b4c396af84e8478996daa52bcf243d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 30 Oct 2006 13:43:10 +0000 Subject: [PATCH] Merge from HEAD 2006-10-30 Michael Natterer Merge from HEAD * gtk/gtkrange.c (gtk_range_key_press): consume the Escape key only if we actually cancel a drag. Fixes bug #58389. --- ChangeLog | 7 +++++++ gtk/gtkrange.c | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bed2bb86c..2f05d20318 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-10-30 Michael Natterer + + Merge from HEAD + + * gtk/gtkrange.c (gtk_range_key_press): consume the Escape key + only if we actually cancel a drag. Fixes bug #58389. + 2006-10-30 Kristian Rietveld Merge from HEAD diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index b2f789124e..cb8fc3e128 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -1542,20 +1542,21 @@ static gboolean gtk_range_key_press (GtkWidget *widget, GdkEventKey *event) { - GtkRange *range = (GtkRange *)widget; + GtkRange *range = GTK_RANGE (widget); - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_Escape && + range->layout->grab_location != MOUSE_OUTSIDE) { stop_scrolling (range); - update_slider_position (range, + update_slider_position (range, range->slide_initial_coordinate, range->slide_initial_coordinate); return TRUE; } - else - return GTK_WIDGET_CLASS (gtk_range_parent_class)->key_press_event (widget, event); + + return GTK_WIDGET_CLASS (gtk_range_parent_class)->key_press_event (widget, event); } static gint