fix: block signals modified the store upon startup

Author: Doublonmousse

crates/rnote-ui/src/appwindow/mod.rs

@@ -237,9 +237,11 @@ impl RnAppWindow {
         // An initial tab (canvas).
         self.add_initial_tab();
 
+        // NOW we can re enable the signal handler for the tab
+
         // Anything that needs to be done right before showing the appwindow
 
-        self.refresh_ui();
+        self.refresh_ui(true);
     }
 
     fn setup_icon_theme(&self) {
@@ -285,7 +287,7 @@ impl RnAppWindow {
             canvas.queue_resize();
         }
         if widget_flags.refresh_ui {
-            self.refresh_ui();
+            self.refresh_ui(false);
         }
         if widget_flags.store_modified {
             canvas.set_unsaved_changes(true);
@@ -383,7 +385,9 @@ impl RnAppWindow {
     /// adds the initial tab to the tabview
     fn add_initial_tab(&self) -> adw::TabPage {
         let wrapper = self.new_canvas_wrapper();
-        self.append_wrapper_new_tab(&wrapper)
+        let out = self.append_wrapper_new_tab(&wrapper);
+        self.overlays().set_tab_signal_state(true);
+        out
     }
 
     /// Creates a new canvas wrapper without attaching it as a tab.
@@ -697,7 +701,7 @@ impl RnAppWindow {
     }
 
     /// Refresh the UI from the global state and from the current active tab page.
-    pub(crate) fn refresh_ui(&self) {
+    pub(crate) fn refresh_ui(&self, startup: bool) {
         let canvas = self.active_tab_canvas();
 
         self.overlays().penssidebar().brush_page().refresh_ui(self);
@@ -712,7 +716,7 @@ impl RnAppWindow {
             .selector_page()
             .refresh_ui(self);
         self.overlays().penssidebar().tools_page().refresh_ui(self);
-        self.sidebar().settings_panel().refresh_ui(self);
+        self.sidebar().settings_panel().refresh_ui(self, startup);
 
         if let Some(canvas) = canvas {
             self.refresh_titles(&canvas);

crates/rnote-ui/src/overlays.rs

@@ -9,10 +9,12 @@ use gtk4::{
 };
 use rnote_engine::ext::GdkRGBAExt;
 use rnote_engine::pens::PenStyle;
-use std::cell::{Cell, RefCell};
-use tracing::error;
+use std::cell::{Cell, Ref, RefCell};
+use tracing::{debug, error};
 
 mod imp {
+    use adw::glib::SignalHandlerId;
+
     use super::*;
 
     #[derive(Default, Debug, CompositeTemplate)]
@@ -33,6 +35,7 @@ mod imp {
         pub(crate) colorpicker: TemplateChild<RnColorPicker>,
         #[template_child]
         pub(crate) tabview: TemplateChild<adw::TabView>,
+        pub(crate) tabview_connect_selected: RefCell<Option<SignalHandlerId>>,
         #[template_child]
         pub(crate) sidebar_box: TemplateChild<gtk4::Box>,
         #[template_child]
@@ -230,23 +233,31 @@ impl RnOverlays {
     fn setup_tabview(&self, appwindow: &RnAppWindow) {
         let imp = self.imp();
 
-        imp.tabview.connect_selected_page_notify(clone!(
-            #[weak]
-            appwindow,
-            move |_| {
-                let Some(active_tab_page) = appwindow.active_tab_page() else {
-                    return;
-                };
-                let active_canvaswrapper = active_tab_page
-                    .child()
-                    .downcast::<RnCanvasWrapper>()
-                    .unwrap();
-                appwindow.tabs_set_unselected_inactive();
-                let widget_flags = active_canvaswrapper.canvas().engine_mut().set_active(true);
-                appwindow.handle_widget_flags(widget_flags, &active_canvaswrapper.canvas());
-                appwindow.refresh_ui();
-            }
-        ));
+        imp.tabview_connect_selected
+            .replace(Some(imp.tabview.connect_selected_page_notify(clone!(
+                #[weak]
+                appwindow,
+                move |_| {
+                    let Some(active_tab_page) = appwindow.active_tab_page() else {
+                        return;
+                    };
+                    let active_canvaswrapper = active_tab_page
+                        .child()
+                        .downcast::<RnCanvasWrapper>()
+                        .unwrap();
+                    appwindow.tabs_set_unselected_inactive();
+                    let widget_flags = active_canvaswrapper.canvas().engine_mut().set_active(true);
+                    appwindow.handle_widget_flags(widget_flags, &active_canvaswrapper.canvas());
+                    appwindow.refresh_ui(false);
+                    // this is an issue
+                    // check if we can disable this call for the first tab
+                }
+            ))));
+
+        // TODO : retest that this is responsible for the unsaved indicator in some way
+        // we set the connect select to false initially
+        // as we don't want the first added tab to send anything
+        self.set_tab_signal_state(false);
 
         imp.tabview.connect_page_attached(clone!(
             #[weak]
@@ -331,6 +342,26 @@ impl RnOverlays {
         ));
     }
 
+    pub(crate) fn set_tab_signal_state(&self, state: bool) {
+        let imp = self.imp();
+        debug!("setting the tab signal state to {:?}", state);
+
+        Ref::map(imp.tabview_connect_selected.borrow(), |x| {
+            match x {
+                Some(handler_id) => {
+                    debug!("handler id exists applying");
+                    if state {
+                        imp.tabview.unblock_signal(handler_id)
+                    } else {
+                        imp.tabview.block_signal(handler_id)
+                    }
+                }
+                None => (),
+            }
+            x
+        });
+    }
+
     pub(crate) fn progressbar_start_pulsing(&self) {
         const PULSE_INTERVAL: std::time::Duration = std::time::Duration::from_millis(300);