From dbe08f7deb1bc7dca622a7e2528cfc4b6d102cb0 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Sat, 16 Dec 2017 14:17:27 +0200
Subject: [PATCH] EpisodeListBox: Improve the separator workaround.

---
 hammond-gtk/resources/gtk/episode_widget.ui | 15 ++-------------
 hammond-gtk/resources/gtk/show_widget.ui    |  2 +-
 hammond-gtk/src/widgets/episode.rs          | 10 ++++++++--
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/hammond-gtk/resources/gtk/episode_widget.ui b/hammond-gtk/resources/gtk/episode_widget.ui
index 527dee8..dc3cdf9 100644
--- a/hammond-gtk/resources/gtk/episode_widget.ui
+++ b/hammond-gtk/resources/gtk/episode_widget.ui
@@ -6,17 +6,6 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkSeparator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -255,7 +244,7 @@
         <property name="expand">True</property>
         <property name="fill">True</property>
         <property name="padding">5</property>
-        <property name="position">1</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
@@ -266,7 +255,7 @@
         <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="padding">5</property>
-        <property name="position">2</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>
diff --git a/hammond-gtk/resources/gtk/show_widget.ui b/hammond-gtk/resources/gtk/show_widget.ui
index 2620800..76a2b2a 100644
--- a/hammond-gtk/resources/gtk/show_widget.ui
+++ b/hammond-gtk/resources/gtk/show_widget.ui
@@ -196,7 +196,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
+                        <property name="shadow_type">in</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs
index fb166a3..35bfb02 100644
--- a/hammond-gtk/src/widgets/episode.rs
+++ b/hammond-gtk/src/widgets/episode.rs
@@ -269,12 +269,18 @@ fn receive() -> glib::Continue {
 pub fn episodes_listbox(pd: &Podcast) -> Result<gtk::ListBox> {
     let episodes = dbqueries::get_pd_episodeswidgets(pd)?;
 
-    // TODO: add a separator
     let list = gtk::ListBox::new();
+
     episodes.into_iter().for_each(|mut ep| {
         let widget = EpisodeWidget::new_initialized(&mut ep, pd);
         list.add(&widget.container);
-        list.add(&gtk::Separator::new(gtk::Orientation::Vertical))
+
+        let sep = gtk::Separator::new(gtk::Orientation::Vertical);
+        sep.set_sensitive(false);
+        sep.set_can_focus(false);
+
+        list.add(&sep);
+        sep.show()
     });
 
     list.set_vexpand(false);