From: Timm Bäder <mail@baedert.org>
Date: Sat, 2 Apr 2016 14:20:09 +0000 (+0200)
Subject: headerbar: Don't underallocate the label box
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~5031
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58891c1fe5f10f9823a8b61f4df1a1db9c0fd479;p=gtk4.git

headerbar: Don't underallocate the label box

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.
---

diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 819fc4a6ac..ee7a34cadc 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -646,7 +646,12 @@ gtk_header_bar_get_size (GtkWidget      *widget,
   center_min = center_nat = 0;
   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;
     }