Use layer state icons and support double-click renaming
This commit is contained in:
parent
1c2b829899
commit
a3eead3600
|
|
@ -863,7 +863,21 @@ impl Editor {
|
|||
palette.muted
|
||||
},
|
||||
);
|
||||
if click(ui, &ink, [0.0, y, w - 136.0, 38.0], ("layer", i)) {
|
||||
let row = ui
|
||||
.interact(
|
||||
Rect::from_min_size(ink.point(0.0, y), Vec2::new(w - 78.0, 38.0)),
|
||||
egui::Id::new(("layer", i)),
|
||||
egui::Sense::click(),
|
||||
)
|
||||
.on_hover_text("Double-click to rename");
|
||||
if row.double_clicked() {
|
||||
self.layer_ui.rename = Some((
|
||||
self.layout.layer_info(i).id,
|
||||
self.layout.layer_info(i).name.clone(),
|
||||
));
|
||||
self.layer_ui.rename_focus = true;
|
||||
}
|
||||
if row.clicked() {
|
||||
if click_shift_modifier(ui) {
|
||||
self.layout.toggle(i);
|
||||
} else {
|
||||
|
|
@ -871,42 +885,14 @@ impl Editor {
|
|||
}
|
||||
self.sync();
|
||||
}
|
||||
for (kind, x, active, text) in [
|
||||
(
|
||||
"lock",
|
||||
w - 130.0,
|
||||
self.layout.locked(i),
|
||||
if self.layout.locked(i) {
|
||||
"Locked"
|
||||
} else {
|
||||
"Lock"
|
||||
},
|
||||
),
|
||||
(
|
||||
"visibility",
|
||||
w - 64.0,
|
||||
!self.layout.visible(i),
|
||||
if self.layout.visible(i) {
|
||||
"Hide"
|
||||
} else {
|
||||
"Show"
|
||||
},
|
||||
),
|
||||
for (kind, x, active) in [
|
||||
("lock", w - 72.0, self.layout.locked(i)),
|
||||
("visibility", w - 36.0, !self.layout.visible(i)),
|
||||
] {
|
||||
ink.card(
|
||||
x,
|
||||
y + 5.0,
|
||||
60.0,
|
||||
28.0,
|
||||
if active {
|
||||
palette.purple
|
||||
} else {
|
||||
palette.panel
|
||||
},
|
||||
palette.line,
|
||||
);
|
||||
ink.text(x + 8.0, y + 12.0, text, 12.0, palette.text);
|
||||
if click(ui, &ink, [x, y + 5.0, 60.0, 28.0], (kind, i)) {
|
||||
let rect = Rect::from_min_size(ink.point(x, y + 5.0), Vec2::splat(28.0));
|
||||
if layer_state_icon(ui, rect, egui::Id::new((kind, i)), kind == "lock", active)
|
||||
.clicked()
|
||||
{
|
||||
self.marquee = None;
|
||||
if kind == "lock" {
|
||||
self.layout.set_locked(i, !active);
|
||||
|
|
@ -2609,6 +2595,84 @@ fn toolbar_menu<R>(
|
|||
response
|
||||
}
|
||||
|
||||
fn layer_state_icon(
|
||||
ui: &mut egui::Ui,
|
||||
rect: Rect,
|
||||
id: egui::Id,
|
||||
lock: bool,
|
||||
active: bool,
|
||||
) -> egui::Response {
|
||||
let palette = theme::palette(ui.ctx());
|
||||
let label = match (lock, active) {
|
||||
(true, true) => "Unlock layer",
|
||||
(true, false) => "Lock layer",
|
||||
(false, true) => "Show layer",
|
||||
(false, false) => "Hide layer",
|
||||
};
|
||||
let response = ui.interact(rect, id, egui::Sense::click());
|
||||
response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));
|
||||
let painter = ui.painter();
|
||||
if active || response.hovered() {
|
||||
painter.rect_filled(
|
||||
rect,
|
||||
4.0,
|
||||
if active {
|
||||
palette.purple
|
||||
} else {
|
||||
palette.panel
|
||||
},
|
||||
);
|
||||
}
|
||||
let stroke = Stroke::new(
|
||||
1.5_f32,
|
||||
if active || response.hovered() {
|
||||
palette.cyan
|
||||
} else {
|
||||
palette.text
|
||||
},
|
||||
);
|
||||
let c = rect.center();
|
||||
let pt = |x, y| c + Vec2::new(x, y);
|
||||
if lock {
|
||||
painter.rect_stroke(
|
||||
Rect::from_min_max(pt(-6.0, -1.0), pt(6.0, 8.0)),
|
||||
2.0,
|
||||
stroke,
|
||||
StrokeKind::Inside,
|
||||
);
|
||||
let points = if active {
|
||||
vec![
|
||||
pt(-4.0, -1.0),
|
||||
pt(-4.0, -6.0),
|
||||
pt(0.0, -8.0),
|
||||
pt(4.0, -6.0),
|
||||
pt(4.0, -1.0),
|
||||
]
|
||||
} else {
|
||||
vec![pt(-4.0, -1.0), pt(-4.0, -6.0), pt(0.0, -8.0), pt(4.0, -6.0)]
|
||||
};
|
||||
painter.add(egui::Shape::line(points, stroke));
|
||||
painter.circle_filled(pt(0.0, 3.0), 1.5, stroke.color);
|
||||
} else {
|
||||
painter.add(egui::Shape::closed_line(
|
||||
vec![
|
||||
pt(-9.0, 0.0),
|
||||
pt(-4.0, -5.0),
|
||||
pt(4.0, -5.0),
|
||||
pt(9.0, 0.0),
|
||||
pt(4.0, 5.0),
|
||||
pt(-4.0, 5.0),
|
||||
],
|
||||
stroke,
|
||||
));
|
||||
painter.circle_stroke(c, 2.5, stroke);
|
||||
if active {
|
||||
painter.line_segment([pt(-9.0, 8.0), pt(9.0, -8.0)], stroke);
|
||||
}
|
||||
}
|
||||
response.on_hover_text(label)
|
||||
}
|
||||
|
||||
fn toolbar_icon(ui: &mut egui::Ui, rect: Rect, label: &str, icon: ToolbarIcon) -> egui::Response {
|
||||
let palette = theme::palette(ui.ctx());
|
||||
let response = ui.interact(rect, ui.id().with(("toolbar", label)), egui::Sense::click());
|
||||
|
|
@ -3941,6 +4005,37 @@ mod tests {
|
|||
.collect()
|
||||
}
|
||||
#[test]
|
||||
fn double_click_layer_name_renames_and_supports_cancel_and_undo() {
|
||||
let mut app = Editor::default();
|
||||
let ctx = egui::Context::default();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let pos = ctx
|
||||
.read_response(egui::Id::new(("layer", 1_usize)))
|
||||
.unwrap()
|
||||
.rect
|
||||
.center();
|
||||
for _ in 0..2 {
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
vec![egui::Event::PointerMoved(pos), mouse(pos, true)],
|
||||
);
|
||||
frame(&mut app, &ctx, vec![mouse(pos, false)]);
|
||||
}
|
||||
assert!(app.layer_ui.rename.is_some());
|
||||
let original = app.layout.layer_info(1).name.clone();
|
||||
app.layer_ui.rename.as_mut().unwrap().1 = "Main slides".into();
|
||||
frame(&mut app, &ctx, vec![key(egui::Key::Enter)]);
|
||||
assert!(app.layer_ui.rename.is_none());
|
||||
assert_eq!(app.layout.layer_info(1).name, "Main slides");
|
||||
app.layout.undo();
|
||||
assert_eq!(app.layout.layer_info(1).name, original);
|
||||
app.layer_ui.rename = Some((app.layout.layer_info(1).id, "Canceled".into()));
|
||||
frame(&mut app, &ctx, vec![key(egui::Key::Escape)]);
|
||||
assert!(app.layer_ui.rename.is_none());
|
||||
assert_eq!(app.layout.layer_info(1).name, original);
|
||||
}
|
||||
#[test]
|
||||
fn layer_buttons_protect_selection_and_toggle_drawing() {
|
||||
let mut app = Editor::default();
|
||||
let ctx = egui::Context::default();
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ use super::*;
|
|||
#[derive(Default)]
|
||||
pub(super) struct LayerUi {
|
||||
pub open: bool,
|
||||
pub(super) rename: Option<(usize, String)>,
|
||||
pub(super) rename_focus: bool,
|
||||
drafts: Vec<(usize, String, String)>,
|
||||
error: String,
|
||||
folder_filter: Option<String>,
|
||||
|
|
@ -40,7 +42,56 @@ impl Editor {
|
|||
Err(error) => self.error = error,
|
||||
}
|
||||
}
|
||||
fn rename_window(&mut self, ctx: &egui::Context) {
|
||||
let Some((id, mut name)) = self.layer_ui.rename.take() else {
|
||||
return;
|
||||
};
|
||||
let Some(i) = (0..self.layout.layers().len()).find(|&i| self.layout.layer_info(i).id == id)
|
||||
else {
|
||||
return;
|
||||
};
|
||||
let mut open = true;
|
||||
let mut apply = false;
|
||||
let mut cancel = false;
|
||||
egui::Window::new("Rename layer")
|
||||
.open(&mut open)
|
||||
.collapsible(false)
|
||||
.resizable(false)
|
||||
.show(ctx, |ui| {
|
||||
let response = ui.add(egui::TextEdit::singleline(&mut name).char_limit(128));
|
||||
if std::mem::take(&mut self.layer_ui.rename_focus) {
|
||||
response.request_focus();
|
||||
}
|
||||
cancel = ui.input(|input| input.key_pressed(egui::Key::Escape));
|
||||
let valid = !name.trim().is_empty();
|
||||
apply = valid && ui.input(|input| input.key_pressed(egui::Key::Enter));
|
||||
ui.horizontal(|ui| {
|
||||
apply |= apply_button(
|
||||
ui,
|
||||
"Rename",
|
||||
valid && name.trim() != self.layout.layer_info(i).name,
|
||||
)
|
||||
.clicked();
|
||||
cancel |= ui.button("Cancel").clicked();
|
||||
});
|
||||
});
|
||||
if apply {
|
||||
let folder = self.layout.layer_info(i).folder.clone();
|
||||
match self.layout.rename_layer(i, &name, &folder) {
|
||||
Ok(()) => {
|
||||
self.sync();
|
||||
if self.layer_ui.open {
|
||||
self.manage_layers();
|
||||
}
|
||||
}
|
||||
Err(error) => self.error = error,
|
||||
}
|
||||
} else if open && !cancel {
|
||||
self.layer_ui.rename = Some((id, name));
|
||||
}
|
||||
}
|
||||
pub(super) fn layers_window(&mut self, ctx: &egui::Context) {
|
||||
self.rename_window(ctx);
|
||||
if !self.layer_ui.open {
|
||||
return;
|
||||
}
|
||||
|
|
@ -76,8 +127,10 @@ impl Editor {
|
|||
if ui.selectable_label(selected, format!("{id:02}")).clicked() { self.layout.toggle(i); sync = true; }
|
||||
ui.add_sized([170.0,24.0], egui::TextEdit::singleline(name).char_limit(128));
|
||||
ui.add_sized([140.0,24.0], egui::TextEdit::singleline(folder).char_limit(128));
|
||||
let mut visible = self.layout.visible(i); if ui.checkbox(&mut visible, "Show").changed() { self.layout.set_visible(i, visible); sync = true; }
|
||||
let mut locked = self.layout.locked(i); if ui.checkbox(&mut locked, "Lock").changed() { self.layout.set_locked(i, locked); sync = true; }
|
||||
let (_, rect) = ui.allocate_space(Vec2::splat(28.0));
|
||||
if layer_state_icon(ui, rect, ui.id().with(("show", *id)), false, !self.layout.visible(i)).clicked() { self.layout.set_visible(i, !self.layout.visible(i)); sync = true; }
|
||||
let (_, rect) = ui.allocate_space(Vec2::splat(28.0));
|
||||
if layer_state_icon(ui, rect, ui.id().with(("lock", *id)), true, self.layout.locked(i)).clicked() { self.layout.set_locked(i, !self.layout.locked(i)); sync = true; }
|
||||
ui.end_row();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -619,3 +619,5 @@ save/load and screen reference images are document-wide operations, so they have
|
|||
no layer mapping.
|
||||
|
||||
**Apply to Midra**, beside ONLINE/OFFLINE and in **Export**, sends the selected layers using the current destination mappings, screen, Preview/Program target and sizing strategy. If mapping is incomplete, it opens the send window first. Configure these choices in **Export → Configure Midra export…**. The action is disabled offline, during transfers, or when values already match the last snapshot. Sending writes directly and verifies readback; results appear in the send window. Only applied editor values are sent.
|
||||
|
||||
Layer rows use padlock and eye icon buttons for locking and visibility, with tooltips and highlighted locked/hidden states. Double-click a layer name in the right-hand list to rename it. Enter saves, Escape or Cancel discards the edit; names must contain 1–128 characters. Renaming preserves the layer ID and folder and supports Undo.
|
||||
|
|
|
|||
Loading…
Reference in New Issue