From d4d6f28ae2b578ea9049e4db744b5268a39aa783 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Dec 2004 03:17:41 +0000 Subject: [PATCH] Don't mess up the column header state if the button release event is 2004-12-07 Matthias Clasen * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): Don't mess up the column header state if the button release event is missed. (#159640) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtktreeviewcolumn.c | 8 ++++---- 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9ce365296..0bb43fb415 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-07 Matthias Clasen + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + 2004-12-07 Marco Pesenti Gritti * gtk/gtkcellview.c: (gtk_cell_view_set_background_color): @@ -11,6 +17,10 @@ 2004-12-07 Matthias Clasen + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + * docs/tools/widgets.h (enum): Add an ASIS widget size. * docs/tools/widgets.c (get_all_widgets): Add file chooser, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b9ce365296..0bb43fb415 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-12-07 Matthias Clasen + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + 2004-12-07 Marco Pesenti Gritti * gtk/gtkcellview.c: (gtk_cell_view_set_background_color): @@ -11,6 +17,10 @@ 2004-12-07 Matthias Clasen + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + * docs/tools/widgets.h (enum): Add an ASIS widget size. * docs/tools/widgets.c (get_all_widgets): Add file chooser, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b9ce365296..0bb43fb415 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-12-07 Matthias Clasen + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + 2004-12-07 Marco Pesenti Gritti * gtk/gtkcellview.c: (gtk_cell_view_set_background_color): @@ -11,6 +17,10 @@ 2004-12-07 Matthias Clasen + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + * docs/tools/widgets.h (enum): Add an ASIS widget size. * docs/tools/widgets.c (get_all_widgets): Add file chooser, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b9ce365296..0bb43fb415 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-12-07 Matthias Clasen + + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + 2004-12-07 Marco Pesenti Gritti * gtk/gtkcellview.c: (gtk_cell_view_set_background_color): @@ -11,6 +17,10 @@ 2004-12-07 Matthias Clasen + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_button_event): + Don't mess up the column header state if the button release + event is missed. (#159640) + * docs/tools/widgets.h (enum): Add an ASIS widget size. * docs/tools/widgets.c (get_all_widgets): Add file chooser, diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 268be23a16..e2c5e1e4d2 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1058,12 +1058,12 @@ gtk_tree_view_column_button_event (GtkWidget *widget, gtk_widget_grab_focus (widget); } - if (event->type == GDK_BUTTON_RELEASE && - column->maybe_reordered) + if (event->type == GDK_BUTTON_RELEASE || + event->type == GDK_LEAVE_NOTIFY) column->maybe_reordered = FALSE; - + if (event->type == GDK_MOTION_NOTIFY && - (column->maybe_reordered) && + column->maybe_reordered && (gtk_drag_check_threshold (widget, column->drag_x, column->drag_y,