From df9e4fa8b5ac3543094f2269806fb1aa65a58d0e Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sat, 27 Dec 2003 22:19:33 +0000 Subject: [PATCH] use CHILD_VISIBLE instead of VISIBLE to determine whether we should stop Sat Dec 27 23:17:56 2003 Soeren Sandmann * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE instead of VISIBLE to determine whether we should stop sliding. (#130018, reported by Christian Persch). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktoolbar.c | 3 ++- 6 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6f46063fc..afc77d9851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 27 23:17:56 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE + instead of VISIBLE to determine whether we should stop + sliding. (#130018, reported by Christian Persch). + Fri Dec 26 23:24:35 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c6f46063fc..afc77d9851 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Dec 27 23:17:56 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE + instead of VISIBLE to determine whether we should stop + sliding. (#130018, reported by Christian Persch). + Fri Dec 26 23:24:35 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c6f46063fc..afc77d9851 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Dec 27 23:17:56 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE + instead of VISIBLE to determine whether we should stop + sliding. (#130018, reported by Christian Persch). + Fri Dec 26 23:24:35 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c6f46063fc..afc77d9851 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Dec 27 23:17:56 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE + instead of VISIBLE to determine whether we should stop + sliding. (#130018, reported by Christian Persch). + Fri Dec 26 23:24:35 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c6f46063fc..afc77d9851 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Dec 27 23:17:56 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE + instead of VISIBLE to determine whether we should stop + sliding. (#130018, reported by Christian Persch). + Fri Dec 26 23:24:35 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 6c574e5fe2..de6014c119 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1074,12 +1074,13 @@ slide_idle_handler (gpointer data) if ((content->state == NOT_ALLOCATED) || (content->state == NORMAL && + GTK_WIDGET_CHILD_VISIBLE (content->item) && ((content->goal_allocation.x != widget->allocation.x || content->goal_allocation.y != widget->allocation.y || content->goal_allocation.width != widget->allocation.width || content->goal_allocation.height != widget->allocation.height))) || (content->is_placeholder && content->disappearing && - GTK_WIDGET_VISIBLE (content->item))) + GTK_WIDGET_CHILD_VISIBLE (content->item))) { gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar)); return TRUE;