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

Simplify actionbar

Browse Source 
We don't need a frame widget here, just render a top border on the
box.
This commit is contained in:
Matthias Clasen 2015-12-18 22:57:16 -05:00
parent b90fa7dcd1
commit a3fd5a010b
5 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkactionbar.c
View File

@ -251,8 +251,9 @@ gtk_action_bar_allocate (GtkCssGadget *gadget,
gpointer data) gpointer data)
{ {
GtkWidget *widget = gtk_css_gadget_get_owner (gadget); 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); gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
} }

5
gtk/theme/Adwaita/_common.scss
View File

@ -2514,12 +2514,9 @@ paper {
&:backdrop { border-color: $backdrop_borders_color; } &:backdrop { border-color: $backdrop_borders_color; }
} }
actionbar frame border {
border-width: 1px 0 0;
}
actionbar box { actionbar box {
padding: 6px; padding: 6px;
border-width: 1px 0 0;
} }
placessidebar, placessidebar,

6
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -3506,11 +3506,9 @@ paper {
paper:backdrop { paper:backdrop {
border-color: #1f2222; } border-color: #1f2222; }
actionbar frame border {
border-width: 1px 0 0; }
actionbar box { actionbar box {
padding: 6px; } padding: 6px;
border-width: 1px 0 0; }
placessidebar viewport.frame, placessidebar viewport.frame,
scrolledwindow viewport.frame { scrolledwindow viewport.frame {

6
gtk/theme/Adwaita/gtk-contained.css
View File

@ -3668,11 +3668,9 @@ paper {
paper:backdrop { paper:backdrop {
border-color: #a5a5a1; } border-color: #a5a5a1; }
actionbar frame border {
border-width: 1px 0 0; }
actionbar box { actionbar box {
padding: 6px; } padding: 6px;
border-width: 1px 0 0; }
placessidebar viewport.frame, placessidebar viewport.frame,
scrolledwindow viewport.frame { scrolledwindow viewport.frame {

8
gtk/ui/gtkactionbar.ui
View File

@ -5,12 +5,6 @@
<child> <child>
<object class="GtkRevealer" id="revealer"> <object class="GtkRevealer" id="revealer">
<property name="visible">1</property> <property name="visible">1</property>
<child>
<object class="GtkFrame" id="frame">
<property name="visible">1</property>
<style>
<class name="action-bar"/>
</style>
<child> <child>
<object class="GtkBox" id="box"> <object class="GtkBox" id="box">
<property name="visible">1</property> <property name="visible">1</property>
@ -19,7 +13,5 @@
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
</template> </template>
</interface> </interface>