AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

assistant: Drop unnecessary frame

Browse Source 
We can just style the sidebar box itself, no need for an
extra frame widget.
This commit is contained in:
Matthias Clasen 2016-01-03 10:33:54 -05:00
parent adfb76dc7e
commit 9c39232ab3
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkassistant.c
View File

@ -110,7 +110,6 @@ struct _GtkAssistantPrivate
GtkWidget *last;
GtkWidget *sidebar;
GtkWidget *sidebar_frame;
GtkWidget *content;
GtkWidget *action_area;
GtkWidget *headerbar;
@ -663,7 +662,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, close);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, last);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, sidebar);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, sidebar_frame);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, button_size_group);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, title_size_group);
@ -972,7 +970,7 @@ update_title_state (GtkAssistant *assistant)
show_titles = TRUE;
}
gtk_widget_set_visible (priv->sidebar_frame, show_titles);
gtk_widget_set_visible (priv->sidebar, show_titles);
}
static void

11
gtk/ui/gtkassistant.ui
View File

@ -11,19 +11,12 @@
<object class="GtkBox" id="main_box">
<property name="visible">1</property>
<child>
<object class="GtkFrame" id="sidebar_frame">
<object class="GtkBox" id="sidebar">
<property name="visible">1</property>
<property name="orientation">vertical</property>
<style>
<class name="sidebar"/>
</style>
<child>
<object class="GtkBox" id="sidebar">
<property name="visible">1</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
</object>
</child>
<child type="label_item"/>
</object>
<packing>
<property name="fill">0</property>