Commit 51b3a99c authored by Jan Djärv's avatar Jan Djärv
Browse files

* gtkutil.c (tb_size_cb): New function.

(xg_create_tool_bar): Connect size-allocate to tb_size_cb.

Fixes: debbugs:13512
parent e31560a7
2013-02-14 Jan Djärv <>
* gtkutil.c (tb_size_cb): New function.
(xg_create_tool_bar): Connect size-allocate to tb_size_cb (Bug#13512).
2013-02-14 Stefan Monnier <>
* keyboard.c (active_maps): Fcurrent_active_maps expects a position, not
......@@ -4353,6 +4353,21 @@ xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos)
x->toolbar_is_packed = true;
static bool xg_update_tool_bar_sizes (FRAME_PTR f);
static void
tb_size_cb (GtkWidget *widget,
GdkRectangle *allocation,
gpointer user_data)
/* When tool bar is created it has one preferred size. But when size is
allocated between widgets, it may get another. So we must update
size hints if tool bar size changes. Seen on Fedora 18 at least. */
FRAME_PTR f = (FRAME_PTR) user_data;
if (xg_update_tool_bar_sizes (f))
x_wm_set_size_hint (f, 0, 0);
/* Create a tool bar for frame F. */
static void
......@@ -4384,6 +4399,8 @@ xg_create_tool_bar (FRAME_PTR f)
gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS);
toolbar_set_orientation (x->toolbar_widget, GTK_ORIENTATION_HORIZONTAL);
g_signal_connect (x->toolbar_widget, "size-allocate",
G_CALLBACK (tb_size_cb), f);
#if GTK_CHECK_VERSION (3, 3, 6)
gsty = gtk_widget_get_style_context (x->toolbar_widget);
gtk_style_context_add_class (gsty, "primary-toolbar");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment