AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

headerbar: don't allocate both label and custom title

Browse Source 
It's only possible to have a label or a custom title, not both.
The size allocate code confusingly treats them as independent.

That is confusing, because, as the code is written, it makes it
look like the space for the custom title isn't getting accounted
for.

This commit else-ifies some parts of the size allocate code for
clarity.
This commit is contained in:
Ray Strode 2016-06-23 08:57:55 -04:00
parent 3947ff44c9
commit 01eda209e1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkheaderbar.c
View File

@ -1042,8 +1042,7 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
&title_minimum_size,
&title_natural_size);
}
if (priv->label_box != NULL)
else if (priv->label_box != NULL)
{
gtk_widget_get_preferred_width_for_height (priv->label_box,
height,
@ -1157,8 +1156,7 @@ gtk_header_bar_allocate_contents (GtkCssGadget *gadget,
if (priv->custom_title != NULL &&
gtk_widget_get_visible (priv->custom_title))
gtk_widget_size_allocate (priv->custom_title, &child_allocation);
if (priv->label_box != NULL)
else if (priv->label_box != NULL)
gtk_widget_size_allocate (priv->label_box, &child_allocation);
child_allocation.y = allocation->y;