From a6331f5b76f2b85bd7ce8d95dcf78417c8cd885c Mon Sep 17 00:00:00 2001 From: Morten Welinder Date: Thu, 24 Feb 2011 10:31:05 -0500 Subject: [PATCH] GUI: Fix toolbar positioning code. --- ChangeLog | 7 ++++++- NEWS | 1 + src/wbc-gtk.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33cedb82a..6e107d68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,12 @@ +2011-02-24 Morten Welinder + + * src/wbc-gtk.c (cb_set_toolbar_position): Only actually set + toolbar position when the item is active. (We now get extra signals.) + 2011-02-23 Andreas J. Guelzow * src/undo.c (gnm_undo_colrow_*_group_finalize): chain to parent - + 2011-02-22 Andreas J. Guelzow * src/gui-clipboard.c (text_is_single_cell): new diff --git a/NEWS b/NEWS index 293fb54ac..954f17950 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ Morten: * Plug a few leaks. * Fix potential crash on quick exit. * Fix stf import problem diagnosed by Andreas. [#642477] + * Restore toolbar positioning code. -------------------------------------------------------------------------- Gnumeric 1.10.13 diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c index 881bd90c3..9ce49b1d3 100644 --- a/src/wbc-gtk.c +++ b/src/wbc-gtk.c @@ -4035,7 +4035,8 @@ cb_set_toolbar_position (GtkMenuItem *item, WBCGtk *gtk) GtkToolbar *tb = g_object_get_data (G_OBJECT (item), "toolbar"); GtkPositionType side = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "side")); - set_toolbar_position (tb, side, gtk); + if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) + set_toolbar_position (tb, side, gtk); } #ifdef HAVE_GTK_HANDLE_BOX_FLOAT_WINDOW -- 2.22.0