Group layer context actions and add undoable mask reset

This commit is contained in:
Dandaedre 2026-11-16 22:44:21 +01:00
parent 85d07c3278
commit 2bb23f39a8
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
18 changed files with 268 additions and 57 deletions

2
Cargo.lock generated
View File

@ -548,7 +548,7 @@ dependencies = [
[[package]]
name = "canvas-pilot"
version = "0.9.11"
version = "0.9.12"
dependencies = [
"base64",
"craft-dwg",

View File

@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"]
resolver = "3"
[workspace.package]
version = "0.9.11"
version = "0.9.12"
edition = "2024"
license = "MIT"
repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot"

View File

@ -480,5 +480,7 @@
"language.name.th": "Thai",
"language.name.hi": "Hindi",
"language.name.tok": "Toki Pona",
"language.install-pack": "Install language pack…"
"language.install-pack": "Install language pack…",
"ui.crop-mask": "Crop & mask",
"ui.canvas": "Canvas"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "Taja",
"language.name.hi": "Hindia",
"language.name.tok": "Tokipono",
"language.install-pack": "Instali lingvopakaĵon…"
"language.install-pack": "Instali lingvopakaĵon…",
"ui.crop-mask": "Tondado kaj masko",
"ui.canvas": "Kanvaso"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "Tailandés",
"language.name.hi": "Hindi",
"language.name.tok": "Toki Pona",
"language.install-pack": "Instalar paquete de idiomas…"
"language.install-pack": "Instalar paquete de idiomas…",
"ui.crop-mask": "Recorte y máscara",
"ui.canvas": "Lienzo"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "Thaï",
"language.name.hi": "Hindi",
"language.name.tok": "Toki Pona",
"language.install-pack": "Installer un pack de langues…"
"language.install-pack": "Installer un pack de langues…",
"ui.crop-mask": "Recadrage et masque",
"ui.canvas": "Canevas"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "Ταϊκὴ",
"language.name.hi": "Ἰνδικὴ",
"language.name.tok": "Τόκι Πόνα",
"language.install-pack": "Install language pack…"
"language.install-pack": "Install language pack…",
"ui.crop-mask": "Περικοπὴ καὶ κάλυμμα",
"ui.canvas": "Πίναξ"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "थाई",
"language.name.hi": "हिन्दी",
"language.name.tok": "टोकी पोना",
"language.install-pack": "भाषा पैक स्थापित करें…"
"language.install-pack": "भाषा पैक स्थापित करें…",
"ui.crop-mask": "क्रॉप और मास्क",
"ui.canvas": "कैनवास"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "タイ語",
"language.name.hi": "ヒンディー語",
"language.name.tok": "トキポナ",
"language.install-pack": "言語パックをインストール…"
"language.install-pack": "言語パックをインストール…",
"ui.crop-mask": "クロップとマスク",
"ui.canvas": "キャンバス"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "थाई",
"language.name.hi": "हिन्दी",
"language.name.tok": "टोकी पोना",
"language.install-pack": "भाषा प्याक स्थापना गर्नुहोस्…"
"language.install-pack": "भाषा प्याक स्थापना गर्नुहोस्…",
"ui.crop-mask": "क्रप र मास्क",
"ui.canvas": "क्यानभास"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "Tailandês",
"language.name.hi": "Hindi",
"language.name.tok": "Toki Pona",
"language.install-pack": "Instalar pacote de idiomas…"
"language.install-pack": "Instalar pacote de idiomas…",
"ui.crop-mask": "Recorte e máscara",
"ui.canvas": "Tela"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "ไทย",
"language.name.hi": "ฮินดี",
"language.name.tok": "โทกิโพนา",
"language.install-pack": "ติดตั้งชุดภาษา…"
"language.install-pack": "ติดตั้งชุดภาษา…",
"ui.crop-mask": "ครอบตัดและมาสก์",
"ui.canvas": "พื้นที่ทำงาน"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "toki Tawi",
"language.name.hi": "toki Insi",
"language.name.tok": "toki pona",
"language.install-pack": "o pana e kulupu toki…"
"language.install-pack": "o pana e kulupu toki…",
"ui.crop-mask": "kipisi en len",
"ui.canvas": "supa sitelen"
}

View File

@ -480,5 +480,7 @@
"language.name.th": "泰语",
"language.name.hi": "印地语",
"language.name.tok": "道本语",
"language.install-pack": "安装语言包…"
"language.install-pack": "安装语言包…",
"ui.crop-mask": "裁剪与遮罩",
"ui.canvas": "画布"
}

View File

@ -2310,40 +2310,9 @@ impl Editor {
}
if let Some(i) = self.layout.selected() {
ui.weak(self.layout.layer_label(i));
if ui.button(tr(ui.ctx(), "ui.adjust-layer-mask")).clicked() {
self.open_mask_edit(i);
ui.close();
}
let crop_label = if self.edit_content && !self.mask_editing() {
"crop.done"
} else {
"crop.adjust"
};
if ui
.add_enabled(!self.automatic_layer_fit(i), egui::Button::new(tr(ui.ctx(), crop_label)))
.on_disabled_hover_text("Centered and Cropped fit automatically; use Crop properties for numeric crop edges.")
.on_hover_text(
tr(ui.ctx(), "ui.change-crop-zoom-and-offset-inside-the-layer-keep-its-visible-box-fixed"),
)
.clicked()
{
self.toggle_crop_edit();
ui.close();
}
if ui.button(tr(ui.ctx(), "ui.reset-crop")).clicked() {
let result = if let Some(mode) = self.layout.formats().layer_fit[i] {
self.layout
.set_layer_fit(i, Some(mode), canvas_pilot::formats::Crop::default())
} else {
self.layout
.set_framing(i, canvas_pilot::formats::Framing::default())
};
match result {
Ok(()) => self.sync(),
Err(e) => self.error = e,
}
ui.close();
}
ui.menu_button(tr(ui.ctx(), "ui.crop-mask"), |ui| {
self.crop_mask_menu(ui, i)
});
} else if !selected.is_empty() {
ui.weak(format!("{} layers selected", selected.len()));
ui.menu_button(tr(ui.ctx(), "ui.resize-together"), |ui| {
@ -2425,7 +2394,65 @@ impl Editor {
}
if !selected.is_empty() || self.layer_ui.context_layer.is_some() {
ui.separator();
ui.menu_button(tr(ui.ctx(), "ui.canvas"), |ui| {
self.canvas_context_options(ui)
});
} else {
self.canvas_context_options(ui);
}
}
fn crop_mask_menu(&mut self, ui: &mut egui::Ui, i: usize) {
let crop_label = if self.edit_content && !self.mask_editing() {
"crop.done"
} else {
"crop.adjust"
};
if ui
.add_enabled(
!self.automatic_layer_fit(i),
egui::Button::new(tr(ui.ctx(), crop_label)),
)
.on_disabled_hover_text("Centered and Cropped fit automatically; use Crop properties for numeric crop edges.")
.on_hover_text(tr(ui.ctx(), "ui.change-crop-zoom-and-offset-inside-the-layer-keep-its-visible-box-fixed"))
.clicked()
{
self.toggle_crop_edit();
ui.close();
}
if ui.button(tr(ui.ctx(), "ui.reset-crop")).clicked() {
let result = if let Some(mode) = self.layout.formats().layer_fit[i] {
self.layout
.set_layer_fit(i, Some(mode), canvas_pilot::formats::Crop::default())
} else {
self.layout
.set_framing(i, canvas_pilot::formats::Framing::default())
};
match result {
Ok(()) => self.sync(),
Err(e) => self.error = e,
}
ui.close();
}
ui.separator();
if ui.button(tr(ui.ctx(), "ui.adjust-layer-mask")).clicked() {
self.open_mask_edit(i);
ui.close();
}
if ui.button(tr(ui.ctx(), "ui.reset-mask")).clicked() {
let mask = canvas_pilot::formats::Mask {
origin: self.layout.formats().masks[i].origin,
..Default::default()
};
match self.layout.set_mask(i, mask) {
Ok(()) => self.sync(),
Err(error) => self.error = error,
}
ui.close();
}
}
fn canvas_context_options(&mut self, ui: &mut egui::Ui) {
self.snapping_menu(ui);
ui.menu_button(tr(ui.ctx(), "ui.reference-images"), |ui| {
self.reference_actions_menu(ui)
@ -8625,7 +8652,9 @@ mod tests {
};
assert!(app.layout.selected().is_some());
let output = ctx.run_ui(egui::RawInput::default(), |root_ui| {
egui::CentralPanel::default().show(root_ui, |ui| app.layer_context_menu(ui));
egui::CentralPanel::default().show(root_ui, |ui| {
app.crop_mask_menu(ui, app.layout.selected().unwrap())
});
});
let expected = tr(&ctx, if editing { "crop.done" } else { "crop.adjust" });
let labels: Vec<_> = output
@ -8713,6 +8742,149 @@ mod tests {
}
}
#[test]
fn grouped_crop_mask_resets_preserve_other_values_and_undo() {
use canvas_pilot::formats::{Crop, Framing, LayerFit, Mask, MaskOrigin};
for origin in [MaskOrigin::Layer, MaskOrigin::Source] {
for mode in std::iter::once(None).chain(LayerFit::ALL.into_iter().map(Some)) {
for reset_mask in [true, false] {
let mut app = Editor::default();
app.layout.select(Some(0));
let ctx = egui::Context::default();
let output = frame(&mut app, &ctx, vec![]);
let pos = layer_rects(&output)[0].center();
app.layout
.set_layer_fit(
0,
mode,
Crop {
left: 100.0,
right: 100.0,
top: 50.0,
bottom: 50.0,
},
)
.unwrap();
if mode.is_none() {
app.layout
.set_framing(
0,
Framing {
zoom: 1.5,
offset: [0.0; 2],
},
)
.unwrap();
}
let mask = Mask {
origin,
left: 0.1,
right: 0.2,
top: 0.1,
bottom: 0.05,
};
app.layout.set_mask(0, mask).unwrap();
app.sync();
let before = app.project();
let crop = app.layout.formats().advanced[0];
frame(&mut app, &ctx, vec![]);
let secondary = |pressed| egui::Event::PointerButton {
pos,
button: egui::PointerButton::Secondary,
pressed,
modifiers: egui::Modifiers::NONE,
};
frame(
&mut app,
&ctx,
vec![egui::Event::PointerMoved(pos), secondary(true)],
);
frame(&mut app, &ctx, vec![secondary(false)]);
let output = frame(&mut app, &ctx, vec![]);
assert_eq!(app.layout.selected(), Some(0));
let labels: Vec<_> = output
.shapes
.iter()
.filter_map(|s| {
if let egui::Shape::Text(t) = &s.shape {
Some(t.galley.text())
} else {
None
}
})
.collect();
assert!(labels.contains(&"Crop & mask") && labels.contains(&"Canvas"));
assert!(
!labels.contains(&"Reset crop")
&& !labels.contains(&"Reset mask")
&& !labels.contains(&"Output format…")
);
click_text(&mut app, &ctx, "Crop & mask");
click_text(
&mut app,
&ctx,
if reset_mask {
"Reset mask"
} else {
"Reset crop"
},
);
assert_eq!(app.layout.formats().layer_fit[0], mode);
if reset_mask {
assert_eq!(
app.layout.formats().masks[0],
Mask {
origin,
..Mask::default()
}
);
assert_eq!(app.layout.formats().advanced[0], crop);
} else {
assert_eq!(app.layout.formats().masks[0], mask);
assert_eq!(app.layout.formats().advanced[0], Crop::default());
}
assert_eq!(app.project().inputs, before.inputs);
assert_eq!(app.project().layers[1], before.layers[1]);
assert_eq!(app.project().layers[0].bounds, before.layers[0].bounds);
assert!(!app.device.sending);
app.layout.undo();
assert_eq!(app.project(), before);
}
}
}
}
#[test]
fn canvas_options_are_grouped_only_when_a_layer_is_selected() {
for selected in [false, true] {
let mut app = Editor::default();
if !selected {
app.layout.select(None);
}
let ctx = egui::Context::default();
let output = ctx.run_ui(egui::RawInput::default(), |root_ui| {
egui::CentralPanel::default().show(root_ui, |ui| app.layer_context_menu(ui));
});
let labels: Vec<_> = output
.shapes
.iter()
.filter_map(|s| {
if let egui::Shape::Text(t) = &s.shape {
Some(t.galley.text())
} else {
None
}
})
.collect();
assert_eq!(labels.contains(&"Canvas"), selected);
assert_eq!(
labels.contains(&tr(&ctx, "ui.output-format").as_str()),
!selected
);
assert_eq!(labels.contains(&"Crop & mask"), selected);
}
}
#[test]
fn canvas_context_menu_selects_target_preserves_groups_and_opens_properties() {
for (grouped, title, tab) in [

View File

@ -4,6 +4,15 @@
## Unreleased
### v0.9.12
- Added Reset mask to the layer context menu, preserving mask origin, crop, fit and
geometry with Undo support. Crop & mask groups both adjust/reset pairs; Canvas
groups workspace-wide snapping, references and output format. The layer menu has
four fewer top-level entries, and the empty-canvas menu remains shallow.
- Native menu/reset checks and required validation passed; whole-application
line coverage is 91.51%.
### v0.9.11
- Added a 25%-opacity source guide with sparse diagonal hatching over masked areas

View File

@ -72,7 +72,7 @@ not affect device links or source assignments. All document edits support Undo.
clipboard payload.
Right-click a layer for **Source properties**, **Layer properties**, **Crop properties**, **Configure capture**,
**Adjust layer crop**, alignment, **Copy layer values**, **Paste layer values**, and lock/hide actions.
**Crop & mask**, alignment, **Copy layer values**, **Paste layer values**, and lock/hide actions.
Paste reads the clipboard and opens the existing value/mapping review before applying changes. Right-clicking a layer
already in a selection keeps the whole selection and offers **Resize together**.
Right-clicking an unselected layer selects it first. Locked/hidden layers remain
@ -162,14 +162,18 @@ including a single layer. All/visible export remains available.
## Viewport context menu
Right-click a layer for rename/folder actions, copy/paste, crop adjustment,
aspect-ratio locking and alignment. **Properties** groups the Source, Layer,
Crop and Mapping windows. **Input preview & crop guides → Configure capture…**
Right-click a layer for rename/folder actions, copy/paste, aspect-ratio locking
and alignment. **Crop & mask** pairs **Adjust layer crop** with **Reset crop**,
and **Adjust layer mask** with **Reset mask**. Reset mask clears all four edges
while preserving **Mask from**, crop, fitting and layer geometry; Undo restores it.
**Properties** groups the Source, Layer, Crop, Mask and Mapping windows. **Input preview & crop guides → Configure capture…**
opens the Preview tab; an existing preview also offers an enable toggle and crop
guide opacity directly in that submenu. Opacity is adjustable only with an
available preview image. Input selection stays in the window, so long input
lists do not interfere with the context menu.
Lock, Hide and Delete follow the editing controls. Snapping, Reference images
and Output format are together at the bottom. Multiple selection retains its
Resize together and alignment actions.
Lock, Hide and Delete follow the editing controls. **Canvas** groups Snapping,
Reference images and Output format at the bottom: these apply to the workspace
rather than the selected layer. Right-clicking empty canvas keeps these options
at the top level. Multiple selection retains its Resize together and alignment
actions; crop/mask resets require one selected layer.

View File

@ -221,7 +221,9 @@ clears all edges while keeping the selected reference.
Open **Layer properties → Mask**, or right-click a selected layer and choose
**Adjust layer mask**. For keyboard editing, double-click a layer to enter crop
**Crop & mask → Adjust layer mask**. **Crop & mask → Reset mask** clears its edges
without changing the mask reference, crop or layer dimensions, and supports Undo.
For keyboard editing, double-click a layer to enter crop
mode, then press **Tab** to switch to the mask; press **Tab** again to return to crop.
This works with normal crop and 1:1 editing using the Select tool. It avoids Alt
mouse gestures that some Wayland desktops/window managers intercept.