Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

#1284: disable key-menu commands that need selecting an unselected key on a locked layer

Claudec4ca4dc0e9e2
diff --git a/crates/ui-egui/src/panels/timeline.rs b/crates/ui-egui/src/panels/timeline.rs
index 7fa5881a4..b94519713 100644
--- a/crates/ui-egui/src/panels/timeline.rs
+++ b/crates/ui-egui/src/panels/timeline.rs
@@ -4080,7 +4080,9 @@ pub(crate) fn key_menu(
continue;
}
let edits = !matches!(cmd, "keys.copy" | "keys.selectEqual" | "keys.selectPrevious" | "keys.selectFollowing" | "keys.selectAll");
- if ui.add_enabled(!(locked && edits), egui::Button::new(crate::i18n::context_item(cmd, &params, lbl))).clicked() {
+ // An unselected key is selected before the command runs, and locked keys cannot be selected.
+ let unselectable = locked && !selected && cmd != "keys.selectAll";
+ if ui.add_enabled(!(locked && edits) && !unselectable, egui::Button::new(crate::i18n::context_item(cmd, &params, lbl))).clicked() {
if !selected {
actions.push(("keys.select".into(), json!({"keys": [this_key.clone()]})));
}