Add rename and delete actions to layer context menus
This commit is contained in:
parent
5408ead056
commit
f7a0938ca3
|
|
@ -1036,8 +1036,12 @@ impl Editor {
|
|||
egui::Id::new(("layer", self.layout.layer_info(i).id)),
|
||||
egui::Sense::click_and_drag(),
|
||||
)
|
||||
.on_hover_text("Drag to reorder · double-click to rename");
|
||||
row.dnd_set_drag_payload(layers_ui::LayerDrag(self.layout.layer_info(i).id));
|
||||
.on_hover_text(
|
||||
"Drag to reorder · double-click to rename · right-click for actions",
|
||||
);
|
||||
let layer_id = self.layout.layer_info(i).id;
|
||||
row.context_menu(|ui| self.layer_actions_menu(ui, layer_id));
|
||||
row.dnd_set_drag_payload(layers_ui::LayerDrag(layer_id));
|
||||
if ui.is_enabled() && row.dnd_hover_payload::<layers_ui::LayerDrag>().is_some() {
|
||||
let after = ui.input(|input| {
|
||||
input
|
||||
|
|
@ -1604,6 +1608,10 @@ impl Editor {
|
|||
}
|
||||
fn layer_context_menu(&mut self, ui: &mut egui::Ui) {
|
||||
ui.set_min_width(210.0);
|
||||
if let Some(id) = self.layer_ui.context_layer {
|
||||
self.layer_actions_menu(ui, id);
|
||||
ui.separator();
|
||||
}
|
||||
self.snapping_menu(ui);
|
||||
ui.separator();
|
||||
let selected = self.layout.selected_indices();
|
||||
|
|
@ -2701,6 +2709,15 @@ impl Editor {
|
|||
}
|
||||
});
|
||||
}
|
||||
if response.secondary_clicked()
|
||||
&& let Some(p) = pointer
|
||||
{
|
||||
let point = (p - origin) / scale;
|
||||
self.layer_ui.context_layer = self
|
||||
.content_hit(p, origin, scale)
|
||||
.or_else(|| self.layout.hit([point.x as f64, point.y as f64]))
|
||||
.map(|i| self.layout.layer_info(i).id);
|
||||
}
|
||||
if response.secondary_clicked()
|
||||
&& edit_pointer
|
||||
&& let Some(p) = pointer
|
||||
|
|
@ -6462,6 +6479,71 @@ mod tests {
|
|||
assert_eq!(app.fields, original);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn viewport_and_list_context_actions_target_the_clicked_layer() {
|
||||
for list in [false, true] {
|
||||
for rename in [false, true] {
|
||||
let ctx = egui::Context::default();
|
||||
let mut app = Editor {
|
||||
navigation_tool: NavigationTool::Move,
|
||||
..Default::default()
|
||||
};
|
||||
let before = app.layout.layers().clone();
|
||||
let id = app.layout.layer_info(0).id;
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let output = frame(&mut app, &ctx, vec![]);
|
||||
let pos = if list {
|
||||
ctx.read_response(egui::Id::new(("layer", id)))
|
||||
.unwrap()
|
||||
.rect
|
||||
.center()
|
||||
} else {
|
||||
layer_rects(&output)[0].center()
|
||||
};
|
||||
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(1));
|
||||
if list {
|
||||
assert!(!output.shapes.iter().any(|s| matches!(&s.shape, egui::Shape::Text(t) if t.galley.text() == "Source properties…")));
|
||||
}
|
||||
click_text(
|
||||
&mut app,
|
||||
&ctx,
|
||||
if rename {
|
||||
"Rename layer…"
|
||||
} else {
|
||||
"Delete layer"
|
||||
},
|
||||
);
|
||||
if rename {
|
||||
assert_eq!(app.layer_ui.rename.as_ref().unwrap().0, id);
|
||||
app.layer_ui.rename.as_mut().unwrap().1 = "Renamed target".into();
|
||||
frame(&mut app, &ctx, vec![key(egui::Key::Enter)]);
|
||||
assert_eq!(app.layout.layer_info(0).name, "Renamed target");
|
||||
assert_eq!(app.layout.layers(), &before);
|
||||
} else {
|
||||
assert_eq!(app.layout.layers().len(), 1);
|
||||
assert_eq!(app.layout.layers()[0], before[1]);
|
||||
assert!(!app.layer_ui.open);
|
||||
}
|
||||
app.layout.undo();
|
||||
assert_eq!(app.layout.layers(), &before);
|
||||
assert_eq!(app.layout.layer_info(0).id, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn canvas_context_menu_selects_target_preserves_groups_and_opens_properties() {
|
||||
for (grouped, title, tab) in [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ pub(super) struct LayerDrag(pub usize);
|
|||
#[derive(Default)]
|
||||
pub(super) struct LayerUi {
|
||||
pub open: bool,
|
||||
pub context_layer: Option<usize>,
|
||||
delete_requested: Option<usize>,
|
||||
pub(super) rename: Option<(usize, String)>,
|
||||
pub(super) rename_focus: bool,
|
||||
drafts: Vec<(usize, String, String)>,
|
||||
|
|
@ -26,6 +28,54 @@ impl LayerUi {
|
|||
}
|
||||
}
|
||||
impl Editor {
|
||||
pub(super) fn layer_actions_menu(&mut self, ui: &mut egui::Ui, id: usize) {
|
||||
let Some(i) = (0..self.layout.layers().len()).find(|&i| self.layout.layer_info(i).id == id)
|
||||
else {
|
||||
return;
|
||||
};
|
||||
if ui.button("Rename layer…").clicked() {
|
||||
self.layer_ui.rename = Some((id, self.layout.layer_info(i).name.clone()));
|
||||
self.layer_ui.rename_focus = true;
|
||||
ui.close_menu();
|
||||
}
|
||||
let can_delete =
|
||||
self.layout.layers().len() > 1 && self.layout.visible(i) && !self.layout.locked(i);
|
||||
if ui
|
||||
.add_enabled(can_delete, egui::Button::new("Delete layer"))
|
||||
.on_hover_text("Delete this layer. Undo restores it.")
|
||||
.on_disabled_hover_text(
|
||||
"Keep at least one layer; show and unlock this layer before deleting it.",
|
||||
)
|
||||
.clicked()
|
||||
{
|
||||
self.layer_ui.delete_requested = Some(id);
|
||||
ui.close_menu();
|
||||
}
|
||||
}
|
||||
fn delete_context_layer(&mut self) {
|
||||
let Some(id) = self.layer_ui.delete_requested.take() else {
|
||||
return;
|
||||
};
|
||||
let Some(i) = (0..self.layout.layers().len()).find(|&i| self.layout.layer_info(i).id == id)
|
||||
else {
|
||||
return;
|
||||
};
|
||||
if !self.layout.visible(i) || self.layout.locked(i) || self.layout.layers().len() <= 1 {
|
||||
return;
|
||||
}
|
||||
self.layout.select(Some(i));
|
||||
match self.layout.remove_selected() {
|
||||
Ok(()) => {
|
||||
self.align_target = AlignTarget::Selection;
|
||||
self.edit_content = false;
|
||||
self.format_draft = None;
|
||||
self.paste = None;
|
||||
self.layer_ui.context_layer = None;
|
||||
self.sync();
|
||||
}
|
||||
Err(error) => self.error = error,
|
||||
}
|
||||
}
|
||||
pub(super) fn reorder_layer(&mut self, id: usize, to: usize) {
|
||||
match self.layout.move_layer(id, to) {
|
||||
Ok(()) => {
|
||||
|
|
@ -146,6 +196,7 @@ impl Editor {
|
|||
}
|
||||
}
|
||||
pub(super) fn layers_window(&mut self, ctx: &egui::Context) {
|
||||
self.delete_context_layer();
|
||||
self.rename_window(ctx);
|
||||
if !self.layer_ui.open {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -856,3 +856,8 @@ paused; Retry recovery attempts to load it again. For a write failure, Retry
|
|||
attempts to save again. New project explicitly replaces the recovery copy.
|
||||
|
||||
See the [recovery file contract](interfaces/midra-layout-recovery.md).
|
||||
|
||||
Right-click a layer in the viewport for **Rename layer…** / **Delete layer** alongside
|
||||
the existing tools. Layer-list rows have a compact menu with just those two actions.
|
||||
Actions target the clicked layer; deletion supports Undo and requires a visible,
|
||||
unlocked layer with at least one other layer remaining.
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
- Right-click a layer in the viewport or layer list to rename/delete it; list menus stay compact. Delete supports Undo and respects locked/hidden/last-layer protection.
|
||||
|
||||
- Swap new-project default labels: top layer is 01 / Presenter, lower layer is 02 / Slides. Geometry, draw order and existing projects are unchanged.
|
||||
|
||||
- Recover the last session automatically from a separate two-second autosave; named saves stay explicit. New project offers Save/Discard/Cancel and shows the last manual-save age. Failed/corrupt recovery is reported and preserved.
|
||||
|
|
|
|||
Loading…
Reference in New Issue