disable previous next buttons when not available, fix progress

Author: ranfdev

src/macros.rs

@@ -6,6 +6,7 @@ macro_rules! self_action {
             let action = gio::SimpleAction::new($name, None);
             action.connect_activate(clone!(@weak this => move |_,_| this.$method()));
             $self.add_action(&action);
+            action
         }
     }
 }

src/tab.rs

@@ -23,11 +23,11 @@ use crate::common::{glibctx, HistoryItem, LossyTextRead, PageElement, RequestCtx
 use crate::draw_ctx::DrawCtx;
 use crate::gemini;
 
-#[derive(Clone, glib::Boxed, Default)]
+#[derive(Clone, Debug, glib::Boxed, Default)]
 #[boxed_type(name = "GeopardHistoryStatus")]
 pub struct HistoryStatus {
-    current: usize,
-    available: usize,
+    pub(crate) current: usize,
+    pub(crate) available: usize,
 }
 pub mod imp {
 
@@ -230,16 +230,20 @@ impl Tab {
     }
     fn add_to_history(&self, item: HistoryItem) -> usize {
         let imp = self.imp();
-        let mut history = imp.history.borrow_mut();
-        let i = *imp.current_hi.borrow();
-        if let Some(i) = i {
-            let scroll_progress = imp.scroll_win.vadjustment().value();
-            history[i].scroll_progress = scroll_progress;
-            history.truncate(i + 1);
+        let i = {
+            let mut history = imp.history.borrow_mut();
+            let i = *imp.current_hi.borrow();
+            if let Some(i) = i {
+                let scroll_progress = imp.scroll_win.vadjustment().value();
+                history[i].scroll_progress = scroll_progress;
+                history.truncate(i + 1);
+            };
+            history.push(item);
+            let i = history.len() - 1;
+            imp.current_hi.replace(Some(i));
+            i
         };
-        history.push(item);
-        let i = history.len() - 1;
-        imp.current_hi.replace(Some(i));
+        self.notify("history-status");
         self.log_history_position();
         i
     }
@@ -293,6 +297,9 @@ impl Tab {
         let imp = self.imp();
         let mut draw_ctx = imp.draw_ctx.borrow().clone().unwrap();
 
+        *self.imp().progress.borrow_mut() = 0.0;
+        self.notify("progress");
+
         *self.imp().title.borrow_mut() = url.to_string();
         self.notify("title");
 
@@ -326,6 +333,7 @@ impl Tab {
         };
         imp.current_hi.replace(Some(i));
         self.log_history_position();
+        self.notify("history-status");
 
         let h = { imp.history.borrow_mut().get(i).cloned() };
         h.map(|x| self.spawn_request(self.open_history(x)))
@@ -342,6 +350,7 @@ impl Tab {
         };
         imp.current_hi.replace(Some(i));
         self.log_history_position();
+        self.notify("history-status");
 
         let h = { imp.history.borrow_mut().get(i).cloned() };
         h.map(|x| self.spawn_request(self.open_history(x)))

src/window.rs

@@ -16,6 +16,7 @@ use url::Url;
 
 use crate::common::{bookmarks_url, glibctx, BOOKMARK_FILE_PATH};
 use crate::config;
+use crate::tab::HistoryStatus;
 use crate::tab::Tab;
 use crate::{self_action, view};
 
@@ -38,6 +39,8 @@ pub mod imp {
         #[prop(get = Self::progress_animated, set = Self::set_progress_animated)]
         pub(crate) progress: PhantomData<f64>,
         pub(crate) scroll_ctrl: gtk::EventControllerScroll,
+        pub(crate) action_previous: RefCell<Option<gio::SimpleAction>>,
+        pub(crate) action_next: RefCell<Option<gio::SimpleAction>>,
     }
 
     impl Window {
@@ -246,8 +249,11 @@ impl Window {
     fn setup_actions_signals(&self) {
         let imp = self.imp();
 
-        self_action!(self, "previous", previous);
-        self_action!(self, "next", next);
+        let action_previous = self_action!(self, "previous", previous);
+        let action_next = self_action!(self, "next", next);
+        imp.action_previous.borrow_mut().replace(action_previous);
+        imp.action_next.borrow_mut().replace(action_next);
+
         self_action!(self, "new-tab", add_tab_focused);
         self_action!(self, "show-bookmarks", add_tab_focused);
         self_action!(self, "bookmark-current", bookmark_current);
@@ -338,6 +344,30 @@ impl Window {
                 tab.bind_property("progress", self, "progress")
                     .flags(glib::BindingFlags::SYNC_CREATE)
                     .build(),
+                tab.bind_property(
+                    "history-status",
+                    imp.action_next.borrow().as_ref().unwrap(),
+                    "enabled",
+                )
+                .flags(glib::BindingFlags::SYNC_CREATE)
+                .transform_to(|_, v| {
+                    let v: HistoryStatus = v.get().unwrap();
+                    let res = v.current + 1 < v.available;
+                    Some(res.to_value())
+                })
+                .build(),
+                tab.bind_property(
+                    "history-status",
+                    imp.action_previous.borrow().as_ref().unwrap(),
+                    "enabled",
+                )
+                .flags(glib::BindingFlags::SYNC_CREATE)
+                .transform_to(|_, v| {
+                    let v: HistoryStatus = v.get().unwrap();
+                    let res = v.available >= 1 && v.current > 0;
+                    Some(res.to_value())
+                })
+                .build(),
             ]);
         };
     }