From f99407fb1f980e544c9916ee9ecf3366dc810cbc Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 3 Nov 2026 09:56:42 -0500 Subject: [PATCH] Leave Insertion Follows Playback's N to the Edit window's shortcut handler Co-Authored-By: Claude Opus 5.5 --- crates/engine/src/cmd/options.rs | 2 +- crates/ui-egui/src/toolbar.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/engine/src/cmd/options.rs b/crates/engine/src/cmd/options.rs index 1596a8ad..45c4b63a 100644 --- a/crates/engine/src/cmd/options.rs +++ b/crates/engine/src/cmd/options.rs @@ -24,7 +24,7 @@ pub fn specs() -> Vec { toggle!("options.loop_playback", "Loop Playback", ["Options"], Some("Cmd+Shift+L"), loop_playback), toggle!("options.link_timeline_edit", "Link Timeline and Edit Selection", ["Options"], Some("Shift+/"), link_timeline_edit), toggle!("options.link_track_edit", "Link Track and Edit Selection", ["Options"], None, link_track_edit), - toggle!("options.insertion_follows_playback", "Insertion Follows Playback", ["Options"], Some("N"), insertion_follows_playback), + toggle!("options.insertion_follows_playback", "Insertion Follows Playback", ["Options"], None, insertion_follows_playback), toggle!("options.tab_to_transient", "Tab to Transient", ["Options"], Some("Cmd+Alt+Tab"), tab_to_transient), toggle!("options.mirrored_midi", "Mirrored MIDI Editing", ["Options"], None, mirrored_midi), toggle!("options.automation_follows_edit", "Automation Follows Edit", ["Options"], None, automation_follows_edit), diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs index 0aef3a52..3b01aa83 100644 --- a/crates/ui-egui/src/toolbar.rs +++ b/crates/ui-egui/src/toolbar.rs @@ -6,7 +6,7 @@ use crate::{SoundApp, icons}; use egui::{Align2, Color32, CornerRadius, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2}; use serde_json::json; use soundcraft_engine::edit::{SHUFFLE_LOCK, SNAP_TO_GRID}; -use soundcraft_model::{EditState, EditMode, Tool}; +use soundcraft_model::{EditMode, EditState, Tool}; use soundcraft_time::{TimeFormat, format_length}; pub const HEIGHT: f32 = 78.0;