sorokin.oleg.edu/ARCADIA-Studio
1
0
Fork 0
Code Issues 37 Pull Requests 2 Packages Projects Releases 9 Wiki Activity

Remove obsolete canvas panel focus mode

Browse Source
This commit is contained in:
sorokin.oleg.edu
2026-09-12 15:06:57 -07:00
parent 8112dea7a3
commit 40154983cc
12 changed files with 44 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oa-desktop/src/app/process_canvas.rs
+11 -14
View File
@@ -74,11 +74,7 @@ impl App {
return Task::none();
}
match input {
Event::Focus
| Event::Traverse(_)
| Event::ControlFocus(_)
| Event::ToggleFocus
| Event::Leave => {
Event::Traverse(_) | Event::ControlFocus(_) | Event::ToggleFocus | Event::Leave => {
return canvas_workspace::focus_task(scope, input);
}
Event::CancelGesture => self.canvas_epoch = self.canvas_epoch.wrapping_add(1),
@@ -163,10 +159,6 @@ impl App {
self.behavior.topology.select_context(resolved.address);
}
}
CanvasEvent::Focus(_) => {
self.behavior.topology.focused = !self.behavior.topology.focused;
self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
}
CanvasEvent::Select(_, id) => {
if !self.behavior.has_pending()
&& crate::behavior::selected_behavior(self.project(), id) == Some(context.owner)
@@ -349,7 +341,7 @@ mod tests {
}
}
#[test]
fn process_focus_retains_rejected_draft_and_guards_selection_until_panels_restore() {
fn process_zoom_retains_rejected_draft_and_guards_selection() {
let (mut app, f) = setup();
let original = app.document.snapshot();
let initial = app.selected;
@@ -359,9 +351,14 @@ mod tests {
&mut app,
Event::Name(" unfinished contextual work ".into()),
);
let camera = app.behavior.topology.camera_boundary();
let context = app.topology_context().unwrap();
let _ = app.update(Message::TopologyCanvas(CanvasEvent::Focus(context)));
assert!(app.behavior.topology.focused);
let _ = app.update(Message::TopologyCanvas(CanvasEvent::Zoom(
context,
Some(0.75),
)));
assert_ne!(app.canvas_epoch, context.epoch);
assert!(app.behavior.topology.camera_boundary() != camera);
let raw = app.behavior.recovery_snapshot().unwrap();
let context = app.topology_context().unwrap();
let _ = app.update(Message::TopologyCanvas(CanvasEvent::Select(
@@ -373,8 +370,8 @@ mod tests {
assert_eq!(app.behavior.recovery_snapshot().unwrap(), raw);
assert!(Arc::ptr_eq(&original, &app.document.snapshot()));
let context = app.topology_context().unwrap();
let _ = app.update(Message::TopologyCanvas(CanvasEvent::Focus(context)));
assert!(!app.behavior.topology.focused);
let _ = app.update(Message::TopologyCanvas(CanvasEvent::Zoom(context, None)));
assert_ne!(app.canvas_epoch, context.epoch);
assert_eq!(app.behavior.recovery_snapshot().unwrap(), raw);
}
#[test]