Tighten session tool state restore

Author: devmobasa

src/input/tool.rs

@@ -7,7 +7,8 @@ use serde::{Deserialize, Serialize};
 ///
 /// The active tool determines what shape is created when the user drags the mouse.
 /// Tools are selected by holding modifier keys (Shift, Ctrl, Tab) while dragging.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 pub enum Tool {
     /// Select/cursor tool - interact with UI without drawing
     Select,

src/session/snapshot.rs

@@ -1,9 +1,8 @@
 use super::options::{CompressionMode, SessionOptions};
 use crate::draw::frame::{MAX_COMPOUND_DEPTH, ShapeId};
 use crate::draw::{Color, EraserKind, Frame};
-use crate::input::EraserMode;
 use crate::input::{
-    InputState,
+    EraserMode, InputState, Tool,
     board_mode::BoardMode,
     state::{MAX_STROKE_THICKNESS, MIN_STROKE_THICKNESS},
 };
@@ -56,6 +55,12 @@ pub struct ToolStateSnapshot {
     pub eraser_kind: EraserKind,
     #[serde(default = "default_eraser_mode_for_snapshot")]
     pub eraser_mode: EraserMode,
+    #[serde(default)]
+    pub marker_opacity: Option<f64>,
+    #[serde(default)]
+    pub fill_enabled: Option<bool>,
+    #[serde(default)]
+    pub tool_override: Option<Tool>,
     pub current_font_size: f64,
     pub text_background_enabled: bool,
     pub arrow_length: f64,
@@ -74,6 +79,9 @@ impl ToolStateSnapshot {
             eraser_size: input.eraser_size,
             eraser_kind: input.eraser_kind,
             eraser_mode: input.eraser_mode,
+            marker_opacity: Some(input.marker_opacity),
+            fill_enabled: Some(input.fill_enabled),
+            tool_override: input.tool_override(),
             current_font_size: input.current_font_size,
             text_background_enabled: input.text_background_enabled,
             arrow_length: input.arrow_length,
@@ -575,30 +583,46 @@ pub fn apply_snapshot(input: &mut InputState, snapshot: SessionSnapshot, options
 
     if options.restore_tool_state {
         if let Some(tool_state) = snapshot.tool_state {
+            let marker_opacity = tool_state.marker_opacity.unwrap_or(input.marker_opacity);
+            let fill_enabled = tool_state.fill_enabled.unwrap_or(input.fill_enabled);
             log::info!(
-                "Restoring tool state: color={:?}, thickness={:.2}, eraser[size={:.2}, kind={:?}, mode={:?}], font_size={:.1}, text_bg={}, arrow[length={:.1}, angle={:.1}], status_bar={}, prev_color={:?}",
+                "Restoring tool state: color={:?}, thickness={:.2}, eraser[size={:.2}, kind={:?}, mode={:?}], marker_opacity={:.2}, fill_enabled={}, tool_override={:?}, font_size={:.1}, text_bg={}, arrow[length={:.1}, angle={:.1}], status_bar={}, prev_color={:?}",
                 tool_state.current_color,
                 tool_state.current_thickness,
                 tool_state.eraser_size,
                 tool_state.eraser_kind,
                 tool_state.eraser_mode,
+                marker_opacity,
+                fill_enabled,
+                tool_state.tool_override,
                 tool_state.current_font_size,
                 tool_state.text_background_enabled,
                 tool_state.arrow_length,
                 tool_state.arrow_angle,
                 tool_state.show_status_bar,
                 tool_state.board_previous_color
             );
-            input.current_color = tool_state.current_color;
-            input.current_thickness = tool_state
-                .current_thickness
-                .clamp(MIN_STROKE_THICKNESS, MAX_STROKE_THICKNESS);
-            input.eraser_size = tool_state
-                .eraser_size
-                .clamp(MIN_STROKE_THICKNESS, MAX_STROKE_THICKNESS);
+            let _ = input.set_color(tool_state.current_color);
+            let _ = input.set_thickness(
+                tool_state
+                    .current_thickness
+                    .clamp(MIN_STROKE_THICKNESS, MAX_STROKE_THICKNESS),
+            );
+            let _ = input.set_eraser_size(
+                tool_state
+                    .eraser_size
+                    .clamp(MIN_STROKE_THICKNESS, MAX_STROKE_THICKNESS),
+            );
             input.eraser_kind = tool_state.eraser_kind;
-            input.eraser_mode = tool_state.eraser_mode;
-            input.current_font_size = tool_state.current_font_size.clamp(8.0, 72.0);
+            let _ = input.set_eraser_mode(tool_state.eraser_mode);
+            if let Some(opacity) = tool_state.marker_opacity {
+                let _ = input.set_marker_opacity(opacity);
+            }
+            if let Some(fill_enabled) = tool_state.fill_enabled {
+                let _ = input.set_fill_enabled(fill_enabled);
+            }
+            let _ = input.set_tool_override(tool_state.tool_override);
+            let _ = input.set_font_size(tool_state.current_font_size.clamp(8.0, 72.0));
             input.text_background_enabled = tool_state.text_background_enabled;
             input.arrow_length = tool_state.arrow_length.clamp(5.0, 50.0);
             input.arrow_angle = tool_state.arrow_angle.clamp(15.0, 60.0);

src/session/storage.rs

@@ -419,6 +419,9 @@ mod tests {
                 eraser_size: 12.0,
                 eraser_kind: crate::draw::EraserKind::Circle,
                 eraser_mode: crate::input::EraserMode::Brush,
+                marker_opacity: Some(0.32),
+                fill_enabled: Some(false),
+                tool_override: None,
                 current_font_size: 24.0,
                 text_background_enabled: false,
                 arrow_length: 20.0,

src/session/tests.rs

@@ -3,7 +3,7 @@ use crate::config::{Action, BoardConfig, SessionConfig, SessionStorageMode};
 use crate::draw::FontDescriptor;
 use crate::draw::frame::{ShapeSnapshot, UndoAction};
 use crate::draw::{Color, Shape};
-use crate::input::{ClickHighlightSettings, EraserMode, InputState, board_mode::BoardMode};
+use crate::input::{ClickHighlightSettings, EraserMode, InputState, Tool, board_mode::BoardMode};
 use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
@@ -86,6 +86,67 @@ fn snapshot_includes_frames_and_tool_state() {
     assert!(snapshot.tool_state.is_some());
 }
 
+#[test]
+fn apply_snapshot_restores_tool_state() {
+    let mut options = SessionOptions::new(PathBuf::from("/tmp"), "display-tools");
+    options.restore_tool_state = true;
+
+    let mut input = dummy_input_state();
+    let desired_color = Color {
+        r: 0.2,
+        g: 0.4,
+        b: 0.6,
+        a: 1.0,
+    };
+    let _ = input.set_color(desired_color);
+    let _ = input.set_thickness(18.0);
+    let _ = input.set_eraser_size(22.0);
+    let _ = input.set_eraser_mode(EraserMode::Stroke);
+    let _ = input.set_marker_opacity(0.55);
+    let _ = input.set_fill_enabled(true);
+    let _ = input.set_font_size(48.0);
+    let _ = input.set_tool_override(Some(Tool::Rect));
+    input.text_background_enabled = true;
+    input.arrow_length = 40.0;
+    input.arrow_angle = 45.0;
+    input.arrow_head_at_end = true;
+    input.board_previous_color = Some(Color {
+        r: 0.9,
+        g: 0.2,
+        b: 0.1,
+        a: 1.0,
+    });
+    input.show_status_bar = false;
+
+    let snapshot = snapshot_from_input(&input, &options).expect("snapshot present");
+
+    let mut restored = dummy_input_state();
+    apply_snapshot(&mut restored, snapshot, &options);
+
+    assert_eq!(restored.current_color, desired_color);
+    assert_eq!(restored.current_thickness, 18.0);
+    assert_eq!(restored.eraser_size, 22.0);
+    assert_eq!(restored.eraser_mode, EraserMode::Stroke);
+    assert_eq!(restored.marker_opacity, 0.55);
+    assert!(restored.fill_enabled);
+    assert_eq!(restored.current_font_size, 48.0);
+    assert_eq!(restored.tool_override(), Some(Tool::Rect));
+    assert!(restored.text_background_enabled);
+    assert_eq!(restored.arrow_length, 40.0);
+    assert_eq!(restored.arrow_angle, 45.0);
+    assert!(restored.arrow_head_at_end);
+    assert_eq!(
+        restored.board_previous_color,
+        Some(Color {
+            r: 0.9,
+            g: 0.2,
+            b: 0.1,
+            a: 1.0,
+        })
+    );
+    assert!(!restored.show_status_bar);
+}
+
 #[test]
 fn options_from_config_custom_storage() {
     let temp = tempfile::tempdir().unwrap();
@@ -538,6 +599,9 @@ fn save_snapshot_skips_when_payload_exceeds_max_file_size() {
             eraser_size: 12.0,
             eraser_kind: crate::draw::EraserKind::Circle,
             eraser_mode: EraserMode::Brush,
+            marker_opacity: Some(0.32),
+            fill_enabled: Some(false),
+            tool_override: None,
             current_font_size: 24.0,
             text_background_enabled: false,
             arrow_length: 20.0,