Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge PR #809

Claude68f75cc07a6d
diff --cc crates/ui-egui/src/shortcuts.rs
index 7771ffb58,877ad6b83..c09fff911
--- a/crates/ui-egui/src/shortcuts.rs
+++ b/crates/ui-egui/src/shortcuts.rs
@@@ -325,8 -304,12 +325,12 @@@ pub fn handle(app: &mut LightcraftApp,
if !matches!(app.ui.dialog, Some(crate::state::Dialog::Shortcuts)) {
app.recording_shortcut = None;
}
+ // Dialogs own their keys (including Esc and text editing); background photo actions wait.
+ if app.ui.dialog.is_some() {
+ return;
+ }
// don't steal keys from text fields or from the keymap editor recording a shortcut
- if ctx.egui_wants_keyboard_input() || app.recording_shortcut.is_some() || app.ui.name_edit.is_some() {
+ if keyboard_owned(app, ctx) || app.recording_shortcut.is_some() || app.ui.name_edit.is_some() {
return;
}
let mut fire: Vec<String> = Vec::new();