mirror of
https://github.com/storytold/texturecraft.git
synced 2026-11-21 15:00:42 +01:00
Merge pull request #42 from test-bit-sys/fix/layer-rename-focus-undo
Fix layer rename focus trap and restore Undo (#39)
This commit is contained in:
3 files changed
+101
-8
No files matched your search
@@ -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();
|
||||
|
||||
@@ -382,12 +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 r = child.add(egui::TextEdit::singleline(buf).desired_width(name_rect.width()));
|
||||
r.request_focus();
|
||||
if r.lost_focus() {
|
||||
let name = buf.clone();
|
||||
// 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;
|
||||
app.run("layer.rename", json!({"layer": layer.id.0, "name": name}));
|
||||
} 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 {
|
||||
@@ -437,13 +447,13 @@ 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 {
|
||||
app.ui.rename = Some((layer.id.0, layer.name.clone()));
|
||||
}
|
||||
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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
Reference in new issue
Block a user