[gtk+/wip/matthiasc/gadget] headerbar: Stop manually applying css margins

[Matthias Clasen <matthiasc src gnome org>]

commit 3d32e06337d1ab7cbeeda42eb15da8288ea5ed9f
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 7 08:57:59 2015 -0500

    headerbar: Stop manually applying css margins
    
    This causes the header bar to be too high, and is not necessary
    anymore.

 gtk/gtkheaderbar.c |   54 +--------------------------------------------------
 1 files changed, 2 insertions(+), 52 deletions(-)
---
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index eb20425..feb540e 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -122,25 +122,6 @@ G_DEFINE_TYPE_WITH_CODE (GtkHeaderBar, gtk_header_bar, GTK_TYPE_CONTAINER,
                                                 gtk_header_bar_buildable_init));
 
 static void
-get_css_padding_and_border (GtkWidget *widget,
-                            GtkBorder *border)
-{
-  GtkStyleContext *context;
-  GtkStateFlags state;
-  GtkBorder tmp;
-
-  context = gtk_widget_get_style_context (widget);
-  state = gtk_widget_get_state_flags (widget);
-
-  gtk_style_context_get_padding (context, state, border);
-  gtk_style_context_get_border (context, state, &tmp);
-  border->top += tmp.top;
-  border->right += tmp.right;
-  border->bottom += tmp.bottom;
-  border->left += tmp.left;
-}
-
-static void
 init_sizing_box (GtkHeaderBar *bar)
 {
   GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
@@ -648,7 +629,6 @@ gtk_header_bar_get_size (GtkWidget      *widget,
   GList *l;
   gint nvis_children;
   gint minimum, natural;
-  GtkBorder css_borders;
   gint center_min, center_nat;
 
   minimum = natural = 0;
@@ -693,22 +673,6 @@ gtk_header_bar_get_size (GtkWidget      *widget,
       natural += nvis_children * priv->spacing;
     }
 
-  get_css_padding_and_border (widget, &css_borders);
-
-  if (GTK_ORIENTATION_HORIZONTAL == orientation)
-    {
-      minimum += center_min + css_borders.left + css_borders.right;
-      natural += center_nat + css_borders.left + css_borders.right;
-    }
-  else
-    {
-      /* We don't enforce css borders on the center widget, to make
-       * title/subtitle combinations fit without growing the header
-       */
-      minimum = MAX (center_min, minimum + css_borders.top + css_borders.bottom);
-      natural = MAX (center_nat, natural + css_borders.top + css_borders.bottom);
-    }
-
   *minimum_size = minimum;
   *natural_size = natural;
 }
@@ -788,11 +752,6 @@ gtk_header_bar_compute_size_for_orientation (GtkWidget *widget,
       required_natural += nvis_children * priv->spacing;
     }
 
-  get_css_padding_and_border (widget, &css_borders);
-
-  required_size += css_borders.left + css_borders.right;
-  required_natural += css_borders.left + css_borders.right;
-
   *minimum_size = required_size;
   *natural_size = required_natural;
 }
@@ -909,14 +868,6 @@ gtk_header_bar_compute_size_for_opposing_orientation (GtkWidget *widget,
       computed_natural = MAX (computed_natural, child_natural);
     }
 
-  get_css_padding_and_border (widget, &css_borders);
-
-  /* We don't enforce css borders on the center widget, to make
-   * title/subtitle combinations fit without growing the header
-   */
-  computed_minimum = MAX (center_min, computed_minimum + css_borders.top + css_borders.bottom);
-  computed_natural = MAX (center_nat, computed_natural + css_borders.top + css_borders.bottom);
-
   *minimum_size = computed_minimum;
   *natural_size = computed_natural;
 }
@@ -1046,9 +997,8 @@ gtk_header_bar_allocate_contents (GtkCssGadget        *gadget,
   nvis_children = count_visible_children (bar);
   sizes = g_newa (GtkRequestedSize, nvis_children);
 
-  get_css_padding_and_border (widget, &css_borders);
-  width = allocation->width - nvis_children * priv->spacing - css_borders.left - css_borders.right;
-  height = allocation->height - css_borders.top - css_borders.bottom;
+  width = allocation->width - nvis_children * priv->spacing;
+  height = allocation->height;
 
   i = 0;
   for (l = priv->children; l; l = l->next)