EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge pull request #1019 from pravdomil/claude/confirm-unguarded-deletes
Brandon Thomasc3644e59d489
diff --cc crates/ui-egui/src/panels/shortcut_editor.rsindex b0e3d7f21,21213103e..9d22b9cc7--- a/crates/ui-egui/src/panels/shortcut_editor.rs+++ b/crates/ui-egui/src/panels/shortcut_editor.rs@@@ -615,48 -647,49 +659,91 @@@ mod testsout.textures_delta.clear();}+ #[test]+ fn the_ok_button_stays_inside_the_dialog_in_a_small_window() {+ let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());+ let ctx = egui::Context::default();+ crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));+ open(&mut app);+ for size in [vec2(1680.0, 1020.0), vec2(1280.0, 720.0)] {+ for _ in 0..3 {+ app.auto.begin_frame();+ let input = egui::RawInput { screen_rect: Some(Rect::from_min_size(pos2(0.0, 0.0), size)), ..Default::default() };+ let mut out = ctx.run_ui(input, |ui| crate::panels::dialogs::show(&mut app, ui.ctx()));+ out.textures_delta.clear();+ }+ let [_, y, _, h] = app.auto.find("shortcuts.close").expect("OK button").rect;+ // The window less the modal's margin and its frame padding.+ assert!(y + h <= size.y - 24.0 - 18.0 + 0.5, "OK ends at {} in a {size:?} window", y + h);+ }+ }++ #[test]+ fn enter_is_ok_except_while_recording_or_renaming() {+ let enter = || egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() };+ let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());+ let ctx = egui::Context::default();+ crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));+ // Recording: Enter is the recorded key.+ open(&mut app);+ app.dialog_state.shortcuts.recording = true;+ frame(&mut app, &ctx, vec![enter()]);+ assert_eq!(app.dialog, Some(Dialog::Shortcuts));+ assert_eq!(app.dialog_state.shortcuts.pending, "Enter");+ // Renaming a preset: Enter belongs to the name field.+ app.dialog_state.shortcuts.rename = Some("Mine".into());+ frame(&mut app, &ctx, vec![enter()]);+ assert_eq!(app.dialog, Some(Dialog::Shortcuts));+ // Otherwise it closes the editor, also with the search field focused.+ app.dialog_state.shortcuts.rename = None;+ frame(&mut app, &ctx, vec![]);+ frame(&mut app, &ctx, vec![enter()]);+ assert_eq!(app.dialog, None);+ }++ #[test]+ fn deleting_a_preset_asks_first() {+ fn click(app: &mut EffectcraftApp, ctx: &egui::Context, id: &str) {+ let [x, y, w, h] = app.auto.find(id).unwrap_or_else(|| panic!("{id} is not on screen")).rect;+ let pos = pos2(x + w / 2.0, y + h / 2.0);+ let button = |pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };+ for event in [egui::Event::PointerMoved(pos), button(true), button(false)] {+ frame(app, ctx, vec![event]);+ }+ // Two more: the automation ids of the clicked frame age out.+ frame(app, ctx, vec![]);+ frame(app, ctx, vec![]);+ }+ let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());+ let ctx = egui::Context::default();+ crate::theme::install(&ctx, &app.tokens, crate::i18n::language(&app));+ app.session.execute("shortcuts.preset", json!({"op": "duplicate", "from": DEFAULT_PRESET, "name": "Mine"})).unwrap();+ app.session.execute("shortcuts.preset", json!({"op": "select", "name": "Mine"})).unwrap();+ let has = |app: &EffectcraftApp| app.session.keymaps.names().iter().any(|n| n == "Mine");+ open(&mut app);+ for _ in 0..3 {+ frame(&mut app, &ctx, vec![]);+ }+ assert!(app.auto.find("dialog.deletePreset.delete").is_none());+ click(&mut app, &ctx, "shortcuts.delete");+ assert!(has(&app) && confirming(&app), "the click only asks");+ click(&mut app, &ctx, "dialog.deletePreset.cancel");+ assert!(has(&app) && app.auto.find("dialog.deletePreset.delete").is_none(), "Cancel keeps the preset");+ assert_eq!(app.dialog, Some(Dialog::Shortcuts), "the editor stays open");+ click(&mut app, &ctx, "shortcuts.delete");+ click(&mut app, &ctx, "dialog.deletePreset.delete");+ assert!(!has(&app), "confirmed: the preset is gone");+ assert!(!confirming(&app) && app.dialog == Some(Dialog::Shortcuts));+ // Cmd+D is Delete; Enter is not.+ app.session.execute("shortcuts.preset", json!({"op": "duplicate", "from": DEFAULT_PRESET, "name": "Mine"})).unwrap();+ app.session.execute("shortcuts.preset", json!({"op": "select", "name": "Mine"})).unwrap();+ app.dialog_state.shortcuts.confirm_delete = Some("Mine".into());+ crate::panels::dialogs::press_key(&mut app, &ctx, egui::Key::Enter, egui::Modifiers::NONE);+ assert!(has(&app) && confirming(&app));+ crate::panels::dialogs::press_key(&mut app, &ctx, egui::Key::D, egui::Modifiers::COMMAND);+ assert!(!has(&app) && !confirming(&app));+ }+#[test]fn recording_a_shortcut_does_not_also_type_the_key_into_the_field() {let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());