From 4721152c32bf2f4fac259c0c6c7566b2bc0854d2 Mon Sep 17 00:00:00 2001 From: Jan D Date: Sat, 8 May 2010 14:04:47 +0200 Subject: Fix bug #6139, text is briefly shown in tool bar on startup. * xsettings.c (Ftool_bar_get_system_style): Correct comment. * gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle box and toolbar (Bug #6139). (xg_create_tool_bar): Remove comment (Bug #6139). (xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139). (xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139). --- src/ChangeLog | 10 ++++++++++ src/gtkutil.c | 14 ++++---------- src/xsettings.c | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index cbe7633c8a..a304750384 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2010-05-08 Jan Djärv + + * xsettings.c (Ftool_bar_get_system_style): Correct comment. + + * gtkutil.c (xg_pack_tool_bar): Change show_all to show for handle + box and toolbar (Bug #6139). + (xg_create_tool_bar): Remove comment (Bug #6139). + (xg_make_tool_item): Remove gtk_widget_show_all (Bug #6139). + (xg_show_toolbar_item): Add gtk_widget_show for weventbox (Bug #6139). + 2010-05-08 Juanma Barranquero * makefile.w32-in ($(BLD)/eval.$(O), $(BLD)/w32fns.$(O)): diff --git a/src/gtkutil.c b/src/gtkutil.c index c0e5c6f970..c8800817b6 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3778,7 +3778,9 @@ xg_pack_tool_bar (f) gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget, vbox_pos); - gtk_widget_show_all (x->handlebox_widget); + + gtk_widget_show (x->toolbar_widget); + gtk_widget_show (x->handlebox_widget); } /* Create a tool bar for frame F. */ @@ -3794,13 +3796,6 @@ xg_create_tool_bar (f) gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar"); - /* We only have icons, so override any user setting. We could - use the caption property of the toolbar item (see update_frame_tool_bar - below), but some of those strings are long, making the toolbar so - long it does not fit on the screen. The GtkToolbar widget makes every - item equal size, so the longest caption determine the size of every - tool bar item. I think the creators of the GtkToolbar widget - counted on 4 or 5 character long strings. */ gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget), GTK_ORIENTATION_HORIZONTAL); @@ -3877,8 +3872,6 @@ xg_make_tool_item (FRAME_PTR f, G_CALLBACK (xg_tool_bar_callback), (gpointer) (EMACS_INT) i); - gtk_widget_show_all (GTK_WIDGET (ti)); - g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f); /* Catch expose events to overcome an annoying redraw bug, see @@ -3963,6 +3956,7 @@ xg_show_toolbar_item (GtkToolItem *ti) else gtk_widget_hide (wlbl); if (show_image) gtk_widget_show (wimage); else gtk_widget_hide (wimage); + gtk_widget_show (GTK_WIDGET (weventbox)); gtk_widget_show (GTK_WIDGET (vb)); gtk_widget_show (GTK_WIDGET (wbutton)); gtk_widget_show (GTK_WIDGET (ti)); diff --git a/src/xsettings.c b/src/xsettings.c index 49d4d5cc74..f1b4c8c9b2 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -740,7 +740,7 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font, DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style, 0, 0, 0, doc: /* Get the system tool bar style. -If no system tool bar style is known, return `tool-bar-style' is set to a +If no system tool bar style is known, return `tool-bar-style' if set to a known style. Otherwise return image. */) () { -- cgit v1.2.3