WIP checkpoint shared behavior canvas before user reboot

crates/oa-desktop/src/behavior.rs

@@ -16,6 +16,7 @@ use oa_core::*;
 use std::collections::BTreeMap;
 #[cfg(test)]
 mod contextual_source_tests;
+pub(crate) mod canvas_workspace;
 pub(crate) mod creation;
 pub(crate) mod scenario;
 // Projection acceptance precedes the coordinated scenario renderer integration.
@@ -1233,6 +1234,7 @@ struct Scene {
     selected: Id,
     scale: f32,
     scroll_offset: iced::Vector,
+    camera_pan: iced::Vector,
     interaction: Option<(scenario::Context, scenario::CanvasTool, bool)>,
     pending_placement: Option<(scenario::Slot, Option<Id>)>,
     lanes: BTreeMap<Id, f32>,
@@ -1287,6 +1289,7 @@ impl Scene {
         let mut scene = Self {
             scale: 1.,
             scroll_offset: iced::Vector::ZERO,
+            camera_pan: iced::Vector::ZERO,
             boxes: vec![],
             lines: vec![],
             size: Size::new(700., 200.),
@@ -1951,7 +1954,7 @@ impl canvas::Program<Message> for Scene {
         };
         let world = cursor
             .position_in(bounds)
-            .map(|p| Point::new(p.x / self.scale, p.y / self.scale));
+            .map(|p| Point::new((p.x - self.camera_pan.x) / self.scale, (p.y - self.camera_pan.y) / self.scale));
         match event {
             canvas::Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
                 if !visible {
@@ -1988,10 +1991,11 @@ impl canvas::Program<Message> for Scene {
                         });
                         return Some(Action::request_redraw().and_capture());
                     }
-                    if self.reorder_handle().is_some_and(|r| r.contains(point)) {
+                    if let Some(occurrence) = self.hit(point).filter(|id| self.rows.contains_key(id))
+                        .or_else(|| self.reorder_handle().filter(|r| r.contains(point)).map(|_| self.selected)) {
                         state.press = Some(SequencePress::Reorder {
-                            occurrence: self.selected,
-                            parent: self.rows[&self.selected].0,
+                            occurrence,
+                            parent: self.rows[&occurrence].0,
                             start: cursor.position()? - self.scroll_offset,
                             moved: false,
                         });
@@ -2066,6 +2070,9 @@ impl canvas::Program<Message> for Scene {
                             );
                         }
                     }
+                    SequencePress::Reorder { occurrence, moved: false, .. } => {
+                        return Some(Action::publish(Message::ScenarioCanvas(CanvasEvent::Select(context, occurrence))).and_capture());
+                    }
                     SequencePress::Reorder {
                         occurrence,
                         parent,
@@ -2103,6 +2110,7 @@ impl canvas::Program<Message> for Scene {
     ) -> Vec<canvas::Geometry> {
         let mut f = Frame::new(renderer, bounds.size());
         f.fill_rectangle(Point::ORIGIN, bounds.size(), Color::WHITE);
+        f.translate(self.camera_pan);
         f.scale(self.scale);
         for b in &self.boxes {
             let outline = matches!(
@@ -2216,7 +2224,7 @@ impl canvas::Program<Message> for Scene {
             let active = editable && state.context == Some(context) && state.tool == tool;
             let point = cursor
                 .position_in(bounds)
-                .map(|p| Point::new(p.x / self.scale, p.y / self.scale));
+                .map(|p| Point::new((p.x - self.camera_pan.x) / self.scale, (p.y - self.camera_pan.y) / self.scale));
             let source = active.then_some(state.source).flatten();
             let reorder = active.then_some(state.press).flatten().and_then(|press| {
                 if let SequencePress::Reorder { parent, .. } = press {