callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

headerbar: Don't underallocate the label box

Browse Source 
We use a label_sizing_box to make sure the headerbar can always contain
both a title and a subtitle without resizing when showing/hiding either
of them, but we should only do that for the height; the min width of the
label_box can be larger than that of the label_sizing_box.
This commit is contained in:
Timm Bäder 2016-04-02 16:20:09 +02:00
parent d23c6c6246
commit 58891c1fe5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkheaderbar.c
View File

@ -646,7 +646,12 @@ gtk_header_bar_get_size (GtkWidget *widget,
center_min = center_nat = 0; center_min = center_nat = 0;
if (priv->label_box != NULL) if (priv->label_box != NULL)
{ {
if (add_child_size (priv->label_sizing_box, orientation, &center_min, &center_nat)) if (orientation == GTK_ORIENTATION_HORIZONTAL)
add_child_size (priv->label_box, orientation, &center_min, &center_nat);
else
add_child_size (priv->label_sizing_box, orientation, &center_min, &center_nat);
if (_gtk_widget_get_visible (priv->label_sizing_box))
nvis_children += 1; nvis_children += 1;
} }