From fb73a5e92504b1ff8808182837b312f3b7fc712e Mon Sep 17 00:00:00 2001 From: test-bit-sys Date: Sun, 1 Nov 2026 20:02:06 +0100 Subject: [PATCH 1/3] Fix layer rename focus trap and restore Undo Previously, r.request_focus() was called unconditionally on every frame inside the layer rename editor, which continually wiped out r.lost_focus() in egui's memory and trapped keyboard focus inside the text edit. As a result, clicking outside never exited rename mode, Enter was unhandled, and keyboard shortcuts including Undo (Ctrl+Z) were permanently suppressed by egui_wants_keyboard_input. - Request focus via widget ID once when renaming starts instead of every frame - Submit and close rename mode on Enter or when focus is lost - Cancel without saving on Escape - Prevent row double-clicks, row clicks, and drag-and-drop from interfering with active text editing - Add regression test in session.rs verifying layer.rename and edit.undo Fixes #39 --- crates/engine/tests/session.rs | 15 +++++++++++++++ crates/ui-egui/src/dock.rs | 30 ++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/crates/engine/tests/session.rs b/crates/engine/tests/session.rs index 45ae667d..bd7fd4a8 100644 --- a/crates/engine/tests/session.rs +++ b/crates/engine/tests/session.rs @@ -54,6 +54,21 @@ fn layers_masks_materials_and_bake() { assert_eq!(s.doc.project.walk(0).len(), 1, "back to the initial paint layer"); } +#[test] +fn layer_rename_and_undo() { + let mut s = session(); + let layer_id = s.selected_layer().unwrap(); + let orig_name = s.doc.project.layer(layer_id).unwrap().name.clone(); + execute(&mut s, "layer.rename", &json!({"name": "Custom Paint"})).unwrap(); + assert_eq!(s.doc.project.layer(layer_id).unwrap().name, "Custom Paint"); + + execute(&mut s, "edit.undo", &Value::Null).unwrap(); + assert_eq!(s.doc.project.layer(layer_id).unwrap().name, orig_name); + + execute(&mut s, "edit.redo", &Value::Null).unwrap(); + assert_eq!(s.doc.project.layer(layer_id).unwrap().name, "Custom Paint"); +} + #[test] fn polygon_fill_and_color_picker() { let mut s = session(); diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs index b314e4ef..7f152179 100644 --- a/crates/ui-egui/src/dock.rs +++ b/crates/ui-egui/src/dock.rs @@ -382,12 +382,24 @@ fn layer_row(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, depth: usize if renaming { let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect).layout(egui::Layout::left_to_right(egui::Align::Center))); if let Some((_, buf)) = app.ui.rename.as_mut() { - let r = child.add(egui::TextEdit::singleline(buf).desired_width(name_rect.width())); - r.request_focus(); - if r.lost_focus() { - let name = buf.clone(); + let edit_id = ui.scope_id().with(("layer_rename", layer.id.0)); + let r = child.add(egui::TextEdit::singleline(buf).id(edit_id).desired_width(name_rect.width())); + if !r.has_focus() && ui.data(|d| d.get_temp::(edit_id)).unwrap_or(true) { + r.request_focus(); + ui.data_mut(|d| d.insert_temp(edit_id, false)); + } + let enter = ui.input(|i| i.key_pressed(egui::Key::Enter)); + let esc = ui.input(|i| i.key_pressed(egui::Key::Escape)); + if esc { + ui.data_mut(|d| d.remove::(edit_id)); app.ui.rename = None; - app.run("layer.rename", json!({"layer": layer.id.0, "name": name})); + } else if enter || r.lost_focus() { + ui.data_mut(|d| d.remove::(edit_id)); + let name = buf.trim().to_string(); + app.ui.rename = None; + if !name.is_empty() && name != layer.name { + app.run("layer.rename", json!({"layer": layer.id.0, "name": name})); + } } } } else { @@ -437,13 +449,15 @@ fn layer_row(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, depth: usize p.text(blend_rect.right_center(), egui::Align2::RIGHT_CENTER, tr("off"), egui::FontId::proportional(11.0), tk.text_dim); } // Interaction: select, rename, drag & drop, context menu. - if resp.clicked() && !eye_resp.clicked() { + if resp.clicked() && !eye_resp.clicked() && !renaming { app.run("layer.select", json!({"layer": layer.id.0})); } - if resp.double_clicked() { + if resp.double_clicked() && !eye_resp.clicked() && !renaming { + let edit_id = ui.scope_id().with(("layer_rename", layer.id.0)); app.ui.rename = Some((layer.id.0, layer.name.clone())); + ui.ctx().memory_mut(|m| m.request_focus(edit_id)); } - if resp.drag_started() { + if resp.drag_started() && !renaming { resp.dnd_set_drag_payload(layer.id.0); } // Drops: a layer or a shelf material lands above this row (inside a folder when dropped on From 4a49019d8d8103a3ae7de03c31d37e564c3fecc3 Mon Sep 17 00:00:00 2001 From: test-bit-sys Date: Sun, 1 Nov 2026 20:32:23 +0100 Subject: [PATCH 2/3] Address CodeRabbit review: capture Escape in EventFilter and ensure initial focus is marked --- crates/ui-egui/src/dock.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs index 7f152179..a5783d0c 100644 --- a/crates/ui-egui/src/dock.rs +++ b/crates/ui-egui/src/dock.rs @@ -383,10 +383,21 @@ fn layer_row(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, depth: usize let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect).layout(egui::Layout::left_to_right(egui::Align::Center))); if let Some((_, buf)) = app.ui.rename.as_mut() { let edit_id = ui.scope_id().with(("layer_rename", layer.id.0)); - let r = child.add(egui::TextEdit::singleline(buf).id(edit_id).desired_width(name_rect.width())); - if !r.has_focus() && ui.data(|d| d.get_temp::(edit_id)).unwrap_or(true) { - r.request_focus(); + let edit = egui::TextEdit::singleline(buf) + .id(edit_id) + .desired_width(name_rect.width()) + .event_filter(egui::EventFilter { + horizontal_arrows: true, + vertical_arrows: true, + escape: true, + ..Default::default() + }); + let r = child.add(edit); + if ui.data(|d| d.get_temp::(edit_id)).unwrap_or(true) { ui.data_mut(|d| d.insert_temp(edit_id, false)); + if !r.has_focus() { + r.request_focus(); + } } let enter = ui.input(|i| i.key_pressed(egui::Key::Enter)); let esc = ui.input(|i| i.key_pressed(egui::Key::Escape)); From 94e288a944beff93bfa9b794f8ecf406e15d0b37 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Mon, 2 Nov 2026 02:59:38 +0700 Subject: [PATCH 3/3] Layer rename: focus the field until it has it, and test the editor in the UI Request focus only while the field has none, so it can lose focus to Enter or a click elsewhere; this replaces the per-layer temp flag and the second focus request on double-click. UI tests drive the layer stack offscreen: Enter and a click elsewhere rename, Escape cancels, and Ctrl+Z undoes the rename afterwards (all three fail on main). --- crates/ui-egui/src/dock.rs | 35 ++++---------- crates/ui-egui/tests/layer_rename.rs | 68 ++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 crates/ui-egui/tests/layer_rename.rs diff --git a/crates/ui-egui/src/dock.rs b/crates/ui-egui/src/dock.rs index a5783d0c..d69cdbcf 100644 --- a/crates/ui-egui/src/dock.rs +++ b/crates/ui-egui/src/dock.rs @@ -382,35 +382,22 @@ fn layer_row(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, depth: usize if renaming { let mut child = ui.new_child(egui::UiBuilder::new().max_rect(name_rect).layout(egui::Layout::left_to_right(egui::Align::Center))); if let Some((_, buf)) = app.ui.rename.as_mut() { - let edit_id = ui.scope_id().with(("layer_rename", layer.id.0)); - let edit = egui::TextEdit::singleline(buf) - .id(edit_id) - .desired_width(name_rect.width()) - .event_filter(egui::EventFilter { - horizontal_arrows: true, - vertical_arrows: true, - escape: true, - ..Default::default() - }); - let r = child.add(edit); - if ui.data(|d| d.get_temp::(edit_id)).unwrap_or(true) { - ui.data_mut(|d| d.insert_temp(edit_id, false)); - if !r.has_focus() { - r.request_focus(); - } - } - let enter = ui.input(|i| i.key_pressed(egui::Key::Enter)); - let esc = ui.input(|i| i.key_pressed(egui::Key::Escape)); - if esc { - ui.data_mut(|d| d.remove::(edit_id)); + // Escape reaches us instead of just unfocusing the field, so it can cancel. + let filter = egui::EventFilter { horizontal_arrows: true, vertical_arrows: true, escape: true, ..Default::default() }; + let r = child.add(egui::TextEdit::singleline(buf).desired_width(name_rect.width()).event_filter(filter)); + if ui.input(|i| i.key_pressed(egui::Key::Escape)) { app.ui.rename = None; - } else if enter || r.lost_focus() { - ui.data_mut(|d| d.remove::(edit_id)); + } else if r.lost_focus() { + // Enter or a click elsewhere. let name = buf.trim().to_string(); app.ui.rename = None; if !name.is_empty() && name != layer.name { app.run("layer.rename", json!({"layer": layer.id.0, "name": name})); } + } else if !r.has_focus() { + // Only until the field has focus: requesting it every frame kept it from ever + // losing focus, which trapped the editor open and blocked every shortcut. + r.request_focus(); } } } else { @@ -464,9 +451,7 @@ fn layer_row(app: &mut TextureCraftApp, ui: &mut Ui, layer: &Layer, depth: usize app.run("layer.select", json!({"layer": layer.id.0})); } if resp.double_clicked() && !eye_resp.clicked() && !renaming { - let edit_id = ui.scope_id().with(("layer_rename", layer.id.0)); app.ui.rename = Some((layer.id.0, layer.name.clone())); - ui.ctx().memory_mut(|m| m.request_focus(edit_id)); } if resp.drag_started() && !renaming { resp.dnd_set_drag_payload(layer.id.0); diff --git a/crates/ui-egui/tests/layer_rename.rs b/crates/ui-egui/tests/layer_rename.rs new file mode 100644 index 00000000..55b47bd9 --- /dev/null +++ b/crates/ui-egui/tests/layer_rename.rs @@ -0,0 +1,68 @@ +//! Renaming a layer in the stack: Enter, a click elsewhere or Escape end the editor, and the +//! shortcuts (Undo) work again afterwards. + +use egui::accesskit::Role; +use egui::{Key, Modifiers}; +use egui_kittest::Harness; +use egui_kittest::kittest::Queryable; +use texturecraft_ui_egui::TextureCraftApp; + +fn harness() -> (Harness<'static, TextureCraftApp>, u64) { + let session = texturecraft_engine::sample_session(256, 64).unwrap(); + let mut h = Harness::builder().with_size(egui::vec2(1600.0, 960.0)).build_eframe(|cc| TextureCraftApp::new(cc, session)); + h.run_steps(4); + let layer = h.state().session.selected_layer().unwrap().0; + (h, layer) +} + +fn name(h: &Harness<'_, TextureCraftApp>, layer: u64) -> String { + h.state().session.doc.project.layers.values().find(|l| l.id.0 == layer).unwrap().name.clone() +} + +/// Open the editor on `layer`, select its text and type `text`. +fn start(h: &mut Harness<'_, TextureCraftApp>, layer: u64, text: &str) { + h.state_mut().ui.rename = Some((layer, name(h, layer))); + h.run_steps(3); + h.key_press_modifiers(Modifiers::COMMAND, Key::A); + h.event(egui::Event::Text(text.into())); + h.run_steps(3); +} + +#[test] +fn enter_renames_and_undo_works_afterwards() { + let (mut h, layer) = harness(); + let before = name(&h, layer); + start(&mut h, layer, "Rust streaks"); + h.key_press(Key::Enter); + h.run_steps(3); + assert!(h.state().ui.rename.is_none(), "Enter closes the editor"); + assert_eq!(name(&h, layer), "Rust streaks"); + h.key_press_modifiers(Modifiers::COMMAND, Key::Z); + h.run_steps(3); + assert_eq!(name(&h, layer), before, "Ctrl+Z undoes the rename"); +} + +#[test] +fn a_click_elsewhere_renames() { + let (mut h, layer) = harness(); + start(&mut h, layer, "Clicked away"); + let edit = h.get_by(|n| n.role() == Role::TextInput && n.value().as_deref() == Some("Clicked away")).rect(); + // Below the editor's row, in the layer stack. + let away = egui::pos2(edit.center().x, edit.bottom() + 120.0); + h.drag_at(away); + h.drop_at(away); + h.run_steps(3); + assert!(h.state().ui.rename.is_none(), "a click elsewhere closes the editor"); + assert_eq!(name(&h, layer), "Clicked away"); +} + +#[test] +fn escape_cancels() { + let (mut h, layer) = harness(); + let before = name(&h, layer); + start(&mut h, layer, "Never applied"); + h.key_press(Key::Escape); + h.run_steps(3); + assert!(h.state().ui.rename.is_none(), "Escape closes the editor"); + assert_eq!(name(&h, layer), before); +}