From 0bb0035f3c3c1bcf2c3aa8fcb9b4e57611d282ec Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Wed, 13 Dec 2017 13:53:15 +0200
Subject: [PATCH] Rework of the Headerbar.

Added a stack to switch between a normal and a BackButton view.
Also added a centered stack switcher and removed the Home button.
Backbutton is not wired yet.
---
 hammond-gtk/resources/gtk/headerbar.ui | 113 ++++++++++++++++++++++---
 hammond-gtk/src/headerbar.rs           |  15 +++-
 2 files changed, 113 insertions(+), 15 deletions(-)

diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui
index fc17ce5..0946f21 100644
--- a/hammond-gtk/resources/gtk/headerbar.ui
+++ b/hammond-gtk/resources/gtk/headerbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.1 -->
+<!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkPopover" id="add-popover">
@@ -109,20 +109,70 @@
       </object>
     </child>
   </object>
-  <object class="GtkHeaderBar" id="headerbar1">
+  <object class="GtkBox" id="back_view">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="has_subtitle">False</property>
-    <property name="show_close_button">True</property>
     <child>
-      <object class="GtkMenuButton" id="add-toggle-button">
+      <object class="GtkButton" id="back_button">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon_name">go-previous-symbolic</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child type="center">
+      <object class="GtkLabel" id="show_title">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Show Title</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkHeaderBar" id="headerbar">
+    <property name="can_focus">False</property>
+    <property name="show_close_button">True</property>
+    <child type="title">
+      <object class="GtkStack" id="headerbar_stack">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkBox" id="normal_view">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="spacing">5</property>
+    <child>
+      <object class="GtkMenuButton" id="add_toggle_button">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="tooltip_text" translatable="yes">Add a new feed</property>
-        <property name="valign">center</property>
         <child>
-          <object class="GtkImage" id="add-button-image">
+          <object class="GtkImage" id="add-button-image1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="stock">gtk-add</property>
@@ -135,26 +185,63 @@
         </style>
       </object>
       <packing>
-        <property name="position">1</property>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">0</property>
       </packing>
     </child>
-    <child>
+    <child type="center">
       <object class="GtkStackSwitcher" id="switch">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="hexpand">True</property>
+        <property name="icon_size">0</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkMenuButton" id="menu">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon_name">open-menu-symbolic</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="pack_type">end</property>
         <property name="position">2</property>
       </packing>
     </child>
     <child>
-      <object class="GtkButton" id="refbutton">
+      <object class="GtkSeparator">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="pack_type">end</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButton" id="ref_button">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>
-        <property name="valign">center</property>
         <property name="use_underline">True</property>
         <property name="always_show_image">True</property>
         <child>
@@ -167,8 +254,10 @@
         </child>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
         <property name="pack_type">end</property>
-        <property name="position">-1</property>
+        <property name="position">3</property>
       </packing>
     </child>
   </object>
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 140eac2..1a8d6b4 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -15,24 +15,33 @@ pub struct Header {
     refresh: gtk::Button,
     add_toggle: gtk::MenuButton,
     switch: gtk::StackSwitcher,
+    stack: gtk::Stack,
 }
 
 impl Header {
     pub fn new() -> Header {
         let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
 
-        let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap();
-        let refresh: gtk::Button = builder.get_object("refbutton").unwrap();
-        let add_toggle: gtk::MenuButton = builder.get_object("add-toggle-button").unwrap();
+        let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap();
+        let refresh: gtk::Button = builder.get_object("ref_button").unwrap();
+        let add_toggle: gtk::MenuButton = builder.get_object("add_toggle_button").unwrap();
         let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
+        let stack: gtk::Stack = builder.get_object("headerbar_stack").unwrap();
+        let normal_view: gtk::Box = builder.get_object("normal_view").unwrap();
+        let back_view: gtk::Box = builder.get_object("back_view").unwrap();
         switch.set_halign(gtk::Align::Center);
         switch.show();
 
+        stack.add_named(&normal_view, "normal_view");
+        stack.add_named(&back_view, "back_view");
+        stack.set_visible_child_name("normal_view");
+
         Header {
             container: header,
             refresh,
             add_toggle,
             switch,
+            stack,
         }
     }