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.

(fix) Quick UI batch: detail panel tabs, plug-in editor toggle, browser folding, track arm on resize (#272)

Egor Khindikaynena82f723bc586
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a45e13f..91b4f427 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,11 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
## [Unreleased]
### Added
+- **Starred versions only** (nota-daw/nota#226): a star button in the History tab's header
+ lists just the versions you starred, newest first. Click it again to see the whole tree.
+- **Fold the browser's Built-in and Plug-ins sections** (nota-daw/nota#230): click a
+ **BUILT-IN** or **PLUG-INS** header in the Instruments, Effects or MIDI tab to collapse
+ it and click again to open it.
- **Type an exact value into any knob, fader or slider** (#240): double-click the control
or its value and type it in the units shown — `1.2k`, `-6`, `12 ms`, `30L`, `1/4`, `off`.
Enter or a click away applies it, Esc cancels, Tab moves to the next value on the card.
@@ -70,6 +75,21 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
**Check now** button. Nothing downloads until you click Update.
### Changed
+- **Detail panel tabs fit the track** (nota-daw/nota#247, nota-daw/nota#246): the **Pattern**
+ tab shows only on a track with a Drum Rack instead of sitting greyed out everywhere else,
+ and the panel can't be resized while **Devices** is shown, because the cards don't grow.
+ **Clip** and **Pattern** stay resizable and keep the height you gave them.
+- **Plug-in card: Open editor toggles** (nota-daw/nota#258): the button reads **Close
+ editor** while the plug-in's window is open and closes it on click. If the window can't
+ be opened, the status bar says so instead of nothing happening.
+- **Convert melody and harmony need the AI model** (nota-daw/nota#233): without the model the
+ clip's **Convert** menu no longer offers them (they used to fall back to a much worse
+ converter without saying so). It offers to download the model instead. Drums and Slice
+ are unchanged.
+- **Platform names for "Reveal in Finder"** (nota-daw/nota#235): the browser menus say **Show
+ in Explorer** on Windows and **Show in file manager** on Linux.
+- **The audio clip editor says why nothing snaps with Warp off** (nota-daw/nota#269): an
+ unwarped clip has no beat grid, and the hint line under the wave now says to turn on Warp.
- **Reset to default is now ⌥-click** (Alt-click on Windows and Linux) on knobs, faders,
sliders and value boxes — double-click types a value instead. The mixer fader no longer
jumps to where you click; drag it like any other control.
@@ -92,6 +112,10 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
`scripts/perf-gate.sh develop` (Linux).
### Fixed
+- **Resizing a track no longer re-arms it** (nota-daw/nota#255): after you disarmed a track (or
+ changed its mute or solo), changing its height brought the old state back.
+- **Buttons no longer have a lighter top edge** (nota-daw/nota#231): the raised highlight sits
+ inside the border instead of over its top line, most visible in Studio Light.
- **Export and freeze use every core again**: since the engine's idle-CPU fix they rendered
on one thread, up to 4x slower. On macOS the engine also no longer wakes every render
thread when a block needs only a few, and a session that overloads one core no longer
diff --git a/FEATURES.md b/FEATURES.md
index af156300..3c91ca4d 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -59,7 +59,8 @@ JUCE module; the engine core is JUCE-free.
- **Version history**: every save records a version inside the project. The browser's
**History** tab draws them as a branching tree (the current one has an orange dot), each
described by what it changed ("Added Bass · Tempo 120.00 → 124.00"); switch
- to any version, open one as a copy, or name, note, star and delete versions. Saving on top
+ to any version, open one as a copy, or name, note, star and delete versions; a star button
+ in the tab's header lists starred versions only. Saving on top
of an older version branches. **Save Version with Note…** (⌥⌘S). The tab's menu deletes all
unnamed versions at once; Settings → Library turns history off (erasing it, after a warning). Versions share their
audio, so each costs only what it adds; **Save As** carries the history along.
@@ -388,7 +389,8 @@ track count and closes with Escape.
- **Audio→MIDI** (right-click an audio clip → Convert). With the **basic-pitch** AI model
installed (Settings → Downloads → AI Models), Melody and Harmony use it instead: every note,
chords included, with velocities from the playing; Melody keeps the strongest note where notes
- overlap. Without it they use the DSP below, and the Convert menu offers the model.
+ overlap. Without the model the Convert menu leaves Melody and Harmony out and offers the
+ model instead (the DSP converters below stay for the AI tools).
- **Convert Melody** — monophonic pitch detection (YIN) → a new Nota Volt track.
- **Convert Harmony** — polyphonic (STFT + spectral peak picking) → chords: overtones,
chorus shimmer and slight detune don't add stray notes, held chords stay whole, and
@@ -920,7 +922,8 @@ audio effects after it keep running and keep their settings; saved with the proj
run on, which comes with the first model and goes with the last. Every asset is pinned to a
URL, size and sha256 in the app; models install into Nota's data folder and run offline.
- **Plugin device card** in two sizes: the small card shows vendor, format, parameter count
- and latency with Open editor and Save preset; the full card adds every parameter as a knob
+ and latency with Open editor (a toggle: Close editor while the window is open; a window
+ that fails to open is reported in the status bar) and Save preset; the full card adds every parameter as a knob
(with filter and pages, the plugin's own value text, double-click for its default) and a
sidechain source where the plugin has one.
- **Loading** into a track or rack chain, with the plugin's **native GUI** (an editor
@@ -1017,6 +1020,9 @@ audio effects after it keep running and keep their settings; saved with the proj
chips keep to one line — whatever does not fit collapses into a **+N** that opens the rest.
- **Context menus**: Projects — Open / Reveal in Finder / Delete (to the Trash, with
confirmation); Files — Show similar sounds / Reveal in Finder; Presets — Reveal in Finder.
+ On Windows and Linux the reveal item reads Show in Explorer / Show in file manager.
+- **Foldable sections**: the BUILT-IN and PLUG-INS headers of the device tabs collapse and
+ expand on click.
- **Hints for empty tabs** — explaining what the tab is and how to add content to it.
---
diff --git a/src/managed/Nota.App/ArrangementView.LaneControl.cs b/src/managed/Nota.App/ArrangementView.LaneControl.cs
index b4a4d87c..e33d3f8a 100644
--- a/src/managed/Nota.App/ArrangementView.LaneControl.cs
+++ b/src/managed/Nota.App/ArrangementView.LaneControl.cs
@@ -1194,11 +1194,19 @@ public sealed partial class ArrangementView
var convert = MenuKit.Item("Convert", GlyphKind.Arrow);
MenuItem ConvItem(string header, ClipConvertMode mode)
=> MenuKit.Item(header, null, () => _o.ConvertClipRequested?.Invoke(trackId, idx, mode));
- convert.Items.Add(ConvItem("Melody to new MIDI track", ClipConvertMode.Melody));
- convert.Items.Add(ConvItem("Harmony to new MIDI track", ClipConvertMode.Harmony));
+ // Melody / Harmony are only offered on the AI model: the DSP fallback's results
+ // are much worse and the user couldn't tell which one ran. Without the model the
+ // menu offers to download it instead (the menu is built on open, so installing
+ // it brings the items back without a restart).
+ bool canTranscribe = _o.CanTranscribe?.Invoke() != false;
+ if (canTranscribe)
+ {
+ convert.Items.Add(ConvItem("Melody to new MIDI track", ClipConvertMode.Melody));
+ convert.Items.Add(ConvItem("Harmony to new MIDI track", ClipConvertMode.Harmony));
+ }
convert.Items.Add(ConvItem("Drums to new MIDI track", ClipConvertMode.Drums));
convert.Items.Add(ConvItem("Slice to new MIDI track", ClipConvertMode.Slice));
- if (_o.CanTranscribe?.Invoke() == false)
+ if (!canTranscribe)
{
convert.Items.Add(new Separator());
convert.Items.Add(MenuKit.Item("Get the AI model for melody and harmony…", null, () => _o.TranscriptionModelRequested?.Invoke()));
diff --git a/src/managed/Nota.App/ArrangementView.cs b/src/managed/Nota.App/ArrangementView.cs
index 03985246..6044b2a6 100644
--- a/src/managed/Nota.App/ArrangementView.cs
+++ b/src/managed/Nota.App/ArrangementView.cs
@@ -1966,8 +1966,8 @@ public sealed partial class ArrangementView : UserControl
VerticalAlignment = VerticalAlignment.Center,
Children =
{
- ChipToggle("M", t.Muted, NotaPalette.Mute, v => _engine?.SetTrackMute(t.Id, v)),
- ChipToggle("S", t.Soloed, NotaPalette.Solo, v => _engine?.SetTrackSolo(t.Id, v)),
+ ChipToggle("M", t.Muted, NotaPalette.Mute, v => { t.Muted = v; _engine?.SetTrackMute(t.Id, v); }),
+ ChipToggle("S", t.Soloed, NotaPalette.Solo, v => { t.Soloed = v; _engine?.SetTrackSolo(t.Id, v); }),
},
};
@@ -2062,12 +2062,14 @@ public sealed partial class ArrangementView : UserControl
// Row 2: M / S / ● (record-arm) — 18×16 chips.
var btnRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 3, Margin = new Thickness(0, 5, 0, 0) };
- btnRow.Children.Add(ChipToggle("M", t.Muted, NotaPalette.Mute, v => _engine?.SetTrackMute(t.Id, v)));
- btnRow.Children.Add(ChipToggle("S", t.Soloed, NotaPalette.Solo, v => _engine?.SetTrackSolo(t.Id, v)));
+ // Each toggle also writes the TrackVM: resizing a row rebuilds its card from the VM
+ // without re-reading the engine, and a stale VM put the old state back (#255).
+ btnRow.Children.Add(ChipToggle("M", t.Muted, NotaPalette.Mute, v => { t.Muted = v; _engine?.SetTrackMute(t.Id, v); }));
+ btnRow.Children.Add(ChipToggle("S", t.Soloed, NotaPalette.Solo, v => { t.Soloed = v; _engine?.SetTrackSolo(t.Id, v); }));
// Record-arm applies to instrument (MIDI capture) + audio (input capture) tracks;
// return and group tracks have no input, so they get no arm chip.
if (!t.IsReturn && !t.IsGroup)
- btnRow.Children.Add(ArmToggle(t.Armed, v => _engine?.SetTrackArmed(t.Id, v)));
+ btnRow.Children.Add(ArmToggle(t.Armed, v => { t.Armed = v; _engine?.SetTrackArmed(t.Id, v); }));
// A compact routing selector sits with the arm button (the standard row leaves no
// room for a 4th row): audio tracks get record-input, instrument tracks get "MIDI To".
diff --git a/src/managed/Nota.App/AudioClipEditorView.cs b/src/managed/Nota.App/AudioClipEditorView.cs
index 76e48319..8b3935f5 100644
--- a/src/managed/Nota.App/AudioClipEditorView.cs
+++ b/src/managed/Nota.App/AudioClipEditorView.cs
@@ -295,6 +295,7 @@ public sealed class AudioClipEditorView : UserControl
_syncWarp();
_warpModeText.Text = WarpModes[_warpMode];
_warpModeText.Foreground = _warpEnabled ? NotaPalette.TextPrimary : NotaPalette.TextDisabled;
+ PaintHint();
if (ai.SampleId != 0 && _engine.TryGetSampleInfo(ai.SampleId, out var si) && si.SampleRate > 0)
{
double secs = si.Frames / si.SampleRate;
@@ -499,12 +500,17 @@ public sealed class AudioClipEditorView : UserControl
LoadEnvelope();
}
- private void PaintHint() => _hint.Text = _mode switch
+ private void PaintHint()
{
- 1 => "Click — point · drag — move · right-click — delete",
- 2 => "Drag a handle · double-click — reset",
- _ => "Double-click the wave — marker · drag — align",
- };
+ _hint.Text = _mode switch
+ {
+ 1 => "Click — point · drag — move · right-click — delete",
+ 2 => "Drag a handle · double-click — reset",
+ // An unwarped clip has no beat grid, so nothing in Sample mode snaps (#269).
+ _ when !_warpEnabled => "Snap needs Warp — turn on Warp to see the grid and snap to it",
+ _ => "Double-click the wave — marker · drag — align",
+ };
+ }
// Loads the active target's envelope into the waveform with its value axis.
private void LoadEnvelope()
diff --git a/src/managed/Nota.App/BrowserView.cs b/src/managed/Nota.App/BrowserView.cs
index 6a193f98..91e5bda7 100644
--- a/src/managed/Nota.App/BrowserView.cs
+++ b/src/managed/Nota.App/BrowserView.cs
@@ -712,13 +712,23 @@ public sealed class BrowserView : UserControl
// A section header: caption, a hairline filling the gap, and the section's count.
private Control GroupRow(BrowserItem item)
{
+ // Device tabs' BUILT-IN / PLUG-INS headers fold their section on click (#230); a
+ // header without a key (other tabs) stays plain chrome.
+ bool foldable = item.Path.Length > 0;
var label = new TextBlock
{
Text = NotaText.Label(item.Name),
Classes = { "GroupLabel" },
VerticalAlignment = VerticalAlignment.Center,
- Margin = new Thickness(10, 0, 0, 0),
};
+ var head = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4, Margin = new Thickness(foldable ? 6 : 10, 0, 0, 0) };
+ if (foldable)
+ {
+ var caret = new Glyph(item.IsExpanded ? GlyphKind.CaretDown : GlyphKind.CaretRight, 10) { VerticalAlignment = VerticalAlignment.Center };
+ caret.BindResource(Glyph.ForegroundProperty, "Brush.TextTertiary");
+ head.Children.Add(caret);
+ }
+ head.Children.Add(label);
var rule = new Border { Height = 1, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(7, 0, 7, 0) };
rule.BindResource(Border.BackgroundProperty, "Brush.Rule");
var count = new TextBlock
@@ -731,12 +741,23 @@ public sealed class BrowserView : UserControl
count.Classes.Add("Mono");
count.BindResource(TextBlock.ForegroundProperty, "Brush.TextDisabled");
- var grid = new Grid { Height = GroupRowH, ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") };
- grid.Children.Add(label);
+ var grid = new Grid { Height = GroupRowH, ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), Background = Brushes.Transparent };
+ grid.Children.Add(head);
Grid.SetColumn(rule, 1);
grid.Children.Add(rule);
Grid.SetColumn(count, 2);
grid.Children.Add(count);
+ if (foldable)
+ {
+ grid.Cursor = new Cursor(StandardCursorType.Hand);
+ ToolTip.SetTip(grid, item.IsExpanded ? "Collapse" : "Expand");
+ grid.PointerPressed += (_, e) =>
+ {
+ if (!e.GetCurrentPoint(grid).Properties.IsLeftButtonPressed) return;
+ e.Handled = true;
+ _vm?.ToggleSection(item);
+ };
+ }
return grid;
}
@@ -1538,7 +1559,7 @@ public sealed class BrowserView : UserControl
{
var similar = new MenuItem { Header = "Show similar sounds" };
similar.Click += (_, _) => ShowSimilar(item);
- var reveal = new MenuItem { Header = "Reveal in Finder" };
+ var reveal = new MenuItem { Header = MenuKit.RevealLabel };
reveal.Click += (_, _) => RevealRequested?.Invoke(item);
flyout.Items.Add(similar);
flyout.Items.Add(reveal);
@@ -1550,7 +1571,7 @@ public sealed class BrowserView : UserControl
// carry a scheme instead of a path and have nothing to reveal.
case BrowserItemKind.Preset when System.IO.Path.IsPathRooted(item.Path):
{
- var reveal = new MenuItem { Header = "Reveal in Finder" };
+ var reveal = new MenuItem { Header = MenuKit.RevealLabel };
reveal.Click += (_, _) => RevealRequested?.Invoke(item);
flyout.Items.Add(reveal);
return flyout;
@@ -1560,7 +1581,7 @@ public sealed class BrowserView : UserControl
var multi = new MenuItem { Header = "Create multisample…" };
multi.Click += (_, _) => CreateMultisampleRequested?.Invoke(item);
ToolTip.SetTip(multi, "Map the folder's samples by their names into Nota Mosaic presets");
- var reveal = new MenuItem { Header = "Reveal in Finder" };
+ var reveal = new MenuItem { Header = MenuKit.RevealLabel };
reveal.Click += (_, _) => RevealRequested?.Invoke(item);
flyout.Items.Add(multi);
flyout.Items.Add(reveal);
@@ -1570,7 +1591,7 @@ public sealed class BrowserView : UserControl
{
var open = new MenuItem { Header = "Open" };
open.Click += (_, _) => ItemActivated?.Invoke(item, KeyModifiers.None);
- var reveal = new MenuItem { Header = "Reveal in Finder" };
+ var reveal = new MenuItem { Header = MenuKit.RevealLabel };
reveal.Click += (_, _) => RevealRequested?.Invoke(item);
var del = MenuKit.Danger("Delete…", GlyphKind.Trash, () => DeleteProjectRequested?.Invoke(item));
flyout.Items.Add(open);
diff --git a/src/managed/Nota.App/DeviceCards/DeviceCardContext.cs b/src/managed/Nota.App/DeviceCards/DeviceCardContext.cs
index bea60a73..2a900c0c 100644
--- a/src/managed/Nota.App/DeviceCards/DeviceCardContext.cs
+++ b/src/managed/Nota.App/DeviceCards/DeviceCardContext.cs
@@ -28,7 +28,8 @@ internal sealed class DeviceCardContext(
Action requestRebuild,
Action<int> requestRackPresetSave,
Action hideDropGlow,
- IFactoryPresets? factory = null)
+ IFactoryPresets? factory = null,
+ Action<string>? status = null)
{
public IAudioEngine Engine => engine;
public int TrackId => trackId;
@@ -74,4 +75,8 @@ internal sealed class DeviceCardContext(
/// <summary>Hide the panel-wide drag glow (a per-chain / per-pad target owns the highlight).</summary>
public void HideDropGlow() => hideDropGlow();
+
+ /// <summary>Show a one-line message in the app's status bar (e.g. a plug-in window that
+ /// failed to open). A no-op where the card isn't hosted by the chain view.</summary>
+ public void Status(string message) => status?.Invoke(message);
}
diff --git a/src/managed/Nota.App/DeviceCards/PluginCard.cs b/src/managed/Nota.App/DeviceCards/PluginCard.cs
index a3dec74c..95177ffe 100644
--- a/src/managed/Nota.App/DeviceCards/PluginCard.cs
+++ b/src/managed/Nota.App/DeviceCards/PluginCard.cs
@@ -98,9 +98,33 @@ internal static class PluginCard
Fact(facts, 0, "Params", pc.ToString(NotaNum.Culture));
Fact(facts, 1, "Latency", $"{ms.ToString("0.0", NotaNum.Culture)}\u2009ms");
+ // Open editor toggles the plug-in's own window. Its close button only hides the
+ // window behind our back, so the label re-reads the state whenever the pointer comes
+ // back to the card instead of trusting the last click.
var open = ActionButton("Open editor", GlyphKind.PopOut, primary: true);
- ToolTip.SetTip(open, "Open the plug-in's own window");
- open.Click += (_, _) => { try { e.OpenPluginEditor(t, di); } catch { /* no editor */ } };
+ var openLabel = (TextBlock)((StackPanel)open.Content!).Children[1];
+ void SyncOpen()
+ {
+ bool shown = EditorOpen(e, t, di);
+ openLabel.Text = shown ? "Close editor" : "Open editor";
+ ToolTip.SetTip(open, shown ? "Close the plug-in's own window" : "Open the plug-in's own window");
+ }
+ SyncOpen();
+ open.PointerEntered += (_, _) => SyncOpen();
+ open.Click += (_, _) =>
+ {
+ try
+ {
+ if (EditorOpen(e, t, di)) e.ClosePluginEditor(t, di);
+ else
+ {
+ e.OpenPluginEditor(t, di);
+ if (!EditorOpen(e, t, di)) ctx.Status($"Couldn't open the {info.Name} window.");
+ }
+ }
+ catch (Exception ex) { ctx.Status($"Couldn't open the {info.Name} window: {ex.Message}"); }
+ SyncOpen();
+ };
var save = ActionButton("Save preset", GlyphKind.Save, primary: false);
ToolTip.SetTip(save, "Save the plug-in's state as a preset");
save.Click += (_, _) => ctx.RequestPresetSave(di);
@@ -155,6 +179,12 @@ internal static class PluginCard
},
};
+ private static bool EditorOpen(IAudioEngine e, int t, int di)
+ {
+ try { return e.PluginEditorIsOpen(t, di); }
+ catch { return false; } // the device is gone (the card is about to rebuild)
+ }
+
private static Button ActionButton(string text, GlyphKind glyph, bool primary)
{
var b = new Button
diff --git a/src/managed/Nota.App/DeviceChainView.cs b/src/managed/Nota.App/DeviceChainView.cs
index 4ad3bf2a..d73c0a14 100644
--- a/src/managed/Nota.App/DeviceChainView.cs
+++ b/src/managed/Nota.App/DeviceChainView.cs
@@ -217,7 +217,8 @@ public sealed partial class DeviceChainView : UserControl
Rebuild,
c => RackPresetSaveRequested?.Invoke(c),
ClearDropHints,
- _factory);
+ _factory,
+ s => StatusMessage?.Invoke(s));
// ---- instrument / sends / add ----------------------------------------
diff --git a/src/managed/Nota.App/HistoryView.cs b/src/managed/Nota.App/HistoryView.cs
index a14d0e35..2609c0d2 100644
--- a/src/managed/Nota.App/HistoryView.cs
+++ b/src/managed/Nota.App/HistoryView.cs
@@ -55,6 +55,13 @@ internal sealed class HistoryView : UserControl
Classes = { "ghost" }, Width = 22, Height = 22, Padding = new Thickness(0), Margin = new Thickness(6, 0, 0, 0),
Content = new Glyph(GlyphKind.Options, 16),
};
+ // Starred only (#226): the same toggle the other browser tabs have for favourites.
+ private readonly Button _starredOnly = new()
+ {
+ Classes = { "ghost" }, Width = 22, Height = 22, Padding = new Thickness(0), Margin = new Thickness(6, 0, 0, 0),
+ Content = new Glyph(GlyphKind.Star, 14),
+ };
+ private bool _onlyStarred;
private ProjectHistoryState _state = ProjectHistoryState.Empty;
private Dictionary<string, int> _numbers = new(); // version id -> 1-based number in save order
private string? _dir;
@@ -66,12 +73,16 @@ internal sealed class HistoryView : UserControl
var caption = new TextBlock { Text = "Versions", Classes = { "GroupLabel" }, VerticalAlignment = VerticalAlignment.Center };
_summary.BindResource(TextBlock.ForegroundProperty, "Brush.TextTertiary");
- var header = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Height = RowH, Margin = new Thickness(10, 8, 6, 4) };
+ var header = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto"), Height = RowH, Margin = new Thickness(10, 8, 6, 4) };
header.Children.Add(caption);
Grid.SetColumn(_summary, 1);
header.Children.Add(_summary);
- Grid.SetColumn(_options, 2);
+ Grid.SetColumn(_starredOnly, 2);
+ header.Children.Add(_starredOnly);
+ Grid.SetColumn(_options, 3);
header.Children.Add(_options);
+ _starredOnly.Click += (_, _) => { _onlyStarred = !_onlyStarred; Refresh(); };
+ PaintStarredOnly();
_options.Click += (_, _) => BuildOptionsMenu().ShowAt(_options);
((Glyph)_options.Content!).BindResource(Glyph.ForegroundProperty, "Brush.TextTertiary");
ToolTip.SetTip(_options, "Clean up the history");
@@ -123,7 +134,14 @@ internal sealed class HistoryView : UserControl
}
_numbers = _state.Versions.Select((v, i) => (v.Id, i)).ToDictionary(x => x.Id, x => x.i + 1);
- var rows = HistoryGraph.Layout(_state);
+ var all = HistoryGraph.Layout(_state);
+ // Starred only drops the tree: the versions between two starred ones are hidden, so
+ // the lanes would join nothing. Each starred version is a plain dot, newest first.
+ IReadOnlyList<HistoryRow> rows = _onlyStarred
+ ? all.Where(r => r.Version.Starred)
+ .Select(r => r with { Lane = 0, Through = [], Joins = [], FromAbove = false, ToBelow = false, LaneCount = 1 })
+ .ToList()
+ : all;
_list.ItemsSource = rows;
_list.SelectedItem = rows.FirstOrDefault(r => r.Version.Id == keep);
ShowDetails(_list.SelectedItem as HistoryRow);
@@ -131,21 +149,33 @@ internal sealed class HistoryView : UserControl
_empty.Text = problem
?? (_dir is null ? "Save the project to start its history."
: !_host.KeepVersionHistory && rows.Count == 0 ? "Version history is turned off in Settings."
- : rows.Count == 0 ? "Each save adds a version here." : "");
+ : all.Count == 0 ? "Each save adds a version here."
+ : rows.Count == 0 ? "No starred versions yet. Right-click a version and choose Star." : "");
_empty.IsVisible = _empty.Text.Length > 0;
ToolTip.SetTip(_empty, problem is null ? null : "Its versions can't be listed until the file .history/versions.json is repaired.");
- _options.IsVisible = rows.Count > 1;
- if (rows.Count == 0 || _dir is null) _summary.Text = "";
+ _options.IsVisible = all.Count > 1;
+ _starredOnly.IsVisible = all.Count > 0;
+ PaintStarredOnly();
+ if (all.Count == 0 || _dir is null) _summary.Text = "";
else
{
long size = 0;
try { size = _history.Size(_dir).HistoryOnly; } catch (Exception ex) when (ex is System.IO.IOException or UnauthorizedAccessException) { }
- _summary.Text = $"{rows.Count} · {NotaNum.Bytes(size)}";
- ToolTip.SetTip(_summary, $"{rows.Count} version{(rows.Count == 1 ? "" : "s")} · older versions take {NotaNum.Bytes(size)} on disk");
+ _summary.Text = $"{all.Count} · {NotaNum.Bytes(size)}";
+ ToolTip.SetTip(_summary, $"{all.Count} version{(all.Count == 1 ? "" : "s")} · older versions take {NotaNum.Bytes(size)} on disk");
}
}
+ // Lit (accent star) while only starred versions are listed.
+ private void PaintStarredOnly()
+ {
+ var g = (Glyph)_starredOnly.Content!;
+ g.Kind = _onlyStarred ? GlyphKind.StarFilled : GlyphKind.Star;
+ g.BindResource(Glyph.ForegroundProperty, _onlyStarred ? "Brush.Accent" : "Brush.TextTertiary");
+ ToolTip.SetTip(_starredOnly, _onlyStarred ? "Show all versions" : "Show starred versions only");
+ }
+
// --- rows ----------------------------------------------------------------
private Control Row(HistoryRow row)
diff --git a/src/managed/Nota.App/MainWindow.Detail.cs b/src/managed/Nota.App/MainWindow.Detail.cs
index 62f13026..97adcab2 100644
--- a/src/managed/Nota.App/MainWindow.Detail.cs
+++ b/src/managed/Nota.App/MainWindow.Detail.cs
@@ -127,14 +127,16 @@ public partial class MainWindow
// GridSplitter above it, so this just sets the initial/default height per mode).
// honorPersist: the Clip tab restores the user's dragged height; the Devices tab always
// snaps back to its natural card-fitting height, so switching to Devices resets it and
- // switching back to Clip restores the persisted size.
- private void ShowDetail(double height, bool honorPersist)
+ // switching back to Clip restores the persisted size. The Devices tab also can't be
+ // resized at all (no splitter): its cards have a fixed layout, so extra height is wasted
+ // and less clips them.
+ private void ShowDetail(double height, bool honorPersist, bool resizable = true)
{
var row = BodyGrid.RowDefinitions[2];
row.MinHeight = 120;
double h = honorPersist && _detailHeight > 120 ? _detailHeight : height;
row.Height = new GridLength(h);
- DetailSplitter.IsVisible = true;
+ DetailSplitter.IsVisible = resizable;
DetailPanel.IsVisible = true;
}
@@ -206,6 +208,16 @@ public partial class MainWindow
? _clipEditor is not null || SessionAudioEditorOpen
: SelectedClip(out _, out _, out _);
DetailPatternBtn.IsEnabled = PatternTarget(out _, out _, out _);
+ // Pattern only means something on a Drum Rack track, so elsewhere the tab is hidden
+ // rather than greyed out. A step grid left on screen by a track that lost its rack
+ // (or a selection that moved off it) hands the panel back to Devices.
+ int contextTrack = _session?.IsVisible == true && _sessionSlotTrack > 0 ? _sessionSlotTrack
+ : _deviceChain is { TrackId: > 0 } dc ? dc.TrackId
+ : Timeline.SelectedTrackId;
+ bool drumRack = IsDrumRackTrack(contextTrack);
+ DetailPatternBtn.IsVisible = drumRack;
+ if (!drumRack && !DetailFloating && DetailPanel.IsVisible && DetailBody.Content is DrumPatternView)
+ ShowDevices(contextTrack);
}
// --- Detail · Pattern (Drum Rack step grid) -----------------------------
@@ -354,7 +366,7 @@ public partial class MainWindow
DetailClipBtn.IsChecked = false;
// Devices: exactly the cards' height — the 1px seam, the 32px toolbar, the chain inset
// above and below a card. Nothing floats under the chain.
- ShowDetail(1 + 32 + 2 * DeviceChainView.ChainInset + DeviceCardKit.CardH, honorPersist: false);
+ ShowDetail(1 + 32 + 2 * DeviceChainView.ChainInset + DeviceCardKit.CardH, honorPersist: false, resizable: false);
}
// Double-click on a MIDI clip: that clip — or, when it is one of two or more selected MIDI
diff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axaml
index 67066992..bf3b0830 100644
--- a/src/managed/Nota.App/MainWindow.axaml
+++ b/src/managed/Nota.App/MainWindow.axaml
@@ -482,7 +482,7 @@
<Border Classes="segmented" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" Spacing="1">
<ToggleButton x:Name="DetailDevicesBtn" Classes="seg" Content="Devices" Click="OnDetailDevices"/>
- <ToggleButton x:Name="DetailPatternBtn" Classes="seg" Content="Pattern" IsEnabled="False"
+ <ToggleButton x:Name="DetailPatternBtn" Classes="seg" Content="Pattern" IsEnabled="False" IsVisible="False"
ToolTip.Tip="Step the selected MIDI clip on a Drum Rack track"
Click="OnDetailPattern"/>
<ToggleButton x:Name="DetailClipBtn" Classes="seg" Content="Clip" IsEnabled="False"
diff --git a/src/managed/Nota.App/MainWindow.axaml.cs b/src/managed/Nota.App/MainWindow.axaml.cs
index 34b78350..cc196ea2 100644
--- a/src/managed/Nota.App/MainWindow.axaml.cs
+++ b/src/managed/Nota.App/MainWindow.axaml.cs
@@ -409,7 +409,7 @@ public partial class MainWindow : Window
_deviceChain = new DeviceChainView(vm.Engine, _factory, App.Services.GetService<IPluginCatalog>(), _kits, App.Services.GetService<IMosaicPacks>());
InitMosaic();
// A pad added / removed / renamed in the Drum Rack card changes the pattern grid's rows.
- _deviceChain.Changed += () => { Timeline.Refresh(); _patternView?.Reload(); if (_modular?.IsVisible == true) _modular.Refresh(); };
+ _deviceChain.Changed += () => { Timeline.Refresh(); _patternView?.Reload(); SyncClipTab(); if (_modular?.IsVisible == true) _modular.Refresh(); };
_deviceChain.DevicesRemapped += Timeline.RemapAutoTargets;
_deviceChain.PresetSaveRequested += OnSavePreset;
_deviceChain.RackPresetSaveRequested += OnSaveRackChainPreset;
diff --git a/src/managed/Nota.App/MenuKit.cs b/src/managed/Nota.App/MenuKit.cs
index f2a83820..f8bc79ac 100644
--- a/src/managed/Nota.App/MenuKit.cs
+++ b/src/managed/Nota.App/MenuKit.cs
@@ -23,6 +23,14 @@ namespace Nota.App;
internal static partial class MenuKit
{
+ /// <summary>The "show this file in the OS file manager" label, in each platform's own
+ /// wording (pairs with <c>MainWindow.RevealInFileManager</c>). Menus use this instead of
+ /// hard-coding "Finder".</summary>
+ public static string RevealLabel =>
+ OperatingSystem.IsMacOS() ? "Reveal in Finder"
+ : OperatingSystem.IsWindows() ? "Show in Explorer"
+ : "Show in file manager";
+
private static KeyModifiers Primary => OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
/// <summary>⌘ + key on macOS, Ctrl + key elsewhere.</summary>
diff --git a/src/managed/Nota.App/Theme/NotaTheme.axaml b/src/managed/Nota.App/Theme/NotaTheme.axaml
index fff5da97..39839108 100644
--- a/src/managed/Nota.App/Theme/NotaTheme.axaml
+++ b/src/managed/Nota.App/Theme/NotaTheme.axaml
@@ -302,7 +302,10 @@
RecognizesAccessKey="True"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+ <!-- Inset by the border so the highlight sits inside the face, under the 1px
+ border, instead of painting over its top edge (#231: a lighter top border). -->
<Border x:Name="PART_Lift" CornerRadius="{TemplateBinding CornerRadius}"
+ Margin="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource Shadow.Raised}" IsHitTestVisible="False"/>
</Panel>
</ControlTemplate>
@@ -390,7 +393,10 @@
RecognizesAccessKey="True"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+ <!-- Inset by the border so the highlight sits inside the face, under the 1px
+ border, instead of painting over its top edge (#231: a lighter top border). -->
<Border x:Name="PART_Lift" CornerRadius="{TemplateBinding CornerRadius}"
+ Margin="{TemplateBinding BorderThickness}"
BoxShadow="{DynamicResource Shadow.Raised}" IsHitTestVisible="False"/>
</Panel>
</ControlTemplate>
diff --git a/src/managed/Nota.Application/Engine/IAudioEngine.cs b/src/managed/Nota.Application/Engine/IAudioEngine.cs
index 70cbf6cb..619e1f93 100644
--- a/src/managed/Nota.Application/Engine/IAudioEngine.cs
+++ b/src/managed/Nota.Application/Engine/IAudioEngine.cs
@@ -592,6 +592,8 @@ public interface IAudioEngine : IDisposable
bool DeviceSidechainTapPre(int trackId, int deviceIndex);
void OpenPluginEditor(int trackId, int deviceIndex);
void ClosePluginEditor(int trackId, int deviceIndex);
+ /// <summary>Whether the plugin's editor window is on screen (false when it failed to open).</summary>
+ bool PluginEditorIsOpen(int trackId, int deviceIndex);
byte[] GetPluginState(int trackId, int deviceIndex);
void SetPluginState(int trackId, int deviceIndex, byte[] data);
void SetDeviceBypassed(int trackId, int deviceIndex, bool bypassed);
diff --git a/src/managed/Nota.Infrastructure/Interop/NativeMethods.Devices.cs b/src/managed/Nota.Infrastructure/Interop/NativeMethods.Devices.cs
index 413092eb..5301cf6d 100644
--- a/src/managed/Nota.Infrastructure/Interop/NativeMethods.Devices.cs
+++ b/src/managed/Nota.Infrastructure/Interop/NativeMethods.Devices.cs
@@ -187,6 +187,9 @@ internal static partial class NativeMethods
[LibraryImport(Lib, EntryPoint = "nota_plugin_close_editor")]
internal static partial NotaResult PluginCloseEditor(IntPtr engine, int trackId, int deviceIndex);
+ [LibraryImport(Lib, EntryPoint = "nota_plugin_editor_is_open")]
+ internal static partial int PluginEditorIsOpen(IntPtr engine, int trackId, int deviceIndex);
+
[LibraryImport(Lib, EntryPoint = "nota_plugin_get_state")]
internal static partial int PluginGetState(IntPtr engine, int trackId, int deviceIndex,
[Out] byte[]? outBuffer, int capacity);
diff --git a/src/managed/Nota.Infrastructure/Interop/NotaEngine.Devices.cs b/src/managed/Nota.Infrastructure/Interop/NotaEngine.Devices.cs
index 028f33a2..59dc7513 100644
--- a/src/managed/Nota.Infrastructure/Interop/NotaEngine.Devices.cs
+++ b/src/managed/Nota.Infrastructure/Interop/NotaEngine.Devices.cs
@@ -213,6 +213,13 @@ public sealed partial class NotaEngine
Check(NativeMethods.PluginCloseEditor(_handle, trackId, deviceIndex));
}
+ /// <summary>Whether a hosted plugin's native GUI is on screen.</summary>
+ public bool PluginEditorIsOpen(int trackId, int deviceIndex)
+ {
+ ThrowIfDisposed();
+ return NativeMethods.PluginEditorIsOpen(_handle, trackId, deviceIndex) != 0;
+ }
+
/// <summary>Reads a hosted plugin's opaque state blob (for project save). Empty for built-ins.</summary>
public byte[] GetPluginState(int trackId, int deviceIndex)
{
diff --git a/src/managed/Nota.Presentation/ViewModels/BrowserViewModel.cs b/src/managed/Nota.Presentation/ViewModels/BrowserViewModel.cs
index b572f451..7237b02c 100644
--- a/src/managed/Nota.Presentation/ViewModels/BrowserViewModel.cs
+++ b/src/managed/Nota.Presentation/ViewModels/BrowserViewModel.cs
@@ -476,6 +476,17 @@ public sealed partial class BrowserViewModel : ObservableObject
private static bool Holds(BrowserItem node, BrowserItem item)
=> node.Children.Any(c => c == item || Holds(c, item));
+ // BUILT-IN / PLUG-INS sections the user collapsed, keyed "tab:SECTION" (#230). Session-only.
+ private readonly HashSet<string> _collapsedSections = new();
+
+ /// <summary>Collapses or expands a BUILT-IN / PLUG-INS section header of a device tab.</summary>
+ public void ToggleSection(BrowserItem header)
+ {
+ if (!header.IsGroup || header.Path.Length == 0) return;
+ if (!_collapsedSections.Remove(header.Path)) _collapsedSections.Add(header.Path);
+ if (int.TryParse(header.Path.AsSpan(0, header.Path.IndexOf(':')), out int tab)) RebuildVisible(tab);
+ }
+
/// <summary>Sets the live search query for a tree tab (0 = Instruments, 1 = FX,
/// 2 = MIDI, 3 = Files, 4 = Presets) and refreshes its visible list.</summary>
public void FilterTree(int tab, string query)
@@ -517,6 +528,7 @@ public sealed partial class BrowserViewModel : ObservableObject
}
string section = "";
+ bool collapsed = false;
foreach (var node in devices)
{
if (_groupBySource)
@@ -525,13 +537,18 @@ public sealed partial class BrowserViewModel : ObservableObject
if (s != section)
{
section = s;
+ string key = $"{tab}:{s}";
+ collapsed = _collapsedSections.Contains(key);
dst.Add(new BrowserItem
{
Name = s,
Kind = BrowserItemKind.Group,
+ Path = key,
+ IsExpanded = !collapsed,
GroupCount = devices.Count(d => (d.IsPlugin ? "PLUG-INS" : "BUILT-IN") == s),
});
}
+ if (collapsed) continue; // a collapsed section keeps only its header
}
dst.Add(node);
// No query: presets follow only while the device is expanded. With a query, a
diff --git a/src/native/nota.engine/include/nota/nota_engine.h b/src/native/nota.engine/include/nota/nota_engine.h
index 197d1cce..67301008 100644
--- a/src/native/nota.engine/include/nota/nota_engine.h
+++ b/src/native/nota.engine/include/nota/nota_engine.h
@@ -1706,6 +1706,9 @@ NOTA_API float nota_rackdev_live_selector(const NotaEngine* engine, int32_
* the chain. No-op for built-in instruments. Call from the UI/main thread. */
NOTA_API NotaResult nota_plugin_open_editor(NotaEngine* engine, int32_t track_id, int32_t device_index);
NOTA_API NotaResult nota_plugin_close_editor(NotaEngine* engine, int32_t track_id, int32_t device_index);
+/* 1 while the plugin's editor window is on screen, else 0 (never opened, hidden by its close
+ * button, failed to open, or not a hosted plugin). Call from the UI/main thread. */
+NOTA_API int32_t nota_plugin_editor_is_open(const NotaEngine* engine, int32_t track_id, int32_t device_index);
/* Opaque plugin state (M3-5, FR-36), for project save/restore. get writes up to
* `capacity` bytes into `out` (pass out=NULL to query the size) and returns the
diff --git a/src/native/nota.engine/pluginhost/hosting/PluginEditorWindow.h b/src/native/nota.engine/pluginhost/hosting/PluginEditorWindow.h
index 886872db..9bd7acc8 100644
--- a/src/native/nota.engine/pluginhost/hosting/PluginEditorWindow.h
+++ b/src/native/nota.engine/pluginhost/hosting/PluginEditorWindow.h
@@ -62,6 +62,7 @@ struct EditorHost {
void open(juce::AudioPluginInstance& p);
void close();
+ bool isOpen() const { return window != nullptr && window->isVisible(); }
};
} // namespace hosting
diff --git a/src/native/nota.engine/pluginhost/hosting/PluginEffect.h b/src/native/nota.engine/pluginhost/hosting/PluginEffect.h
index cddc4962..078c746b 100644
--- a/src/native/nota.engine/pluginhost/hosting/PluginEffect.h
+++ b/src/native/nota.engine/pluginhost/hosting/PluginEffect.h
@@ -39,6 +39,7 @@ class PluginEffect : public nota::Device, private juce::AudioProcessorListener {
void openEditor() override;
void closeEditor() override;
+ bool editorOpen() const override { return editor_.isOpen(); }
std::vector<uint8_t> getState() const override;
void setState(const uint8_t* data, int32_t size) override;
diff --git a/src/native/nota.engine/pluginhost/hosting/PluginInstrument.h b/src/native/nota.engine/pluginhost/hosting/PluginInstrument.h
index 10340f08..e8ede033 100644
--- a/src/native/nota.engine/pluginhost/hosting/PluginInstrument.h
+++ b/src/native/nota.engine/pluginhost/hosting/PluginInstrument.h
@@ -46,6 +46,7 @@ class PluginInstrument : public nota::Instrument, private juce::AudioProcessorLi
void openEditor() override;
void closeEditor() override;
+ bool editorOpen() const override { return editor_.isOpen(); }
std::vector<uint8_t> getState() const override;
void setState(const uint8_t* data, int32_t size) override;
diff --git a/src/native/nota.engine/src/abi/nota_engine_device.cpp b/src/native/nota.engine/src/abi/nota_engine_device.cpp
index 5c5a1b87..a47c51ab 100644
--- a/src/native/nota.engine/src/abi/nota_engine_device.cpp
+++ b/src/native/nota.engine/src/abi/nota_engine_device.cpp
@@ -402,6 +402,9 @@ NotaResult nota_plugin_close_editor(NotaEngine* e, int32_t track_id, int32_t dev
ENG(e)->closeTrackEditor(track_id, device_index);
return NOTA_OK;
}
+int32_t nota_plugin_editor_is_open(const NotaEngine* e, int32_t track_id, int32_t device_index) {
+ return (e && CENG(e)->trackEditorOpen(track_id, device_index)) ? 1 : 0;
+}
int32_t nota_plugin_get_state(
const NotaEngine* e, int32_t track_id, int32_t device_index, uint8_t* out, int32_t capacity) {
return e ? CENG(e)->getPluginState(track_id, device_index, out, capacity) : 0;
diff --git a/src/native/nota.engine/src/devices/Device.h b/src/native/nota.engine/src/devices/Device.h
index cd5fa566..8058b03a 100644
--- a/src/native/nota.engine/src/devices/Device.h
+++ b/src/native/nota.engine/src/devices/Device.h
@@ -39,6 +39,7 @@ class Device {
// Native editor GUI (M3-4). Message thread only.
virtual void openEditor() {}
virtual void closeEditor() {}
+ virtual bool editorOpen() const { return false; }
// Opaque plugin state (M3-5), for project save/restore. Message thread only.
virtual std::vector<uint8_t> getState() const { return {}; }
diff --git a/src/native/nota.engine/src/devices/Instrument.h b/src/native/nota.engine/src/devices/Instrument.h
index b3c022f9..bf232651 100644
--- a/src/native/nota.engine/src/devices/Instrument.h
+++ b/src/native/nota.engine/src/devices/Instrument.h
@@ -147,6 +147,8 @@ class Instrument {
// open/hide their editor window. Must be called on the message thread.
virtual void openEditor() {}
virtual void closeEditor() {}
+ // Whether the editor window is on screen (hidden by its close button counts as closed).
+ virtual bool editorOpen() const { return false; }
// Opaque plugin state (M3-5), for project save/restore. Empty for built-ins.
// Message thread only.
diff --git a/src/native/nota.engine/src/engine/Engine.h b/src/native/nota.engine/src/engine/Engine.h
index 6918ba87..fa2ebabd 100644
--- a/src/native/nota.engine/src/engine/Engine.h
+++ b/src/native/nota.engine/src/engine/Engine.h
@@ -763,6 +763,7 @@ class Engine {
// otherwise the effect at that chain position. Message thread only.
void openTrackEditor(int32_t trackId, int32_t deviceIndex);
void closeTrackEditor(int32_t trackId, int32_t deviceIndex);
+ bool trackEditorOpen(int32_t trackId, int32_t deviceIndex) const;
// Plugin state (M3-5). getPluginState writes up to `cap` bytes into `out`
// (pass out=null to query size) and returns the full state size.
int32_t getPluginState(int32_t trackId, int32_t deviceIndex, uint8_t* out, int32_t cap) const;
diff --git a/src/native/nota.engine/src/engine/Engine_Devices.cpp b/src/native/nota.engine/src/engine/Engine_Devices.cpp
index 009f15ee..92b84993 100644
--- a/src/native/nota.engine/src/engine/Engine_Devices.cpp
+++ b/src/native/nota.engine/src/engine/Engine_Devices.cpp
@@ -1119,6 +1119,15 @@ void Engine::closeTrackEditor(int32_t trackId, int32_t deviceIndex) {
}
}
+bool Engine::trackEditorOpen(int32_t trackId, int32_t deviceIndex) const {
+ auto t = findTrackAuthoring(trackId);
+ if (!t) return false;
+ if (deviceIndex < 0) return t->instrument && t->instrument->editorOpen();
+ if (deviceIndex < static_cast<int32_t>(t->devices.size()) && t->devices[deviceIndex])
+ return t->devices[deviceIndex]->editorOpen();
+ return false;
+}
+
int32_t Engine::getPluginState(int32_t trackId, int32_t deviceIndex, uint8_t* out, int32_t cap) const {
auto t = findTrackAuthoring(trackId);
if (!t) return 0;