From 0e2d8ffd37222a6203325f8beb5c1627725c7ed0 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Sun, 5 Nov 2017 10:59:56 +0200
Subject: [PATCH] Removed the grid from the podcasts_view.

---
 hammond-gtk/gtk/podcasts_view.ui       | 34 +++++++++-----------------
 hammond-gtk/src/headerbar.rs           |  4 +--
 hammond-gtk/src/views/podcasts_view.rs | 16 ++++++------
 hammond-gtk/src/widgets/podcast.rs     |  2 +-
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/hammond-gtk/gtk/podcasts_view.ui b/hammond-gtk/gtk/podcasts_view.ui
index 3e304ea..55e74d0 100644
--- a/hammond-gtk/gtk/podcasts_view.ui
+++ b/hammond-gtk/gtk/podcasts_view.ui
@@ -2,41 +2,29 @@
 <!-- Generated with glade 3.20.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkGrid" id="grid">
+  <object class="GtkBox" id="fb_parent">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="row_homogeneous">True</property>
-    <property name="column_homogeneous">True</property>
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkBox">
+      <object class="GtkScrolledWindow">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">True</property>
+        <property name="shadow_type">in</property>
         <child>
-          <object class="GtkScrolledWindow">
+          <object class="GtkViewport" id="view">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkViewport" id="view">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
+              <placeholder/>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
   </object>
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 3ec1930..e5e0002 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -38,12 +38,12 @@ pub fn get_headerbar(db: &Database, stack: &gtk::Stack) -> gtk::HeaderBar {
     // and add a StackSwitcher when more views are added.
     home_button.connect_clicked(clone!(db, stack => move |_| {
         let vis = stack.get_visible_child_name().unwrap();
-        if vis == "pd_grid" {
+        if vis == "fb_parent" {
             // More conviniet way to reload podcasts_flowbox while trying out stuff.
             // Ideally, the functionality should be removed from final design.
             update_podcasts_view(&db, &stack);
         } else {
-            stack.set_visible_child_name("pd_grid");
+            stack.set_visible_child_name("fb_parent");
         }
     }));
 
diff --git a/hammond-gtk/src/views/podcasts_view.rs b/hammond-gtk/src/views/podcasts_view.rs
index 7623699..a07f0b0 100644
--- a/hammond-gtk/src/views/podcasts_view.rs
+++ b/hammond-gtk/src/views/podcasts_view.rs
@@ -94,39 +94,39 @@ fn on_flowbox_child_activate(db: &Database, stack: &gtk::Stack, parent: &Podcast
     old.destroy();
 }
 
-fn setup_podcasts_grid(db: &Database, stack: &gtk::Stack) {
+fn setup_podcasts_flowbox(db: &Database, stack: &gtk::Stack) {
     let builder = gtk::Builder::new_from_string(include_str!("../../gtk/podcasts_view.ui"));
-    let grid: gtk::Grid = builder.get_object("grid").unwrap();
+    let fb_parent: gtk::Box = builder.get_object("fb_parent").unwrap();
     let view: gtk::Viewport = builder.get_object("view").unwrap();
 
     let flowbox = init_flowbox(db, stack);
     view.add(&flowbox);
 
-    stack.add_named(&grid, "pd_grid");
-    stack.set_visible_child(&grid);
+    stack.add_named(&fb_parent, "fb_parent");
+    stack.set_visible_child(&fb_parent);
 }
 
 pub fn setup_stack(db: &Database) -> gtk::Stack {
     let stack = gtk::Stack::new();
     stack.set_transition_type(gtk::StackTransitionType::SlideLeftRight);
     setup_podcast_widget(&stack);
-    setup_podcasts_grid(db, &stack);
+    setup_podcasts_flowbox(db, &stack);
     stack
 }
 
 pub fn update_podcasts_view(db: &Database, stack: &gtk::Stack) {
     let builder = gtk::Builder::new_from_string(include_str!("../../gtk/podcasts_view.ui"));
-    let grid: gtk::Grid = builder.get_object("grid").unwrap();
+    let fb_parent: gtk::Box = builder.get_object("fb_parent").unwrap();
     let view: gtk::Viewport = builder.get_object("view").unwrap();
 
     let flowbox = init_flowbox(db, stack);
     view.add(&flowbox);
 
-    let old = stack.get_child_by_name("pd_grid").unwrap();
+    let old = stack.get_child_by_name("fb_parent").unwrap();
     let vis = stack.get_visible_child_name().unwrap();
 
     stack.remove(&old);
-    stack.add_named(&grid, "pd_grid");
+    stack.add_named(&fb_parent, "fb_parent");
     // preserve the visible widget
     stack.set_visible_child_name(&vis);
 
diff --git a/hammond-gtk/src/widgets/podcast.rs b/hammond-gtk/src/widgets/podcast.rs
index d06df5e..681b8e0 100644
--- a/hammond-gtk/src/widgets/podcast.rs
+++ b/hammond-gtk/src/widgets/podcast.rs
@@ -76,7 +76,7 @@ fn on_unsub_button_clicked(
         };
     }
     update_podcasts_view(db, stack);
-    stack.set_visible_child_name("pd_grid")
+    stack.set_visible_child_name("fb_parent")
 }
 
 fn on_played_button_clicked(db: &Database, stack: &gtk::Stack, pd: &Podcast) {