fix: don't sync document state between tabs,

indicate modified document when changing document layout,
fixes #1021

Author: flxzt

crates/rnote-engine/src/engine/import.rs

@@ -152,10 +152,41 @@ impl Engine {
         self.penholder = engine_config.penholder;
         self.import_prefs = engine_config.import_prefs;
         self.export_prefs = engine_config.export_prefs;
-        self.pen_sounds = engine_config.pen_sounds;
 
         // Set the pen sounds to update the audioplayer
-        self.set_pen_sounds(self.pen_sounds, data_dir);
+        self.set_pen_sounds(engine_config.pen_sounds, data_dir);
+
+        widget_flags |= self
+            .penholder
+            .reinstall_pen_current_style(&mut EngineViewMut {
+                tasks_tx: self.tasks_tx.clone(),
+                pens_config: &mut self.pens_config,
+                document: &mut self.document,
+                store: &mut self.store,
+                camera: &mut self.camera,
+                audioplayer: &mut self.audioplayer,
+            });
+        widget_flags |= self.doc_resize_to_fit_content();
+        widget_flags.redraw = true;
+        widget_flags.refresh_ui = true;
+        widget_flags
+    }
+
+    /// Loads the config when syncing engine state between tabs.
+    pub fn load_engine_config_sync_tab(
+        &mut self,
+        engine_config: EngineConfig,
+        data_dir: Option<PathBuf>,
+    ) -> WidgetFlags {
+        let mut widget_flags = WidgetFlags::default();
+
+        self.pens_config = engine_config.pens_config;
+        self.penholder = engine_config.penholder;
+        self.import_prefs = engine_config.import_prefs;
+        self.export_prefs = engine_config.export_prefs;
+
+        // Set the pen sounds to update the audioplayer
+        self.set_pen_sounds(engine_config.pen_sounds, data_dir);
 
         widget_flags |= self
             .penholder

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

@@ -827,7 +827,7 @@ impl RnAppWindow {
         let active_canvas_wrapper = active_tab.child().downcast::<RnCanvasWrapper>().unwrap();
         let active_canvas = active_canvas_wrapper.canvas();
 
-        let mut widget_flags = active_canvas.engine_mut().load_engine_config(
+        let mut widget_flags = active_canvas.engine_mut().load_engine_config_sync_tab(
             prev_canvas.engine_ref().extract_engine_config(),
             crate::env::pkg_data_dir().ok(),
         );

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

@@ -616,14 +616,17 @@ impl RnSettingsPanel {
                     let document_layout = settings_panel.document_layout();
                     let canvas = appwindow.active_tab_wrapper().canvas();
 
-                    appwindow
-                        .main_header()
-                        .canvasmenu()
-                        .fixedsize_quickactions_box()
-                        .set_sensitive(document_layout == Layout::FixedSize);
-
-                    let widget_flags = canvas.engine_mut().set_doc_layout(document_layout);
-                    appwindow.handle_widget_flags(widget_flags, &canvas);
+                    if canvas.engine_ref().document.layout != document_layout {
+                        appwindow
+                            .main_header()
+                            .canvasmenu()
+                            .fixedsize_quickactions_box()
+                            .set_sensitive(document_layout == Layout::FixedSize);
+
+                        let mut widget_flags = canvas.engine_mut().set_doc_layout(document_layout);
+                        widget_flags.store_modified = true;
+                        appwindow.handle_widget_flags(widget_flags, &canvas);
+                    }
                 }),
             );