Merge lp:~elementary-apps/granite/sidebar-gobject-construction into lp:~elementary-apps/granite/sidebar-widget

[Danielle Foré]

Use GObject style construction

Unmerged revisions

990. By Danielle Foré on 2016-09-05

gobject style construction for expandable row and header

=== modified file 'lib/Widgets/Sidebar/SidebarExpandableRow.vala'
--- lib/Widgets/Sidebar/SidebarExpandableRow.vala	2016-09-04 18:50:52 +0000
+++ lib/Widgets/Sidebar/SidebarExpandableRow.vala	2016-09-05 22:42:54 +0000
@@ -27,15 +27,6 @@
         public signal void row_activated (Gtk.ListBoxRow child);
 
         public SidebarExpandableRow () {
-            children = new Gtk.ListBox ();
-
-            revealer = new Gtk.Revealer ();
-            revealer.reveal_child = true;
-            revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
-            revealer.add (children);
-
-            disclosure_triangle = new Gtk.Image.from_icon_name ("pan-down-symbolic", Gtk.IconSize.BUTTON);
-
             revealer.notify["reveal-child"].connect (() => {
                 if (revealer.reveal_child) {
                     disclosure_triangle.icon_name = "pan-down-symbolic";
@@ -44,13 +35,24 @@
                 }
             });
 
-            orientation = Gtk.Orientation.VERTICAL;
-
             children.row_activated.connect ((row) => {
                 row_activated (row);
             });
         }
 
+        construct {
+            children = new Gtk.ListBox ();
+
+            revealer = new Gtk.Revealer ();
+            revealer.reveal_child = true;
+            revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+            revealer.add (children);
+
+            disclosure_triangle = new Gtk.Image.from_icon_name ("pan-down-symbolic", Gtk.IconSize.BUTTON);
+
+            orientation = Gtk.Orientation.VERTICAL;
+        }
+
         public void toggle_reveal_children () {
             if (revealer.reveal_child) {
                 revealer.reveal_child = false;

=== modified file 'lib/Widgets/Sidebar/SidebarHeader.vala'
--- lib/Widgets/Sidebar/SidebarHeader.vala	2016-08-28 16:56:22 +0000
+++ lib/Widgets/Sidebar/SidebarHeader.vala	2016-09-05 22:42:54 +0000
@@ -20,13 +20,36 @@
 
 namespace Granite.Widgets {
     public class SidebarHeader : SidebarExpandableRow {
+        public string label { get; construct; }
+
+        private Gtk.Button header;
+        private Gtk.Revealer header_revealer;
+
         public SidebarHeader (string label) {
+            Object (label: label);
+
+            header.clicked.connect (() => {
+                toggle_reveal_children ();
+            });
+
+            header.enter_notify_event.connect (() => {
+                header_revealer.reveal_child = true;
+                return false;
+            });
+
+            header.leave_notify_event.connect (() => {
+                header_revealer.reveal_child = false;
+                return false;
+            });
+        }
+
+        construct {
             var header_label = new Gtk.Label (label);
             header_label.get_style_context ().add_class ("h4");
             header_label.halign = Gtk.Align.START;
             header_label.hexpand = true;
 
-            var header_revealer = new Gtk.Revealer ();
+            header_revealer = new Gtk.Revealer ();
             header_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
             header_revealer.add (disclosure_triangle);
 
@@ -34,27 +57,13 @@
             header_layout.add (header_label);
             header_layout.add (header_revealer);
 
-            var header = new Gtk.Button ();
+            header = new Gtk.Button ();
             header.get_style_context ().add_class ("list-row");
             header.get_style_context ().remove_class ("button");
             header.add (header_layout);
 
             add (header);
             add (revealer);
-
-            header.clicked.connect (() => {
-                toggle_reveal_children ();
-            });
-
-            header.enter_notify_event.connect (() => {
-                header_revealer.reveal_child = true;
-                return false;
-            });
-
-            header.leave_notify_event.connect (() => {
-                header_revealer.reveal_child = false;
-                return false;
-            });
         }
     }
 }