diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-01-03 10:33:54 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-01-03 10:33:54 -0500 |
| commit | 9c39232ab399eb3138fa4924b6072c3d340c215e (patch) | |
| tree | fb1e95d061c2f2030e7e577588dd8f0fc9fd7be9 | |
| parent | adfb76dc7ee8e78e54c343230091b3b01fa11760 (diff) | |
| download | gtk+-9c39232ab399eb3138fa4924b6072c3d340c215e.tar.gz | |
assistant: Drop unnecessary frame
We can just style the sidebar box itself, no need for an
extra frame widget.
| -rw-r--r-- | gtk/gtkassistant.c | 4 | ||||
| -rw-r--r-- | gtk/ui/gtkassistant.ui | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 2945d534ee..4ef85bc260 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -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 diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui index a77d3fdf57..e516c910c9 100644 --- a/gtk/ui/gtkassistant.ui +++ b/gtk/ui/gtkassistant.ui @@ -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> |