Skip to content

armgit / nota

Public Imported from GitHub
0

Nota — a free DAW for macOS, Windows and Linux. No subscription, no account — just open it and make music.

Hotkey fixes

Egor Khindikaynen1981ee09869d
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de0c29c9..738b054b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
### Changed
- The audio engine now has its own version (starting at 0.2.5, shown in About) instead of a
fixed 0.1.0; it's bumped with each release that changes the engine.
+- Record and Metronome now need ⌘ / Ctrl: **⌘R** toggles Record and **⌘M** the metronome, so
+ bare R and M no longer flip them by accident while you play. The Mixer moves to **⌘⇧M**.
## [0.41.0] — 2026-09-24
diff --git a/src/managed/Nota.App/MainWindow.Input.cs b/src/managed/Nota.App/MainWindow.Input.cs
index a333dc3b..932ec042 100644
--- a/src/managed/Nota.App/MainWindow.Input.cs
+++ b/src/managed/Nota.App/MainWindow.Input.cs
@@ -94,8 +94,9 @@ public partial class MainWindow
}
// Transport hotkeys: Space = Play/Stop and Return = Stop are handled earlier in the
- // tunnel phase (OnGlobalTransportKey) so a focused control can't steal them. R =
- // Record; M = Metronome (below) de-dupe auto-repeat via _heldKeys.
+ // tunnel phase (OnGlobalTransportKey) so a focused control can't steal them. ⌘R =
+ // Record; ⌘M = Metronome (below) — also menu accelerators, so on macOS the native
+ // menu usually handles them first; de-duped against auto-repeat via _heldKeys.
// Esc: cancel an in-progress arrangement gesture, else clear the selection (req 1.2.6/2.11).
if (!mod && e.Key == Key.Escape && Timeline.EscapePressed())
@@ -114,21 +115,22 @@ public partial class MainWindow
e.Handled = true;
return;
}
- if (!mod && e.Key == Key.R && _heldKeys.Add(e.Key))
+ bool plainMod = mod && (e.KeyModifiers & (KeyModifiers.Alt | KeyModifiers.Shift)) == 0;
+ if (plainMod && e.Key == Key.R && _heldKeys.Add(e.Key))
{
_vm.Transport.RecordOn = !_vm.Transport.RecordOn;
e.Handled = true;
return;
}
- if (!mod && e.Key == Key.M && _heldKeys.Add(e.Key))
+ if (plainMod && e.Key == Key.M && _heldKeys.Add(e.Key))
{
_vm.Transport.MetronomeOn = !_vm.Transport.MetronomeOn;
e.Handled = true;
return;
}
- // ⌘M / ⌃M = open the Mixer window (or focus it if already open).
- if (mod && e.Key == Key.M)
+ // ⌘⇧M / ⌃⇧M = open the Mixer window (or focus it if already open).
+ if (mod && e.Key == Key.M && (e.KeyModifiers & KeyModifiers.Shift) != 0 && (e.KeyModifiers & KeyModifiers.Alt) == 0)
{
ToggleMixerWindow();
e.Handled = true;
diff --git a/src/managed/Nota.App/MainWindow.Mixer.cs b/src/managed/Nota.App/MainWindow.Mixer.cs
index ad60d713..79c1cdf1 100644
--- a/src/managed/Nota.App/MainWindow.Mixer.cs
+++ b/src/managed/Nota.App/MainWindow.Mixer.cs
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
//
-// The Mixer lives in its own window (View → Mixer / ⌘M) rather than as a main-view tab.
+// The Mixer lives in its own window (View → Mixer / ⌘⇧M) rather than as a main-view tab.
// The single MixerView instance is hosted in the window while it's open and detached on close.
using System;
@@ -14,7 +14,7 @@ public partial class MainWindow
private void OnMenuMixer(object? sender, EventArgs e) => ToggleMixerWindow();
- /// <summary>Open the Mixer window, or close it if it's already open (⌘M / View → Mixer).</summary>
+ /// <summary>Open the Mixer window, or close it if it's already open (⌘⇧M / View → Mixer).</summary>
internal void ToggleMixerWindow()
{
if (_mixerWindow is not null) { _mixerWindow.Close(); return; }
diff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axaml
index be3f4bc5..43d798c4 100644
--- a/src/managed/Nota.App/MainWindow.axaml
+++ b/src/managed/Nota.App/MainWindow.axaml
@@ -55,7 +55,7 @@
<NativeMenuItem Header="View">
<NativeMenuItem.Menu>
<NativeMenu>
- <NativeMenuItem Header="Mixer" Click="OnMenuMixer" Gesture="Cmd+M"/>
+ <NativeMenuItem Header="Mixer" Click="OnMenuMixer" Gesture="Shift+Cmd+M"/>
<NativeMenuItemSeparator/>
<NativeMenuItem Header="Toggle browser" Click="OnMenuToggleBrowser"/>
<NativeMenuItem Header="Toggle detail panel" Click="OnMenuToggleClip"/>
@@ -74,9 +74,9 @@
<NativeMenuItem.Menu>
<NativeMenu>
<NativeMenuItem Header="Play / Stop" Click="OnMenuPlayStop"/>
- <NativeMenuItem Header="Record" Click="OnMenuRecord"/>
+ <NativeMenuItem Header="Record" Click="OnMenuRecord" Gesture="Cmd+R"/>
<NativeMenuItem Header="Loop" Click="OnMenuLoop" Gesture="Cmd+L"/>
- <NativeMenuItem Header="Metronome" Click="OnMenuMetronome" Gesture="Cmd+K"/>
+ <NativeMenuItem Header="Metronome" Click="OnMenuMetronome" Gesture="Cmd+M"/>
</NativeMenu>
</NativeMenuItem.Menu>
</NativeMenuItem>
diff --git a/src/managed/Nota.App/PreferencesWindow.cs b/src/managed/Nota.App/PreferencesWindow.cs
index bd13f6ad..d33ccad0 100644
--- a/src/managed/Nota.App/PreferencesWindow.cs
+++ b/src/managed/Nota.App/PreferencesWindow.cs
@@ -648,15 +648,15 @@ public sealed class PreferencesWindow : NotaWindow
{
("Space", "Play / Stop"),
("Return", "Stop (again → back to the start)"),
- ("R", "Record"),
- ("M", "Metronome"),
+ ("⌘R", "Record"),
+ ("⌘M", "Metronome"),
("⌘L", "Loop on / off · loop the time selection"),
}),
("ARRANGEMENT & EDITING", new[]
{
("⌘Z ⌘⇧Z", "Undo / redo"),
("⌘A", "Toggle automation mode"),
- ("⌘M", "Toggle the Mixer view"),
+ ("⌘⇧M", "Toggle the Mixer view"),
("Tab", "Cycle Devices / Pattern / Clip in the detail panel"),
("Esc", "Cancel the current gesture / clear the selection · close the patch-bay overlay"),
("⌘G ⌘⇧G", "Group / ungroup selected tracks"),