From c8a473b9bb3c070a92a3fc00dc67332c07342b86 Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Tue, 3 Nov 2020 16:41:17 +0100
Subject: [PATCH] Go back to sidebar when collapsed

---
 res/ui/recording_selector.ui      | 9 ++++-----
 res/ui/window.ui                  | 1 -
 src/dialogs/recording_selector.rs | 4 ++++
 src/widgets/navigator.rs          | 9 +++++++++
 src/window.rs                     | 3 +++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/res/ui/recording_selector.ui b/res/ui/recording_selector.ui
index 37d8a8c..a07ca59 100644
--- a/res/ui/recording_selector.ui
+++ b/res/ui/recording_selector.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.38.1 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
-  <requires lib="libhandy" version="1.0"/>
+  <requires lib="gtk+" version="3.22" />
+  <requires lib="libhandy" version="1.0" />
   <object class="GtkBox" id="empty_screen">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -12,7 +12,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="hexpand">True</property>
-        <property name="title" translatable="yes">Select a recording</property>
         <property name="show-close-button">True</property>
       </object>
       <packing>
@@ -95,7 +94,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="visible-child">sidebar_box</property>
-        <property name="can-swipe-back">True</property>
         <child>
           <object class="GtkBox" id="sidebar_box">
             <property name="width-request">250</property>
@@ -107,6 +105,7 @@
               <object class="HdyHeaderBar">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="title" translatable="yes">Select a recording</property>
                 <property name="show-close-button" bind-source="leaflet" bind-property="folded" bind-flags="sync-create">False</property>
                 <child>
                   <object class="GtkButton" id="add_button">
@@ -140,7 +139,7 @@
             <property name="can-focus">False</property>
             <property name="orientation">vertical</property>
             <style>
-              <class name="sidebar"/>
+              <class name="sidebar" />
             </style>
           </object>
           <packing>
diff --git a/res/ui/window.ui b/res/ui/window.ui
index a74220f..ca4574f 100644
--- a/res/ui/window.ui
+++ b/res/ui/window.ui
@@ -233,7 +233,6 @@
           <object class="HdyLeaflet" id="leaflet">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="can-swipe-back">True</property>
             <child>
               <object class="GtkBox" id="sidebar_box">
                 <property name="width-request">250</property>
diff --git a/src/dialogs/recording_selector.rs b/src/dialogs/recording_selector.rs
index dcf30dd..787b599 100644
--- a/src/dialogs/recording_selector.rs
+++ b/src/dialogs/recording_selector.rs
@@ -40,6 +40,10 @@ impl RecordingSelector {
         let navigator = Navigator::new(&empty_screen);
         leaflet.add(&navigator.widget);
 
+        navigator.set_back_cb(clone!(@strong leaflet, @strong sidebar_box => move || {
+            leaflet.set_visible_child(&sidebar_box);
+        }));
+
         let result = Rc::new(Self {
             backend: backend,
             window: window,
diff --git a/src/widgets/navigator.rs b/src/widgets/navigator.rs
index 9274a31..1a94ff7 100644
--- a/src/widgets/navigator.rs
+++ b/src/widgets/navigator.rs
@@ -13,6 +13,7 @@ pub struct Navigator {
     pub widget: gtk::Stack,
     screens: RefCell<Vec<Rc<dyn NavigatorScreen>>>,
     old_screens: RefCell<Vec<Rc<dyn NavigatorScreen>>>,
+    back_cb: RefCell<Option<Box<dyn Fn() -> ()>>>,
 }
 
 impl Navigator {
@@ -30,6 +31,7 @@ impl Navigator {
             widget,
             screens: RefCell::new(Vec::new()),
             old_screens: RefCell::new(Vec::new()),
+            back_cb: RefCell::new(None),
         });
 
         unsafe {
@@ -46,6 +48,10 @@ impl Navigator {
         result
     }
 
+    pub fn set_back_cb<F>(&self, cb: F) where F: Fn() -> () + 'static {
+        self.back_cb.replace(Some(Box::new(cb)));
+    }
+
     pub fn push<S>(self: Rc<Self>, screen: Rc<S>)
     where
         S: NavigatorScreen + 'static,
@@ -80,6 +86,9 @@ impl Navigator {
                 screen.attach_navigator(self.clone());
             } else {
                 self.widget.set_visible_child_name("empty_screen");
+                if let Some(cb) = &*self.back_cb.borrow() {
+                    cb()
+                }
             }
 
             if !self.widget.get_transition_running() {
diff --git a/src/window.rs b/src/window.rs
index bec7bbf..0709914 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -38,6 +38,9 @@ impl Window {
 
         let poe_list = PoeList::new(backend.clone());
         let navigator = Navigator::new(&empty_screen);
+        navigator.set_back_cb(clone!(@strong leaflet, @strong sidebar_box => move || {
+            leaflet.set_visible_child(&sidebar_box);
+        }));
 
         let result = Rc::new(Self {
             backend,