AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-05 18:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'toolbar-expand' into 'master'

Browse Source 
toolbar: Use hexpand/vexpand Gtk+ properties

See merge request GNOME/gtk!334
This commit is contained in:
Robert Ancell 2018-09-17 08:59:19 +00:00
commit e55df03fe2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtktoolbar.c
View File

@ -281,7 +281,8 @@ static void toolbar_content_set_start_allocation (ToolbarContent
GtkAllocation *new_start_allocation); GtkAllocation *new_start_allocation);
static void toolbar_content_get_start_allocation (ToolbarContent *content, static void toolbar_content_get_start_allocation (ToolbarContent *content,
GtkAllocation *start_allocation); 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, static void toolbar_content_set_goal_allocation (ToolbarContent *content,
GtkAllocation *allocation); GtkAllocation *allocation);
static void toolbar_content_set_child_visible (ToolbarContent *content, static void toolbar_content_set_child_visible (ToolbarContent *content,
@ -1336,7 +1337,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
{ {
ToolbarContent *content = list->data; 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++; n_expand_items++;
} }
@ -1344,7 +1345,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
{ {
ToolbarContent *content = list->data; 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; gint extra = size / n_expand_items;
if (size % n_expand_items != 0) if (size % n_expand_items != 0)
@ -2904,10 +2905,10 @@ toolbar_content_set_start_allocation (ToolbarContent *content,
} }
static gboolean static gboolean
toolbar_content_get_expand (ToolbarContent *content) toolbar_content_get_expand (ToolbarContent *content, GtkOrientation orientation)
{ {
if (!content->disappearing && 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 TRUE;
return FALSE; return FALSE;