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.

(feat) A Mixer button in the toolbar (#516) (#571)

Asishb214127062cf
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df0a5a84..b4161f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,10 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
## [Unreleased]
### Added
+- **A Mixer button in the toolbar** (#516, specs/092). Next to Automation, the faders key shows
+ or hides the Mixer with one click, docked or in its own window, as View → Mixer and ⌘⇧M do.
+ It reads as on while the Mixer is shown and stays in step however you open or close it: the
+ menu, the shortcut, the panel's or the window's close button. Its tooltip names the shortcut.
- **Your own keyboard shortcuts** (#61, specs/096). Every key in Nota can now be changed in
**Settings → Shortcuts**: click a key, press the new one, **Confirm** — menu commands and
the keys that used to be fixed alike: piano-roll and arrangement editing (nudge, transpose,
diff --git a/DESIGN.md b/DESIGN.md
index 093cba8c..7597409b 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -502,7 +502,7 @@ headers and in the mixer, faders and meters.
| Strength | Looks like | Used for |
|---|---|---|
| **Live: solid** | `Accent` fill, derived ink on it | Playing (Play while the transport runs), recording, the playhead, the loop range, a switch that is on inside a device, a device's power switch, the current device tab's underline, a live icon button |
-| **Picked: soft tint** | `AccentSoft` fill with orange text or icon (`AccentBright` in dark themes, `AccentPale` in light ones) | The option you chose: a segment, the current view, a tool that is on (Metronome, Follow, Snap, Automation), the left rail's current page (with a 2 × 14 orange tick), a filter chip that is on, Loop and Replace on. Never solid |
+| **Picked: soft tint** | `AccentSoft` fill with orange text or icon (`AccentBright` in dark themes, `AccentPale` in light ones) | The option you chose: a segment, the current view, a tool that is on (Metronome, Follow, Snap, Automation, Mixer), the left rail's current page (with a 2 × 14 orange tick), a filter chip that is on, Loop and Replace on. Never solid |
| **Values in devices: orange lines** | `Accent` line on a quiet fill | Only inside a device card: the arc of a knob, the 3 px line on a value bar (its fill is the soft tint), the selected EQ point, an upright value bar |
A shell slider under the pointer or being dragged borrows the value bar's colours (soft
@@ -740,7 +740,7 @@ The bar across the top: views, transport, tempo, grid and tools.
- **Toggles:** Loop and the loop-record mode (Overdub: two layers · Replace: one layer and a
turn arrow) are icon buttons beside the position; the loop range is on the ruler. Tap is
a small pill and keeps its four beat dots.
-- **Tools:** Metronome, Follow, Snap and Automation are icon buttons; on is the soft tint.
+- **Tools:** Metronome, Follow, Snap, Automation and Mixer are icon buttons; on is the soft tint.
- **Right:** MIDI and Remote with small status dots, then Master as a flat slider with its
dB value inside (§ Sliders).
- 44 high on `SurfaceDeep`, a seam below. The view switch (Arrangement · Session ·
diff --git a/FEATURES.md b/FEATURES.md
index 502f0c19..7a1af0ad 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -119,8 +119,9 @@ on a pool of render threads, export and freeze use every core, and an idle engin
## Views
Three top-level views, switched by three icon keys in the transport (**Arrangement ·
-Session · Modular**; each names its view in a tooltip). The Mixer (**View → Mixer**, ⌘⇧M)
-docks as a panel under any of the three, or floats in its own window — see
+Session · Modular**; each names its view in a tooltip). The Mixer (**View → Mixer**, ⌘⇧M,
+or the toolbar's **Mixer** button) docks as a panel under any of the three, or floats in its
+own window — see
[Tracks and mixer](#tracks-and-mixer).
- **Arrangement View** — a linear timeline:
@@ -287,8 +288,10 @@ docks as a panel under any of the three, or floats in its own window — see
arms that track alone, ⌘-click arms several; **Transport ▸ Auto-arm selected track** (off by
default) arms the instrument track you select.
Double-click resets to the default.
-- **Mixer** (**View → Mixer**, ⌘⇧M / Ctrl+Shift+M): a strip per track in the Arrangement's
- order — each group, then its tracks — then the returns, then the master (I/O, A/B sends,
+- **Mixer** (**View → Mixer**, ⌘⇧M / Ctrl+Shift+M, or the toolbar's **Mixer** button after
+ Automation, which reads as on while the Mixer is shown, docked or in its window): a strip
+ per track in the Arrangement's order — each group, then its tracks — then the returns,
+ then the master (I/O, A/B sends,
pan, fader with a stereo meter and dB read-out, M / S / Arm), the
**Strips | Stereo map** switch and the pan law footer. It docks as a resizable panel under
Arrangement, Session or Modular, above the Devices / Clip panel (either, both or neither),
diff --git a/specs/092-toolbar-mixer-toggle/plan.md b/specs/092-toolbar-mixer-toggle/plan.md
new file mode 100644
index 00000000..61e7d559
--- /dev/null
+++ b/specs/092-toolbar-mixer-toggle/plan.md
@@ -0,0 +1,43 @@
+# Implementation Plan: A Mixer button in the toolbar
+
+**Branch**: `092-toolbar-mixer-toggle` | **Date**: 2026-11-11 | **Spec**: [spec.md](spec.md)
+
+## Summary
+
+A `tp-icon` toggle after Automation that runs `view.mixer` and mirrors whether the Mixer is
+shown.
+
+## Technical Context
+
+**Language/Version**: C# / .NET 10, Avalonia.
+
+**Primary Dependencies**: none new.
+
+**Audio-Thread Impact**: None.
+
+**Testing**: the smoke test's localization check (the new texts, the removed one), icon check
+(the glyph lives in `Glyph.cs`) and design checks; manual check in the running app of every
+path in User Story 2.
+
+## Design
+
+- `Glyph.cs` — `GlyphKind.Mixer`: three 16-unit fader slots (stroke) with 4 × 3.5 solid caps
+ (fill) at three levels.
+- `MainWindow.axaml` — `MixerToggle` after `AutomationToggle`, `Click="OnToggleMixerButton"`.
+- `MainWindow.Mixer.cs`:
+ - `OnToggleMixerButton` runs `view.mixer` through the command registry, then
+ `SyncMixerToggle` (a ToggleButton flips itself on click; the Mixer may not open).
+ - `SyncMixerToggle` sets `IsChecked = IsMixerShown`. Called where the shown state changes:
+ the end of `DockMixer`, `UndockMixer` and `OpenMixerWindow`, and the window's
+ `WindowClosed`. Every path (menu, shortcut, close buttons, placement switches, the restore
+ at launch) goes through those.
+- `MainWindow.MenuKeys.cs` — the tooltip through `MenuKit.Keys`, like Automation's.
+- `MainWindow.TransportFit.cs` — `MixerToggle` sheds right after `AutomationToggle`.
+- `PreferencesWindow` — the ⌘⇧M row says "Show or hide the Mixer · also the Mixer button in
+ the toolbar" (a new key; the old one goes).
+- `DESIGN.md` — the Tools list names Mixer.
+
+## Constitution Check
+
+UI-only, no engine change, no dependency, no new ABI. Texts through `Loc`, geometry in
+`Glyph`, colours from the shared toggle style.
diff --git a/specs/092-toolbar-mixer-toggle/spec.md b/specs/092-toolbar-mixer-toggle/spec.md
new file mode 100644
index 00000000..1b97c0f4
--- /dev/null
+++ b/specs/092-toolbar-mixer-toggle/spec.md
@@ -0,0 +1,108 @@
+# Feature Specification: A Mixer button in the toolbar
+
+**Feature Branch**: `092-toolbar-mixer-toggle`
+
+**Created**: 2026-11-11
+
+**Status**: Implemented
+
+**Input**: GitHub issue nota-daw/nota#516: "Show or hide the Mixer with one click while
+working. Today it is only reachable from View → Mixer or ⌘⇧M / Ctrl+Shift+M, and neither is
+obvious to someone who doesn't know they exist. […] A Mixer toggle button in the toolbar's icon
+group, right after the Automation toggle (Metronome · Follow · Snap · Automation · Mixer). It
+runs the same `view.mixer` command as View → Mixer and ⌘⇧M […]. It reads as on while the Mixer
+is visible, and stays in sync when the Mixer is opened or closed any other way (menu, shortcut,
+the window's close button). A new glyph drawn to the style guide (24-unit grid, 1.6 line), with
+a tooltip naming the shortcut. Preferences → Shortcuts and the user docs mention the button."
+
+## Nota Context
+
+**Feature area**:
+
+- [ ] Engine (C++, `src/native/nota.engine`)
+- [x] Managed app (C#, `src/managed/*`) — the main window's toolbar and the Mixer placement
+- [x] UI (Avalonia) — follow `DESIGN.md` (Studio)
+- [ ] Plugin hosting
+- [ ] Build / packaging / CI
+- [ ] Docs only
+
+**Nota docs to keep in mind**: [`ARCHITECTURE.md`](../../ARCHITECTURE.md),
+[`CONTRIBUTING.md`](../../CONTRIBUTING.md), [`DESIGN.md`](../../DESIGN.md),
+[`FEATURES.md`](../../FEATURES.md).
+
+**Existing behaviour this builds on**: the toolbar's tool group holds Metronome, Follow, Snap
+and Automation as `tp-icon` toggle buttons with a `Glyph` each; on is the soft tint. The Mixer
+(specs/054) is one `MixerView` that `MainWindow.Mixer.cs` docks as a bottom panel or moves into
+its own window. `view.mixer` (View → Mixer, ⌘⇧M) runs `ToggleMixer`; the panel's close button,
+the window's close button and its dock button, and View → Mixer in its own window also show,
+hide or move it. On a narrow window the transport bar sheds controls in a fixed order
+(`MainWindow.TransportFit.cs`).
+
+## User Scenarios & Testing
+
+### User Story 1 - One click to the Mixer (Priority: P1)
+
+A user who doesn't know the shortcut sees a faders key after Automation, clicks it, and the
+Mixer opens where it was last (docked or in its window). Clicking it again hides it.
+
+**Acceptance Scenarios**:
+
+1. **Given** the Mixer hidden, **When** the user clicks the Mixer button, **Then** the Mixer
+ shows in its remembered placement and the button reads as on.
+2. **Given** the Mixer shown, **When** the user clicks it, **Then** the Mixer hides and the
+ button reads as off.
+3. **When** the pointer rests on it, **Then** the tooltip names the shortcut (⌘⇧M on macOS,
+ Ctrl+Shift+M elsewhere).
+
+### User Story 2 - Always in step (Priority: P1)
+
+**Acceptance Scenarios**:
+
+1. **When** the Mixer is shown or hidden from View → Mixer, ⌘⇧M, the docked panel's close
+ button or the Mixer window's close button, **Then** the button follows.
+2. **When** the Mixer moves between docked and its own window (pop-out, dock, View → Mixer in
+ its own window), **Then** the button stays on.
+3. **When** Nota starts with the Mixer remembered as shown, **Then** the button starts on.
+
+### Edge Cases
+
+- **Narrow window**: the button folds away with the other tools, right after Automation; the
+ menu and the shortcut stay.
+- **No Mixer view yet**: a click changes nothing and the button stays off.
+- **Clip editor filling the window**: a docked Mixer folds away, so the button reads as off;
+ a click (or ⌘⇧M) brings the editor back to the split and the Mixer with it.
+
+## Requirements
+
+### Functional Requirements
+
+- **FR-001**: The toolbar MUST show a Mixer toggle after Automation, with its own glyph on the
+ 24-unit grid with the shared 1.6 line.
+- **FR-002**: The button MUST run `view.mixer`, the command behind View → Mixer and ⌘⇧M.
+- **FR-003**: The button MUST read as on exactly while the Mixer is shown, docked or in its
+ window, whatever opened, closed or moved it.
+- **FR-004**: The tooltip MUST name the shortcut, spelled for the platform.
+- **FR-005**: Preferences → Shortcuts MUST mention the button beside ⌘⇧M.
+- **FR-006**: On a narrow window the button MUST fold away right after Automation.
+
+## Success Criteria
+
+- **SC-001**: The Mixer is reachable from the main window in one visible click.
+
+## Assumptions
+
+- The faders glyph is new (the browser rail's Sliders icon stands for audio effects): three
+ fader slots with solid caps at different levels.
+- The user docs (nota-docs) are a separate repository; FEATURES.md, the Shortcuts pane and
+ DESIGN.md's tool list are updated here.
+
+## Nota Compliance Checklist
+
+- [x] Every new source file carries the AGPL-3.0-only SPDX header (no new source files)
+- [x] No new dependency
+- [x] Audio-thread impact: none — UI only
+- [x] No new managed/native crossings
+- [x] Smoke-test impact: none new; the localization, icon and design checks cover the new
+ texts, the glyph and the toolbar markup
+- [x] User-visible change → `CHANGELOG.md` `[Unreleased]` entry and FEATURES.md
+- [x] UI change → follows `DESIGN.md` (tool icon button, soft tint when on)
diff --git a/specs/092-toolbar-mixer-toggle/tasks.md b/specs/092-toolbar-mixer-toggle/tasks.md
new file mode 100644
index 00000000..5d7afbb0
--- /dev/null
+++ b/specs/092-toolbar-mixer-toggle/tasks.md
@@ -0,0 +1,20 @@
+# Tasks: A Mixer button in the toolbar
+
+**Input**: [spec.md](spec.md), [plan.md](plan.md)
+
+## Phase 1: User Story 1 — one click to the Mixer (P1)
+
+- [x] T001 `GlyphKind.Mixer` in `src/managed/Nota.App/Controls/Glyph.cs` (FR-001)
+- [x] T002 `MixerToggle` after Automation in `src/managed/Nota.App/MainWindow.axaml`, running `view.mixer` (FR-001, FR-002)
+- [x] T003 Tooltip naming the shortcut in `MainWindow.MenuKeys.cs`, text in `en.json` (FR-004)
+
+## Phase 2: User Story 2 — always in step (P1)
+
+- [x] T004 `SyncMixerToggle` from docking, undocking and opening and closing the window (launch restores through them) in `MainWindow.Mixer.cs` (FR-003)
+
+## Phase 3: Polish
+
+- [x] T005 Narrow-window shed order in `MainWindow.TransportFit.cs` (FR-006)
+- [x] T006 Preferences → Shortcuts row mentions the button (FR-005)
+- [x] T007 `CHANGELOG.md` `[Unreleased]`, `FEATURES.md` and `DESIGN.md` tool list
+- [x] T008 Linux build steps pass (engine, managed, smoke test incl. localization, icon and design checks)
diff --git a/src/managed/Nota.App/Controls/Glyph.cs b/src/managed/Nota.App/Controls/Glyph.cs
index d69483fe..df8c66a3 100644
--- a/src/managed/Nota.App/Controls/Glyph.cs
+++ b/src/managed/Nota.App/Controls/Glyph.cs
@@ -35,7 +35,7 @@ internal enum GlyphKind
Copy, Cut, Paste, Trash, Duplicate, Split, Consolidate, Stems, Reverse, Folder, Ungroup,
Palette, Note, Input, Arrow, Grid, Select, Save, List, Compare, Flatten,
// Path kinds (24-unit grid, see Paths)
- Arrangement, Session, Modular, Keyboard, Sliders, Downloads, Star, StarFilled, Bookmark, Doc, Midi, Map, History, Sidebar, Options, Search, CaretRight, CaretDown, Levels, Gamepad, Phone, Plug, Library, Appearance, Shortcuts, MidiPort, Action, Track, Device, Preset, Patch, PatchCable, Loop, Overdub, Replace, Speaker, SpeakerMute, SpeakerLow, SpeakerHigh, Metronome, Follow, Snap, Automation, Apple, Windows, Linux, ChainLink, Update,
+ Arrangement, Session, Modular, Keyboard, Sliders, Downloads, Star, StarFilled, Bookmark, Doc, Midi, Map, History, Sidebar, Options, Search, CaretRight, CaretDown, Levels, Gamepad, Phone, Plug, Library, Appearance, Shortcuts, MidiPort, Action, Track, Device, Preset, Patch, PatchCable, Loop, Overdub, Replace, Speaker, SpeakerMute, SpeakerLow, SpeakerHigh, Metronome, Follow, Snap, Automation, Mixer, Apple, Windows, Linux, ChainLink, Update,
Output, Globe, // Settings → Outputs and Language
Lock, LockOpen, // a reference (read-only) clip in the multi-clip editor, and the unlocked toggle
DockIn, // PopOut's opposite: bring a floating window back into the main one
@@ -533,6 +533,8 @@ internal sealed class Glyph : Control
[GlyphKind.Snap] = (null, "M4 17 V12.5 A8 8 0 0 1 20 12.5 V17 H15.5 V12.5 A3.5 3.5 0 0 0 8.5 12.5 V17 ZM4 19 H8.5 V21.5 H4 ZM15.5 19 H20 V21.5 H15.5 Z"),
// A breakpoint envelope with two handles.
[GlyphKind.Automation] = ("M3 17.5 H9 L14.5 7.5 H21", "M7.099 17.5 A1.9 1.9 0 1 0 10.901 17.5 A1.9 1.9 0 1 0 7.099 17.5 ZM12.6 7.5 A1.9 1.9 0 1 0 16.399 7.5 A1.9 1.9 0 1 0 12.6 7.5 Z"),
+ // Three channel faders, each a slot with a solid cap at its own level (the Mixer).
+ [GlyphKind.Mixer] = ("M6 4 V20 M12 4 V20 M18 4 V20", "M4 12.5 H8 V16 H4 ZM10 6.5 H14 V10 H10 ZM16 10 H20 V13.5 H16 Z"),
// The Apple mark.
[GlyphKind.Apple] = (null, "F1 M8 4.8 C6.4 3.733 3 3.867 3 7.867 C3 11.067 4.933 14 6.2 14 C7.067 14 7.333 13.533 8 13.533 C8.667 13.533 8.933 14 9.8 14 C10.8 14 12.267 12.133 12.867 10.267 C11.733 9.8 11.067 8.8 11.067 7.667 C11.067 6.6 11.667 5.733 12.533 5.267 C11.467 4 9.333 3.933 8 4.8 ZM8.133 4.2 C8.133 2.867 9.067 1.867 10.4 1.8 C10.4 3.133 9.467 4.133 8.133 4.2 Z"),
// The Windows mark.
diff --git a/src/managed/Nota.App/MainWindow.Detail.cs b/src/managed/Nota.App/MainWindow.Detail.cs
index 4974266c..543a1138 100644
--- a/src/managed/Nota.App/MainWindow.Detail.cs
+++ b/src/managed/Nota.App/MainWindow.Detail.cs
@@ -1248,6 +1248,7 @@ public partial class MainWindow
Nota.App.Input.Keys.SetTip(DetailMaximizeBtn, on ? Loc.T("main.detail.back_to_the_split_f") : Loc.T("main.fill_the_window_with_the"), "view.maximizeDetail");
if (MenuItemFor("view.maximizeDetail") is { } mi) mi.IsChecked = on;
LayoutBottomPanels();
+ SyncMixerToggle(); // a docked Mixer folds away while the editor fills the window
}
// Some paths only flip the panel's visibility (View ▸ Toggle detail panel, a closed clip):
diff --git a/src/managed/Nota.App/MainWindow.MenuKeys.cs b/src/managed/Nota.App/MainWindow.MenuKeys.cs
index 6b3fe3bd..84d49233 100644
--- a/src/managed/Nota.App/MainWindow.MenuKeys.cs
+++ b/src/managed/Nota.App/MainWindow.MenuKeys.cs
@@ -31,6 +31,7 @@ public partial class MainWindow
// Tooltips that name a key follow its binding (specs/096) and are spelled Ctrl+… on
// Windows / Linux (#10).
Keys.SetTip(AutomationToggle, Loc.T("main.menu_keys.show_parameter_automation_lanes_a"), "view.automation");
+ Keys.SetTip(MixerToggle, Loc.T("main.menu_keys.show_or_hide_the_mixer"), "view.mixer");
foreach (var (c, id) in new (Control, string)[]
{
(RecordBtn, "transport.record"), (LoopRecordCell, "transport.loopRecordMode"), (MetronomeBtn, "transport.metronome"),
diff --git a/src/managed/Nota.App/MainWindow.Mixer.cs b/src/managed/Nota.App/MainWindow.Mixer.cs
index 91cb60cc..288aaa87 100644
--- a/src/managed/Nota.App/MainWindow.Mixer.cs
+++ b/src/managed/Nota.App/MainWindow.Mixer.cs
@@ -33,6 +33,8 @@ public partial class MainWindow
private static ISettingsService MixerSettings => App.Services.GetRequiredService<ISettingsService>();
private static bool MixerFloating => MixerSettings.Current.MixerFloating;
internal bool IsMixerShown => _mixerDocked || _mixerWindow is not null;
+ // On screen: a docked Mixer folds away while the clip editor fills the window (#516).
+ private bool IsMixerVisible => _mixerWindow is not null || (_mixerDocked && !_detailMaximized);
private double MixerPanelMin => MixerPanelChrome + (_mixer?.MinContentHeight ?? 0);
private double MixerPanelNatural => MixerPanelChrome + (_mixer?.NaturalContentHeight ?? 0);
@@ -59,10 +61,26 @@ public partial class MainWindow
private void OnMenuMixer(object? sender, EventArgs e) => ToggleMixer();
- /// <summary>Show the Mixer in its remembered placement, or hide it (⌘⇧M / View → Mixer).</summary>
+ // The toolbar's Mixer button (#516) runs view.mixer like View → Mixer and ⌘⇧M. A click
+ // flips the button by itself; put it back to what is true, since the Mixer may not open.
+ private void OnToggleMixerButton(object? sender, RoutedEventArgs e)
+ {
+ _commands.Run("view.mixer");
+ SyncMixerToggle();
+ }
+
+ /// <summary>The toolbar's Mixer button reads as on while the Mixer is on screen, docked or in
+ /// its own window — however it was opened or closed (button, menu, ⌘⇧M, the panel's or
+ /// the window's close button, a switch of placement, launch): docking, undocking, the
+ /// window opening and closing, and the clip editor filling the window all end here.</summary>
+ private void SyncMixerToggle() => MixerToggle.IsChecked = IsMixerVisible;
+
+ /// <summary>Show the Mixer in its remembered placement, or hide it (⌘⇧M / View → Mixer).
+ /// A docked Mixer hidden by the clip editor filling the window comes back instead.</summary>
internal void ToggleMixer()
{
- if (IsMixerShown) HideMixer();
+ if (_mixerDocked && _detailMaximized) SetDetailMaximized(false);
+ else if (IsMixerShown) HideMixer();
else ShowMixer();
}
@@ -157,6 +175,7 @@ public partial class MainWindow
_mixerWanted = DockedMixerHeight();
LayoutBottomPanels();
_mixer.Refresh();
+ SyncMixerToggle();
}
// The height the user dragged it to; until they have, full strips but no more than half
@@ -175,6 +194,7 @@ public partial class MainWindow
SetHost(MixerHost, null);
if (_mixer is not null && _mixerWindow is null) _mixer.IsVisible = false;
LayoutBottomPanels();
+ SyncMixerToggle();
}
// A finished drag of either splitter next to the docked Mixer sets its height.
@@ -245,8 +265,10 @@ public partial class MainWindow
_mixerWindow = null;
// Closing it by hand hides the Mixer; a switch to docked or quitting the app doesn't.
if (!_mixerSwitching && !_shuttingDown && !_quitRequested) RememberMixerShown(false);
+ SyncMixerToggle();
};
_mixerWindow = win;
+ SyncMixerToggle();
_mixer.IsVisible = true; // so the tick loop updates its meters
SetHost(win.Host, _mixer);
diff --git a/src/managed/Nota.App/MainWindow.TransportFit.cs b/src/managed/Nota.App/MainWindow.TransportFit.cs
index e3e39611..e8adc922 100644
--- a/src/managed/Nota.App/MainWindow.TransportFit.cs
+++ b/src/managed/Nota.App/MainWindow.TransportFit.cs
@@ -37,6 +37,7 @@ public partial class MainWindow
new Control[] { RemoteBtn }, // View ▸ Connect Phone…
new Control[] { FollowBtn }, // View ▸ Follow playhead
new Control[] { AutomationToggle }, // ⌘⇧A
+ new Control[] { MixerToggle }, // View ▸ Mixer, ⌘⇧M
new Control[] { TimeSigCell }, // set once per project
new Control[] { RemotePanel }, // MIDI learn (the panel goes with its last chip)
new Control[] { SnapChip }, // the grid; snapping itself stays switchable
diff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axaml
index 144bd6d4..7225195f 100644
--- a/src/managed/Nota.App/MainWindow.axaml
+++ b/src/managed/Nota.App/MainWindow.axaml
@@ -308,8 +308,8 @@
</StackPanel>
<!-- Tools. Each draws the thing it does, so the row carries no prose: a metronome, a
- playhead flag, a magnet, a breakpoint envelope. On is the soft tint (picked);
- none sets Foreground, so the glyph takes the orange ink through
+ playhead flag, a magnet, a breakpoint envelope, faders. On is the soft tint
+ (picked); none sets Foreground, so the glyph takes the orange ink through
ToggleButton:checked. -->
<StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="2" VerticalAlignment="Center" Margin="10,0,0,0">
<Border Classes="tb-sep" Margin="0,0,8,0"/>
@@ -335,6 +335,11 @@
<ToggleButton x:Name="AutomationToggle" Classes="tp-icon" Click="OnToggleAutomation">
<app:Glyph Kind="Automation" Size="16"/>
</ToggleButton>
+ <!-- Mixer: three channel faders. Runs view.mixer like View ▸ Mixer and ⌘⇧M, and reads
+ as on while the Mixer is shown, docked or in its own window (#516). -->
+ <ToggleButton x:Name="MixerToggle" Classes="tp-icon" Click="OnToggleMixerButton">
+ <app:Glyph Kind="Mixer" Size="16"/>
+ </ToggleButton>
<!-- Shown only while a hand-moved control has taken a lane over from
playback (M9-C); one click hands every overridden lane back. -->
<Button x:Name="ReenableAutoBtn" Classes="chip" Content="{app:T 'main.re_enable'}" Margin="6,0,0,0"
diff --git a/src/managed/Nota.Application/Localization/en.json b/src/managed/Nota.Application/Localization/en.json
index 94fb7222..fcae9142 100644
--- a/src/managed/Nota.Application/Localization/en.json
+++ b/src/managed/Nota.Application/Localization/en.json
@@ -2690,6 +2690,7 @@
"main.menu.select_clips_to_copy_to": "Select clips to copy to the session.",
"main.menu.split_at_selection": "Split at selection",
"main.menu.split_clip_s_at_playhead": "Split clip(s) at playhead",
+ "main.menu_keys.show_or_hide_the_mixer": "Show or hide the Mixer (⌘⇧M)",
"main.menu_keys.show_parameter_automation_lanes_a": "Show parameter-automation lanes (⌘⇧A)",
"main.midi_error": "MIDI error: {0}",
"main.midi_import.couldnt_read": "Couldn't read {0}: {1}",