[gtk+] assistant: Drop unnecessary frame
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] assistant: Drop unnecessary frame
- Date: Sun, 3 Jan 2016 15:35:32 +0000 (UTC)
commit 9c39232ab399eb3138fa4924b6072c3d340c215e
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 3 10:33:54 2016 -0500
assistant: Drop unnecessary frame
We can just style the sidebar box itself, no need for an
extra frame widget.
gtk/gtkassistant.c | 4 +---
gtk/ui/gtkassistant.ui | 11 ++---------
2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 2945d53..4ef85bc 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 a77d3fd..e516c91 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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]