From a3fd5a010b59187b5ce739b0eb07d6ccd2b02887 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 18 Dec 2015 22:57:16 -0500
Subject: [PATCH] Simplify actionbar

We don't need a frame widget here, just render a top border on the
box.
---
 gtk/gtkactionbar.c                       |  3 ++-
 gtk/theme/Adwaita/_common.scss           |  5 +----
 gtk/theme/Adwaita/gtk-contained-dark.css |  6 ++----
 gtk/theme/Adwaita/gtk-contained.css      |  6 ++----
 gtk/ui/gtkactionbar.ui                   | 12 ++----------
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index b88b1d8da9..84c43a83a4 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -251,8 +251,9 @@ gtk_action_bar_allocate (GtkCssGadget        *gadget,
                          gpointer             data)
 {
   GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
+  GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (GTK_ACTION_BAR (widget));
 
-  GTK_WIDGET_CLASS (gtk_action_bar_parent_class)->size_allocate (widget, (GtkAllocation *)allocation);
+  gtk_widget_size_allocate (priv->revealer, (GtkAllocation *)allocation);
 
   gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
 }
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 250dce1a45..17fa5c76c0 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2514,12 +2514,9 @@ paper {
   &:backdrop { border-color: $backdrop_borders_color; }
 }
 
-actionbar frame border {
-  border-width: 1px 0 0;
-}
-
 actionbar box {
   padding: 6px;
+  border-width: 1px 0 0;
 }
 
 placessidebar,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9db0bb5fd0..c5c0749544 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3506,11 +3506,9 @@ paper {
   paper:backdrop {
     border-color: #1f2222; }
 
-actionbar frame border {
-  border-width: 1px 0 0; }
-
 actionbar box {
-  padding: 6px; }
+  padding: 6px;
+  border-width: 1px 0 0; }
 
 placessidebar viewport.frame,
 scrolledwindow viewport.frame {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 5d0a8334f2..72012a908d 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3668,11 +3668,9 @@ paper {
   paper:backdrop {
     border-color: #a5a5a1; }
 
-actionbar frame border {
-  border-width: 1px 0 0; }
-
 actionbar box {
-  padding: 6px; }
+  padding: 6px;
+  border-width: 1px 0 0; }
 
 placessidebar viewport.frame,
 scrolledwindow viewport.frame {
diff --git a/gtk/ui/gtkactionbar.ui b/gtk/ui/gtkactionbar.ui
index 16fab16bcd..d826768f3b 100644
--- a/gtk/ui/gtkactionbar.ui
+++ b/gtk/ui/gtkactionbar.ui
@@ -6,17 +6,9 @@
       <object class="GtkRevealer" id="revealer">
         <property name="visible">1</property>
         <child>
-          <object class="GtkFrame" id="frame">
+          <object class="GtkBox" id="box">
             <property name="visible">1</property>
-            <style>
-              <class name="action-bar"/>
-            </style>
-            <child>
-              <object class="GtkBox" id="box">
-                <property name="visible">1</property>
-                <property name="spacing">6</property>
-              </object>
-            </child>
+            <property name="spacing">6</property>
           </object>
         </child>
       </object>