diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2018-09-11 11:00:01 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2018-09-17 10:25:59 +0200 |
| commit | c8a13a2d8ab996e3fc7b0ea289ea91a7e7559fad (patch) | |
| tree | 4e70f794474c07b5a12d7682b39048c3332bcfd4 | |
| parent | 231b76bdd1895d6b3dea1c529898fc9bcae0f23b (diff) | |
| download | gtk+-c8a13a2d8ab996e3fc7b0ea289ea91a7e7559fad.tar.gz | |
toolbar: Use hexpand/vexpand Gtk+ properties
| -rw-r--r-- | gtk/gtktoolbar.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index f49a770873..5426ae5f6d 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -281,7 +281,8 @@ static void toolbar_content_set_start_allocation (ToolbarContent GtkAllocation *new_start_allocation); static void toolbar_content_get_start_allocation (ToolbarContent *content, GtkAllocation *start_allocation); -static gboolean toolbar_content_get_expand (ToolbarContent *content); +static gboolean toolbar_content_get_expand (ToolbarContent *content, + GtkOrientation orientation); static void toolbar_content_set_goal_allocation (ToolbarContent *content, GtkAllocation *allocation); static void toolbar_content_set_child_visible (ToolbarContent *content, @@ -1336,7 +1337,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget, { ToolbarContent *content = list->data; - if (toolbar_content_get_expand (content) && new_states[i] == NORMAL) + if (toolbar_content_get_expand (content, priv->orientation) && new_states[i] == NORMAL) n_expand_items++; } @@ -1344,7 +1345,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget, { ToolbarContent *content = list->data; - if (toolbar_content_get_expand (content) && new_states[i] == NORMAL) + if (toolbar_content_get_expand (content, priv->orientation) && new_states[i] == NORMAL) { gint extra = size / n_expand_items; if (size % n_expand_items != 0) @@ -2904,10 +2905,10 @@ toolbar_content_set_start_allocation (ToolbarContent *content, } static gboolean -toolbar_content_get_expand (ToolbarContent *content) +toolbar_content_get_expand (ToolbarContent *content, GtkOrientation orientation) { if (!content->disappearing && - gtk_tool_item_get_expand (content->item)) + (gtk_tool_item_get_expand (content->item) || gtk_widget_compute_expand (GTK_WIDGET (content->item), orientation))) return TRUE; return FALSE; |