shifathosn
/
vectorcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #650 from mateususa/fix/artboard-tool-delete-key 

Artboard tool: Delete and Backspace delete the active artboard
This commit is contained in:
BFlat 2026-10-09 09:31:38 +07:00 committed by GitHub
parent ea814b3fac 762bd6b927
commit 11fceda13e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/engine/src/tests_xform.rs
View File

@ -247,10 +247,13 @@ fn artboard_tool_moves_with_art_creates_and_deletes() {
assert_eq!(s.doc().unwrap().doc.artboards.len(), 2);
assert_eq!(s.tool_options()["active"], 1);
assert_eq!(s.doc().unwrap().doc.artboards[1].rect, Rect::new(1000.0, 0.0, 1200.0, 100.0));
// Delete it.
// Delete it: the tool takes the key ahead of the Clear shortcut (the UI only hands Delete to a
// tool that claims it).
assert!(s.tool_claims_key(ToolKey::Delete, ViewInfo::default()));
s.tool_key(ToolKey::Delete, Mods::default(), ViewInfo::default()).unwrap();
assert_eq!(s.doc().unwrap().doc.artboards.len(), 1);
// The last artboard can't be deleted.
// The last artboard can't be deleted, so Delete stays the shortcut's.
assert!(!s.tool_claims_key(ToolKey::Delete, ViewInfo::default()));
s.tool_key(ToolKey::Delete, Mods::default(), ViewInfo::default()).unwrap();
assert_eq!(s.doc().unwrap().doc.artboards.len(), 1);
}

16
crates/tools/src/xform/artboard.rs
View File

@ -259,10 +259,19 @@ impl Tool for ArtboardTool {
}
}
/// Delete/Backspace remove the active artboard ahead of the Clear shortcut, which would only
/// delete selected art; with one artboard left (it can't be deleted) they stay the shortcut's.
fn claims_key(&self, cx: &ToolContext, key: ToolKey) -> bool {
matches!(key, ToolKey::Delete | ToolKey::Backspace)
&& self.drag.is_none()
&& cx.doc.artboards.len() > 1
&& self.active < cx.doc.artboards.len()
}
fn key(&mut self, cx: &ToolContext, key: ToolKey, _mods: Mods) -> Vec<Action> {
match key {
ToolKey::Delete | ToolKey::Backspace if self.drag.is_none() => {
if cx.doc.artboards.len() <= 1 || self.active >= cx.doc.artboards.len() {
ToolKey::Delete | ToolKey::Backspace => {
if !self.claims_key(cx, key) {
return vec![];
}
let i = self.active;
@ -522,7 +531,8 @@ mod tests {
let a = t.pointer(&cx, &ev(PointerKind::Up, 1100.0, 1050.0));
assert_eq!(a[0], Action::Exec("artboard.new".into(), json!({"x": 1000.0, "y": 1000.0, "width": 100.0, "height": 50.0})));
assert_eq!(a[1], Action::Notify("created".into()));
// Delete removes the active artboard.
// Delete removes the active artboard, ahead of the Clear shortcut.
assert!(t.claims_key(&cx, ToolKey::Delete) && t.claims_key(&cx, ToolKey::Backspace));
assert_eq!(t.key(&cx, ToolKey::Delete, Mods::default()), vec![Action::Exec("artboard.delete".into(), json!({"index": 1}))]);
assert_eq!(t.key(&cx, ToolKey::Escape, Mods::default()), vec![Action::SwitchTool("selection".into())]);
}