save lock state, and connect the buttons in the settings to the canvas

Author: Doublonmousse

crates/rnote-engine/src/pens/penmode.rs

@@ -29,7 +29,9 @@ pub struct PenModeState {
     penmode_eraser_style: PenStyle,
 
     //lock styles
+    #[serde(rename = "lock_pen")]
     penmode_pen_lock: bool,
+    #[serde(rename = "lock_eraser")]
     penmode_eraser_lock: bool,
 
     #[serde(skip)]
@@ -45,7 +47,7 @@ impl Default for PenModeState {
             penmode_pen_style: PenStyle::Brush,
             penmode_eraser_style: PenStyle::Eraser,
 
-            penmode_pen_lock: true,
+            penmode_pen_lock: false,
             penmode_eraser_lock: true,
 
             penmode_pen_style_override: None,
@@ -60,6 +62,8 @@ impl CloneConfig for PenModeState {
             pen_mode: self.pen_mode,
             penmode_pen_style: self.penmode_pen_style,
             penmode_eraser_style: self.penmode_eraser_style,
+            penmode_pen_lock: self.penmode_pen_lock,
+            penmode_eraser_lock: self.penmode_eraser_lock,
             ..Default::default()
         }
     }
@@ -80,6 +84,13 @@ impl PenModeState {
         }
     }
 
+    pub fn set_lock(&mut self, pen_mode: PenMode, state: bool) {
+        match pen_mode {
+            PenMode::Pen => self.penmode_pen_lock = state,
+            PenMode::Eraser => self.penmode_eraser_lock = state,
+        }
+    }
+
     pub fn current_style_w_override(&self) -> PenStyle {
         match self.pen_mode {
             PenMode::Pen => self

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

@@ -341,8 +341,9 @@ impl RnAppWindow {
                         appwindow.overlays().dispatch_toast_w_button_singleton(
                         &gettext("Tool Locked"), 
                         &gettext("Unlock"), //padlock symbol ? 
-                        clone!(@weak canvas =>  move |_reload_toast | {
+                        clone!(@weak canvas, @weak appwindow =>  move |_reload_toast | {
                                 canvas.engine_mut().penholder.pen_mode_state_mut().unlock_pen(active_pen);
+                                appwindow.sidebar().settings_panel().lock_pen_switch().set_state(false);
                             }
                         )
                         , 2,

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

@@ -162,7 +162,7 @@ impl ObjectImpl for RnAppWindow {
             "touch-drawing" => self.touch_drawing.get().to_value(),
             "focus-mode" => self.focus_mode.get().to_value(),
             "lock-pen" => self.lock_pen.get().to_value(),
-            "eraser-pen" => self.lock_eraser.get().to_value(),
+            "lock-eraser" => self.lock_eraser.get().to_value(),
             _ => unimplemented!(),
         }
     }

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

@@ -351,6 +351,10 @@ impl RnSettingsPanel {
         self.imp().general_inertial_scrolling_row.clone()
     }
 
+    pub(crate) fn lock_pen_switch(&self) -> gtk4::Switch {
+        self.imp().lock_pen_mode.imp().mode.clone()
+    }
+
     pub(crate) fn document_layout(&self) -> Layout {
         Layout::try_from(self.imp().doc_document_layout_row.get().selected()).unwrap()
     }
@@ -592,6 +596,18 @@ impl RnSettingsPanel {
             .bidirectional()
             .build();
 
+        imp.lock_pen_mode.imp().mode.connect_active_notify(
+            clone!(@weak appwindow => move |switch| {
+                appwindow
+                    .active_tab_wrapper()
+                    .canvas()
+                    .engine_mut()
+                    .penholder
+                    .pen_mode_state_mut()
+                    .set_lock(rnote_engine::pens::PenMode::Pen,switch.is_active());
+            }),
+        );
+
         // lock eraser
         imp.lock_eraser_mode
             .imp()
@@ -600,6 +616,18 @@ impl RnSettingsPanel {
             .sync_create()
             .bidirectional()
             .build();
+
+        imp.lock_eraser_mode.imp().mode.connect_active_notify(
+            clone!(@weak appwindow => move |switch| {
+                appwindow
+                    .active_tab_wrapper()
+                    .canvas()
+                    .engine_mut()
+                    .penholder
+                    .pen_mode_state_mut()
+                    .set_lock(rnote_engine::pens::PenMode::Pen,switch.is_active());
+            }),
+        );
     }
 
     fn setup_format(&self, appwindow: &RnAppWindow) {