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.

(style) Update main window view

Egor Khindikaynen07f7ae3a5157
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84cfa793..98632c6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,16 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
Internet Sharing on the Mac) gets an instant, radio-free link — Nota notices the cable,
puts its address in the QR and marks the phone "USB" in the list.
+### Changed
+- **A cleaner main window.** The project's name now leads the transport bar. In the
+ arrangement, tracks inside a group step their colour stripe in under it, so nesting reads
+ at a glance; the Overview strip is slimmer and calmer (a thin line per track, a neutral
+ viewport frame); Overview, Sections and the ruler are set apart by clear rules; and the
+ horizontal scrollbar is a slim pill. Audio clips draw their waveform as spaced bars —
+ **Settings → Appearance → Waveform** brings back the solid look. The Devices panel is now
+ an island like the browser and the arrangement, and the status line sits on the window
+ ground without a bar.
+
### Fixed
- A note pressed and released within a few milliseconds (a very quick tap, a fast MIDI roll)
could keep ringing: its release was played ahead of its press.
diff --git a/DESIGN.md b/DESIGN.md
index 8427c0ed..8117821c 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -379,21 +379,23 @@ filterable knob grid (and the sidechain source when it has a bus). Rhythm moved
## Shell
```
-┌ header 36 ─ project name, centred ─────────────────────────────────────┐
-│ transport 60 ─ view switch · console · tempo · signature · grid · … CPU│
+┌ header 36 ─ "Nota", centred ───────────────────────────────────────────┐
+│ transport 60 ─ project · view switch · console · tempo · … CPU│
├─────────────┬──────────────────────────────────────────────────────────┤
│ browser │ canvas (arrangement · session · modular) │
├─────────────┴──────────────────────────────────────────────────────────┤
-└ status 22 ─────────────────────────────────────────────────────────────┘
+│ detail 32 + cards ─ Devices · Pattern · Clip · track · Freeze · ⧉ × │
+└ status 22 ─ plain text on the gutter ──────────────────────────────────┘
```
-- **Header 36** — frameless; macOS traffic lights in a left inset, the project name
- (`Heading`) centred; Windows reserves 180 px for the caption buttons.
+- **Header 36** — frameless; macOS traffic lights in a left inset, "Nota" (`Heading`)
+ centred — the project's name lives in the transport; Windows reserves 180 px for the
+ caption buttons.
- **Transport 60, under the header** — an island like the browser and the canvas
(`Border.transport`: Well, hairline, radius 6, 12 px from the window edges). Stop / play /
record, position and loop share the console, one 42 recess on Void inside it
(`Border.console`); the view switch and the master well sit on Card. It reads left to
- right: view switch (Arrangement · Session · Modular) · the console · tempo `120.00`,
+ right: the project name (13 semibold, Ink 1) · view switch (Arrangement · Session · Modular) · the console · tempo `120.00`,
signature, grid · the switches (metronome, follow, snap, automation) — then, pinned right,
MIDI, CPU and master. Buttons are 28, Play 40; Play is raised at rest and solid brass only
while the transport runs. There is no add-track button — tracks come from the browser.
@@ -402,10 +404,24 @@ filterable knob grid (and the sidechain source when it has a bus). Rhythm moved
- **Body** — the browser on the left and the canvas float as panels on `Gutter` with 12 px
gaps; the canvas is always sunken relative to panels. The splitter is a transparent grab
strip inside the gap.
+- **Detail panel** — the third island: Panel ground, hairline, radius 6, 12 px from the
+ window edges and from the canvas above. Header 32: the mode segments, the track (8 px
+ colour square, name 12 semibold, Ink 5 routing summary), outlined 22 px Freeze /
+ Live Freeze, a hairline, then pop-out and close as ghost icons.
+- **Status 22** — one line of `Caption` text straight on the gutter, no bar and no rule,
+ aligned 16 px in.
- **List rows** are 26 and one line: a colour dot or bar, the name, mono metadata right.
- **Arrangement:** track rows 64 (the header carries every control), group rows 26 (open to
64 while selected), header column 228, default zoom 28 px per beat. Every y ↔ row
- conversion goes through `ArrangementView.RowTop` / `RowAtY`.
+ conversion goes through `ArrangementView.RowTop` / `RowAtY`. A group's rows step their
+ 3 px colour spine 10 px further in per level (`GroupIndent`), the name just past it.
+ Above the tracks: Overview 34 (one 2 px line per clip row at a 3.4 px pitch, track
+ colour at 60 %; the viewport an Ink 4 frame over a 5 % lift — no brass, no scrim),
+ Sections 22, Zoom + ruler 24. Overview and the ruler end on `BorderDefault`, Sections on
+ a `Hairline`. The horizontal scrollbar is a 12 px well under a hairline with a 5 px pill
+ (`ThinScrollBar`: Border Strong, Ink 5 when hot). Audio clips draw their waveform as
+ spaced bars by default — a 1 px stroke every 3 px, mirrored about the centre;
+ Settings → Appearance → Waveform switches to Solid (a column per pixel).
- **Clip editor** (MIDI and audio share one frame, `ClipEditorKit`): header 38 whose first
232 is the clip cell (3 px track-colour bar, name, mono kind badge), modes as shell
segments after it; inspector 232 on the left, sections split by hairlines and ending in
diff --git a/src/managed/Nota.App/ArrangementView.LaneControl.cs b/src/managed/Nota.App/ArrangementView.LaneControl.cs
index 96eedf4a..c2a747c3 100644
--- a/src/managed/Nota.App/ArrangementView.LaneControl.cs
+++ b/src/managed/Nota.App/ArrangementView.LaneControl.cs
@@ -1591,23 +1591,58 @@ public sealed partial class ArrangementView
double vx0 = Math.Max(r.X, 0), vx1 = Math.Min(r.Right, Bounds.Width);
var geo = new StreamGeometry();
using (var g = geo.Open())
- for (double px = vx0; px < vx1; px += 1)
+ ForEachWaveColumn(r.X, vx0, vx1, (cx0, cx1, x) =>
{
- // Material point under this column, anchored to the committed window.
- double s0 = _rpS0 + (scroll + px / ppb - _origStart) * rate;
- double s1 = _rpS0 + (scroll + (px + 1) / ppb - _origStart) * rate;
+ // Material span under this column, anchored to the committed window.
+ double s0 = _rpS0 + (scroll + cx0 / ppb - _origStart) * rate;
+ double s1 = _rpS0 + (scroll + cx1 / ppb - _origStart) * rate;
double f0 = Math.Clamp(s0 / _rpMTotal, 0, 1), f1 = Math.Clamp(s1 / _rpMTotal, 0, 1);
int b0 = Math.Clamp((int)(f0 * _rpCount), 0, _rpCount - 1);
int b1 = Math.Clamp((int)Math.Ceiling(f1 * _rpCount), b0 + 1, _rpCount);
float min = 1f, max = -1f;
for (int b = b0; b < b1; b++) { min = Math.Min(min, _rpPeaks![b * 2]); max = Math.Max(max, _rpPeaks[b * 2 + 1]); }
- if (min > max) continue;
+ if (min > max) return;
min = Math.Clamp(min * gain, -1f, 1f); max = Math.Clamp(max * gain, -1f, 1f);
- AddRect(g, px, mid - max * amp, 1, Math.Max(1, (max - min) * amp));
- }
+ AddWaveColumn(g, x, mid, amp, min, max);
+ });
ctx.DrawGeometry(brush, null, geo);
}
+ // Bars: one 1px stroke every BarPitch px, laid on a grid anchored to the clip's left
+ // edge (so the strokes travel with the clip instead of shimmering while it scrolls),
+ // each summarising the whole pitch it stands for. Solid: one column per pixel.
+ private const double BarPitch = 3;
+
+ private void ForEachWaveColumn(double clipX, double vx0, double vx1, Action<double, double, double> column)
+ {
+ if (_o.Waveform == WaveformStyle.Solid)
+ {
+ for (double px = vx0; px < vx1; px += 1) column(px, px + 1, px);
+ return;
+ }
+ double k0 = Math.Floor((vx0 - clipX) / BarPitch);
+ for (double cx = clipX + k0 * BarPitch; cx < vx1; cx += BarPitch)
+ {
+ double c0 = Math.Max(cx, clipX), c1 = cx + BarPitch;
+ double x = cx + 1; // the stroke sits in the middle pixel of its pitch
+ if (x < vx0 || x >= vx1) continue;
+ column(c0, c1, x);
+ }
+ }
+
+ // Solid keeps the true min/max outline; Bars mirror the larger excursion about the
+ // centre line, so each stroke reads as one level.
+ private void AddWaveColumn(StreamGeometryContext g, double x, double mid, double amp, float min, float max)
+ {
+ if (_o.Waveform == WaveformStyle.Solid)
+ {
+ AddRect(g, x, mid - max * amp, 1, Math.Max(1, (max - min) * amp));
+ return;
+ }
+ double a = Math.Max(Math.Abs(min), Math.Abs(max)) * amp;
+ AddRect(g, x, mid - a, 1, Math.Max(1, 2 * a));
+ }
+
private void DrawWaveform(DrawingContext ctx, ClipVM c, Rect r, IBrush brush)
{
// While resizing THIS clip, show the real audio revealed/hidden by the drag.
@@ -1620,27 +1655,26 @@ public sealed partial class ArrangementView
if (c.Peaks is null || c.PeakCount <= 0 || r.Height <= 0 || r.Width <= 0) return;
double mid = r.Y + r.Height / 2;
double amp = r.Height / 2 - 1;
- // Draw one contiguous column per visible pixel, aggregating the peak buckets
- // that fall in it. This keeps the waveform solid on wide/zoomed clips instead
- // of leaving gaps between sparse fixed-position bars.
+ // One column per stroke (see ForEachWaveColumn), aggregating every peak bucket that
+ // falls in the span it stands for, so nothing between strokes is skipped.
double vx0 = Math.Max(r.X, 0), vx1 = Math.Min(r.Right, Bounds.Width);
var adsr = c.Adsr.Fit(c.LengthBeats);
bool shaped = !adsr.IsIdentity;
var geo = new StreamGeometry();
using (var gc = geo.Open())
- for (double px = vx0; px < vx1; px += 1)
+ ForEachWaveColumn(r.X, vx0, vx1, (cx0, cx1, x) =>
{
- int b0 = Math.Clamp((int)((px - r.X) / r.Width * c.PeakCount), 0, c.PeakCount - 1);
- int b1 = Math.Clamp((int)Math.Ceiling((px + 1 - r.X) / r.Width * c.PeakCount), b0 + 1, c.PeakCount);
+ int b0 = Math.Clamp((int)((cx0 - r.X) / r.Width * c.PeakCount), 0, c.PeakCount - 1);
+ int b1 = Math.Clamp((int)Math.Ceiling((cx1 - r.X) / r.Width * c.PeakCount), b0 + 1, c.PeakCount);
float min = 1f, max = -1f;
for (int b = b0; b < b1; b++) { min = Math.Min(min, c.Peaks[b * 2]); max = Math.Max(max, c.Peaks[b * 2 + 1]); }
- if (min > max) continue;
+ if (min > max) return;
// Clip gain (and the ADSR shape) scales the drawn waveform, matching the clip editor.
float g = c.Gain;
- if (shaped) g *= (float)adsr.GainAt((px + 0.5 - r.X) / r.Width * c.LengthBeats, c.LengthBeats);
+ if (shaped) g *= (float)adsr.GainAt((x + 0.5 - r.X) / r.Width * c.LengthBeats, c.LengthBeats);
min = Math.Clamp(min * g, -1f, 1f); max = Math.Clamp(max * g, -1f, 1f);
- AddRect(gc, px, mid - max * amp, 1, Math.Max(1, (max - min) * amp));
- }
+ AddWaveColumn(gc, x, mid, amp, min, max);
+ });
ctx.DrawGeometry(brush, null, geo);
}
diff --git a/src/managed/Nota.App/ArrangementView.Overview.cs b/src/managed/Nota.App/ArrangementView.Overview.cs
index fcd75b53..e7f3783e 100644
--- a/src/managed/Nota.App/ArrangementView.Overview.cs
+++ b/src/managed/Nota.App/ArrangementView.Overview.cs
@@ -2,8 +2,8 @@
// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
//
// Arrangement · Overview — the strip above the ruler. It maps the whole
-// project onto one narrow band (a mini-clip per clip, in its track colour) and draws the
-// current viewport as a brass window over it, so the visible span is readable at a glance
+// project onto one narrow band (a hairline per clip, one line per track, in its track
+// colour) and draws the current viewport as a quiet frame over it, so the visible span is readable at a glance
// and reachable with one gesture: drag the window to scroll, drag its edges (or drag
// vertically) to zoom, click anywhere to jump there.
@@ -20,7 +20,7 @@ namespace Nota.App;
public sealed partial class ArrangementView
{
- private const double OverviewH = 46;
+ private const double OverviewH = 34;
private readonly OverviewControl _overview;
private Border _overviewRow = null!;
@@ -42,30 +42,33 @@ public sealed partial class ArrangementView
}
// The strip row: the same header-column chrome as the ruler row (label + visible-range
- // readout), then the strip itself over the lane column.
+ // readout on one line), then the strip itself over the lane column.
private Border BuildOverviewRow()
{
var label = new TextBlock
{
Text = "OVERVIEW", Classes = { "SectionLabel" },
- HorizontalAlignment = HorizontalAlignment.Left,
+ VerticalAlignment = VerticalAlignment.Center,
};
_overviewRange = new TextBlock
{
- Text = "", FontSize = 10,
- HorizontalAlignment = HorizontalAlignment.Left,
+ Text = "", FontSize = 9,
+ VerticalAlignment = VerticalAlignment.Center,
};
_overviewRange.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");
- _overviewRange.BindResource(TextBlock.ForegroundProperty, "Brush.TextTertiary");
+ _overviewRange.BindResource(TextBlock.ForegroundProperty, "Brush.TextDisabled");
var labels = new StackPanel
{
- Spacing = 3, VerticalAlignment = VerticalAlignment.Center,
- Margin = new Thickness(8, 0, 0, 0),
+ Orientation = Orientation.Horizontal, Spacing = 8,
+ VerticalAlignment = VerticalAlignment.Center,
+ Margin = new Thickness(14, 0, 0, 0),
Children = { label, _overviewRange },
};
var grid = new Grid { Height = OverviewH, ColumnDefinitions = new ColumnDefinitions("Auto,*") };
- grid.Children.Add(HeaderPanel(labels));
+ var header = HeaderPanel(labels);
+ header.BindResource(Border.BackgroundProperty, "Brush.BgSunken"); // the strip is a well, header included
+ grid.Children.Add(header);
Grid.SetColumn(_overview, 1);
grid.Children.Add(_overview);
@@ -132,12 +135,10 @@ public sealed partial class ArrangementView
private sealed class OverviewControl : Control
{
- // Outside the viewport window the project is dimmed, so the window itself reads as
- // the lit part rather than needing a fill of its own.
- private static readonly IBrush OvScrim = NotaPalette.Wash(NotaPalette.BgSunken, 0x9C);
- private static readonly IPen OvFrame = new Pen(NotaPalette.Wash(NotaPalette.Accent, 0x99), 1);
- private static readonly IBrush OvHandle = NotaPalette.Wash(NotaPalette.AccentBright, 0xCC);
- private static readonly IPen OvBarPen = new Pen(NotaPalette.Wash(NotaPalette.GridBar, 0xC0), 1);
+ // The viewport window is a neutral frame with a faint lift — brass stays reserved for
+ // the playhead and the loop, so the strip reads at a glance without a second accent.
+ private static readonly IPen OvFrame = new Pen(NotaPalette.TextMuted, 1);
+ private static readonly IBrush OvWindow = NotaPalette.Wash(NotaPalette.TextPrimary, 0x0D);
private static readonly IBrush OvEmptyText = NotaPalette.TextDisabled;
private static readonly Cursor HandCursor = new(StandardCursorType.Hand);
private static readonly Cursor EdgeCursor = new(StandardCursorType.SizeWestEast);
@@ -149,13 +150,15 @@ public sealed partial class ArrangementView
{
var cache = active ? _ovClip : _ovClipOff;
if (cache.TryGetValue(colorIndex, out var b)) return b;
- b = ClipTint(colorIndex, active ? 0.82 : 0.26);
+ b = ClipTint(colorIndex, active ? 0.6 : 0.22);
cache[colorIndex] = b;
return b;
}
private const double EdgeGrab = 5; // px around a window edge that grabs it
- private const double PadY = 4;
+ private const double PadY = 5;
+ private const double LineH = 2; // one hairline per clip
+ private const double LineStride = 3.4; // track-to-track pitch; tightens when the rows don't fit
private const double AxisLock = 4; // px of travel that commits a drag to one axis
@@ -293,16 +296,6 @@ public sealed partial class ArrangementView
ctx.FillRectangle(ChromeBg, new Rect(0, 0, w, h));
double span = SpanBeats;
- double bpb = Math.Max(1, _o._beatsPerBar);
-
- // Bar markers at whatever multiple of a bar keeps them ~40px apart.
- double step = bpb;
- while (step / span * w < 40 && step < span) step *= 2;
- for (double b = step; b < span; b += step)
- {
- double x = Math.Round(b / span * w) + 0.5;
- ctx.DrawLine(OvBarPen, new Point(x, 0), new Point(x, h));
- }
int n = _o._tracks.Count;
if (n == 0)
@@ -313,17 +306,23 @@ public sealed partial class ArrangementView
}
else
{
- // One band per arrangement row, in row order — the strip reads as the
- // arrangement seen from far away.
- double rowH = (h - 2 * PadY) / n;
- double bandH = Math.Max(1.5, rowH - (rowH > 3 ? 1 : 0));
+ // One hairline per row that holds clips, in row order — the strip reads as the
+ // arrangement seen from far away. An open group's row is skipped (its children
+ // follow with their own lines); a collapsed one stands in for them. Rows keep a
+ // fixed pitch and squeeze together only when the strip can't hold them all.
+ int lines = 0;
+ for (int i = 0; i < n; i++)
+ if (!_o._tracks[i].IsGroup || _o._collapsed.Contains(_o._tracks[i].Id)) lines++;
+ double rowH = Math.Min(LineStride, (h - 2 * PadY - LineH) / Math.Max(1, lines - 1));
+ double bandH = Math.Min(LineH, Math.Max(1, rowH - 0.6));
+ int line = 0;
for (int i = 0; i < n; i++)
{
var t = _o._tracks[i];
- double y = PadY + i * rowH;
- // A group row carries no clips of its own — draw the descendants it
- // summarises, so a collapsed group still shows its content here.
- if (t.IsGroup)
+ bool collapsedGroup = t.IsGroup && _o._collapsed.Contains(t.Id);
+ if (t.IsGroup && !collapsedGroup) continue;
+ double y = PadY + line++ * rowH;
+ if (collapsedGroup)
{
foreach (var m in t.GroupMini)
DrawMini(ctx, m.Start, m.Length, m.ColorIndex, true, y, bandH, span, w);
@@ -336,18 +335,13 @@ public sealed partial class ArrangementView
}
}
- // Everything outside the viewport is dimmed; the window gets a brass frame with
- // two solid grab edges.
+ // The viewport window: a neutral frame over a faint lift (its edges still grab).
double x0 = BeatToX(_o._scrollBeats), x1 = BeatToX(_o._scrollBeats + _o.ViewportBeats);
// Keep the window at least 2px wide, and never past the right end (a 2px window
// at the very end is pushed left, not clamped to nothing).
x0 = Math.Clamp(x0, 0, Math.Max(0, w - 2));
x1 = Math.Clamp(x1, x0 + 2, Math.Max(x0 + 2, w));
- if (x0 > 0) ctx.FillRectangle(OvScrim, new Rect(0, 0, x0, h));
- if (x1 < w) ctx.FillRectangle(OvScrim, new Rect(x1, 0, w - x1, h));
- ctx.DrawRectangle(null, OvFrame, new Rect(x0 + 0.5, 0.5, Math.Max(1, x1 - x0 - 1), h - 1));
- ctx.FillRectangle(OvHandle, new Rect(x0, 0, 2, h));
- ctx.FillRectangle(OvHandle, new Rect(x1 - 2, 0, 2, h));
+ ctx.DrawRectangle(OvWindow, OvFrame, new Rect(x0 + 0.5, 2.5, Math.Max(1, x1 - x0 - 1), h - 5), 2, 2);
// Loop region: a thin brass band along the top edge (the ruler owns the full
// brace). Drawn over the scrim — a loop outside the viewport still has to show.
@@ -369,8 +363,8 @@ public sealed partial class ArrangementView
double x0 = startBeat / span * w;
double x1 = (startBeat + lengthBeats) / span * w;
if (x1 < 0 || x0 > w) return;
- ctx.FillRectangle(MiniFill(colorIndex, active),
- new Rect(Math.Max(0, x0), y, Math.Max(1.5, Math.Min(w, x1) - Math.Max(0, x0)), bandH));
+ ctx.DrawRectangle(MiniFill(colorIndex, active), null,
+ new RoundedRect(new Rect(Math.Max(0, x0), y, Math.Max(1.5, Math.Min(w, x1) - Math.Max(0, x0)), bandH), bandH / 2));
}
}
}
diff --git a/src/managed/Nota.App/ArrangementView.Sections.cs b/src/managed/Nota.App/ArrangementView.Sections.cs
index d7645a58..833db60c 100644
--- a/src/managed/Nota.App/ArrangementView.Sections.cs
+++ b/src/managed/Nota.App/ArrangementView.Sections.cs
@@ -65,8 +65,10 @@ public sealed partial class ArrangementView
Grid.SetColumn(_sectionsLane, 1);
grid.Children.Add(_sectionsLane);
+ // A hairline, lighter than the lines above and below: the sections belong with the
+ // ruler under them, while Overview and the tracks are separate areas.
var row = new Border { BorderThickness = new Thickness(0, 0, 0, 1), Child = grid };
- row.BindResource(Border.BorderBrushProperty, "Brush.BorderDefault");
+ row.BindResource(Border.BorderBrushProperty, "Brush.Hairline");
return row;
}
diff --git a/src/managed/Nota.App/ArrangementView.cs b/src/managed/Nota.App/ArrangementView.cs
index 5f0f1b40..24fb052d 100644
--- a/src/managed/Nota.App/ArrangementView.cs
+++ b/src/managed/Nota.App/ArrangementView.cs
@@ -27,6 +27,9 @@ public enum NewTrackKind { Instrument, Audio, Return }
/// <summary>How much of the arrangement names its clips (View ▸ Clip names).</summary>
public enum ClipLabelMode { Every, RunStart, None }
+/// <summary>How audio clips draw their waveform: spaced peak strokes, or a solid column per pixel.</summary>
+public enum WaveformStyle { Bars, Solid }
+
public sealed partial class ArrangementView : UserControl
{
// --- coordinate model / shared state ---
@@ -160,7 +163,7 @@ public sealed partial class ArrangementView : UserControl
// surface underneath (which is static during playback). See SetPlayhead / Redraw.
private readonly LaneOverlayControl _overlay;
private readonly Canvas _headers;
- private readonly ScrollBar _hScroll;
+ private readonly ThinScrollBar _hScroll;
// The vertical scroller wrapping [headers | lanes]; its offset/viewport drive row culling
// in LaneControl.Render so off-screen tracks skip their clip/waveform work.
private ScrollViewer _scroller = null!;
@@ -255,12 +258,7 @@ public sealed partial class ArrangementView : UserControl
// tall as the tracks, so instruments dropped in the empty space beneath them
// (the natural "make a new track" gesture) would otherwise miss.
_headers = new Canvas { Width = HeaderW, VerticalAlignment = VerticalAlignment.Top };
- _hScroll = new ScrollBar
- {
- Orientation = Orientation.Horizontal,
- Minimum = 0,
- AllowAutoHide = false,
- };
+ _hScroll = new ThinScrollBar();
_hScroll.Scroll += (_, _) => { _scrollBeats = _hScroll.Value; Redraw(); };
// Keep the scroll range in sync with the visible width — outside the
// render pass (mutating controls during Render() is illegal / crashes).
@@ -283,10 +281,14 @@ public sealed partial class ArrangementView : UserControl
},
};
var topLeft = HeaderPanel(zoomBar);
- var top = new Grid { Height = RulerH, ColumnDefinitions = new ColumnDefinitions("Auto,*") };
- top.Children.Add(topLeft);
+ var topGrid = new Grid { Height = RulerH, ColumnDefinitions = new ColumnDefinitions("Auto,*") };
+ topGrid.Children.Add(topLeft);
Grid.SetColumn(_ruler, 1);
- top.Children.Add(_ruler);
+ topGrid.Children.Add(_ruler);
+ // The chrome stack (Overview · Sections · Zoom) ends on a full-width line, so the
+ // tracks start under a clear edge rather than straight off the ruler.
+ var top = new Border { BorderThickness = new Thickness(0, 0, 0, 1), Child = topGrid };
+ top.BindResource(Border.BorderBrushProperty, "Brush.BorderDefault");
// Above the ruler: the Overview strip (whole project + a draggable viewport window),
// then the Sections lane — song structure sits directly over the bar numbers it names.
@@ -371,11 +373,16 @@ public sealed partial class ArrangementView : UserControl
DragDrop.AddDragLeaveHandler(_footer, (_, _) => SetFooterDropRow(-1));
DragDrop.AddDropHandler(_footer, OnFooterDrop);
- // Bottom: horizontal scrollbar under the lanes.
- var bottom = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") };
- bottom.Children.Add(HeaderPanel(null));
+ // Bottom: a thin horizontal scrollbar under the lanes, on the well, past a hairline.
+ var bottomGrid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") };
+ var bottomLeft = HeaderPanel(null);
+ bottomLeft.BindResource(Border.BackgroundProperty, "Brush.BgSunken");
+ bottomGrid.Children.Add(bottomLeft);
Grid.SetColumn(_hScroll, 1);
- bottom.Children.Add(_hScroll);
+ bottomGrid.Children.Add(_hScroll);
+ var bottom = new Border { BorderThickness = new Thickness(0, 1, 0, 0), Child = bottomGrid };
+ bottom.BindResource(Border.BackgroundProperty, "Brush.BgSunken");
+ bottom.BindResource(Border.BorderBrushProperty, "Brush.Hairline");
var root = new DockPanel();
DockPanel.SetDock(_overviewRow, Dock.Top);
@@ -437,6 +444,13 @@ public sealed partial class ArrangementView : UserControl
set { if (_clipLabels == value) return; _clipLabels = value; _lanes.InvalidateVisual(); }
}
private ClipLabelMode _clipLabels = ClipLabelMode.RunStart;
+ /// <summary>Audio-clip waveform style (Settings → Appearance).</summary>
+ public WaveformStyle Waveform
+ {
+ get => _waveform;
+ set { if (_waveform == value) return; _waveform = value; _lanes.InvalidateVisual(); }
+ }
+ private WaveformStyle _waveform = WaveformStyle.Bars;
/// <summary>Show/edit parameter-automation envelopes over the lanes (M9-A3).</summary>
public bool AutomationMode
{
@@ -1589,18 +1603,14 @@ public sealed partial class ArrangementView : UserControl
// A group keeps its level readable at 26px as a 2px rail under the title.
var meter = new MeterBar(horizontal: true) { Height = 4, MinWidth = 0 };
_meters[t.Id] = meter;
- var body = new DockPanel { LastChildFill = true, Margin = new Thickness(8 + t.Depth * 14, 0, 8, 0) };
+ var body = new DockPanel { LastChildFill = true, Margin = new Thickness(8, 0, 8, 0) };
DockPanel.SetDock(meter, Dock.Bottom);
meter.Margin = new Thickness(0, 0, 0, 3);
body.Children.Add(meter);
body.Children.Add(row);
var spine = new Border { Width = 3, Background = spineBrush };
- var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("3,*") };
- Grid.SetColumn(spine, 0);
- Grid.SetColumn(body, 1);
- grid.Children.Add(spine);
- grid.Children.Add(body);
+ var grid = SpineGrid(t.Depth, spine, body);
var card = new Border
{
@@ -1738,20 +1748,16 @@ public sealed partial class ArrangementView : UserControl
volRow.Children.Add(pan);
// Indent nested rows so the group hierarchy reads at a glance.
- var stack = new StackPanel { Margin = new Thickness(8 + t.Depth * 14, 6, 8, 6), Children = { nameRow, row2, volRow } };
+ var stack = new StackPanel { Margin = new Thickness(8, 6, 8, 6), Children = { nameRow, row2, volRow } };
var meter = new MeterBar { VerticalAlignment = VerticalAlignment.Stretch, Width = 8, Margin = new Thickness(0, 6, 3, 6) };
_meters[t.Id] = meter;
DockPanel.SetDock(meter, Dock.Right);
var body = new DockPanel { LastChildFill = true, Children = { meter, stack } };
- // 3px track-colour spine on the left edge.
+ // 3px track-colour spine on the left edge, stepped in under its group.
var spine = new Border { Width = 3, Background = spineBrush };
- var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("3,*") };
- Grid.SetColumn(spine, 0);
- Grid.SetColumn(body, 1);
- grid.Children.Add(spine);
- grid.Children.Add(body);
+ var grid = SpineGrid(t.Depth, spine, body);
var card = new Border
{
@@ -1772,6 +1778,30 @@ public sealed partial class ArrangementView : UserControl
return card;
}
+ // Nesting reads from the spine: a group's rows carry their colour spine one step
+ // (GroupIndent) further in than the group's own, so the hierarchy shows as a staircase
+ // of stripes while the names keep their place just past the stripe.
+ private const double GroupIndent = 10;
+
+ private static Grid SpineGrid(int depth, Border spine, Control body)
+ {
+ double indent = Math.Max(0, depth) * GroupIndent;
+ var grid = new Grid
+ {
+ ColumnDefinitions =
+ {
+ new ColumnDefinition(indent, GridUnitType.Pixel),
+ new ColumnDefinition(3, GridUnitType.Pixel),
+ new ColumnDefinition(1, GridUnitType.Star),
+ },
+ };
+ Grid.SetColumn(spine, 1);
+ Grid.SetColumn(body, 2);
+ grid.Children.Add(spine);
+ grid.Children.Add(body);
+ return grid;
+ }
+
// Select / reorder / context-menu gestures shared by a full track card and a slim group bar.
private void AttachHeaderGestures(Border card, TrackVM t)
{
diff --git a/src/managed/Nota.App/Controls/ThinScrollBar.cs b/src/managed/Nota.App/Controls/ThinScrollBar.cs
new file mode 100644
index 00000000..3a58f28d
--- /dev/null
+++ b/src/managed/Nota.App/Controls/ThinScrollBar.cs
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
+//
+// The arrangement's horizontal scrollbar: a 5px pill on a bare track, no arrows. It
+// keeps the ScrollBar members the arrangement drives (Maximum / ViewportSize / Value and
+// a Scroll event raised for user moves only), so the timeline treats it as a drop-in.
+// Drag the pill to scroll; press the track elsewhere to centre the pill there and keep
+// dragging. Colour is the only state: Border Strong at rest, Ink 5 under the pointer or
+// while dragging.
+
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Media;
+
+namespace Nota.App;
+
+internal sealed class ThinScrollBar : Control
+{
+ private static readonly IBrush ThumbRest = NotaPalette.BorderStrong;
+ private static readonly IBrush ThumbHot = NotaPalette.TextTertiary;
+
+ private const double PadX = 4; // inset of the track from both ends
+ private const double ThumbH = 5;
+ private const double MinThumbW = 24;
+
+ private double _max, _viewport, _value;
+ private bool _hot, _dragging;
+ private double _grabDx; // pointer offset inside the pill at press
+
+ /// <summary>Raised when the user moves the pill (not for programmatic Value changes).</summary>
+ public event EventHandler? Scroll;
+
+ public double Maximum
+ {
+ get => _max;
+ set { _max = Math.Max(0, value); _value = Math.Clamp(_value, 0, _max); InvalidateVisual(); }
+ }
+
+ public double ViewportSize
+ {
+ get => _viewport;
+ set { _viewport = Math.Max(0, value); InvalidateVisual(); }
+ }
+
+ public double Value
+ {
+ get => _value;
+ set { _value = Math.Clamp(value, 0, _max); InvalidateVisual(); }
+ }
+
+ public ThinScrollBar()
+ {
+ Height = 12;
+ ClipToBounds = true;
+ }
+
+ private (double x, double w) Thumb()
+ {
+ double track = Math.Max(0, Bounds.Width - 2 * PadX);
+ double total = _max + _viewport;
+ double w = total > 0 ? track * _viewport / total : track;
+ w = Math.Clamp(w, Math.Min(MinThumbW, track), track);
+ double x = PadX + (_max > 0 ? (track - w) * _value / _max : 0);
+ return (x, w);
+ }
+
+ private void MoveTo(double thumbX)
+ {
+ double track = Math.Max(0, Bounds.Width - 2 * PadX);
+ var (_, w) = Thumb();
+ double room = track - w;
+ double v = room > 0 ? (thumbX - PadX) / room * _max : 0;
+ v = Math.Clamp(v, 0, _max);
+ if (Math.Abs(v - _value) < 1e-9) return;
+ _value = v;
+ InvalidateVisual();
+ Scroll?.Invoke(this, EventArgs.Empty);
+ }
+
+ protected override void OnPointerPressed(PointerPressedEventArgs e)
+ {
+ if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed || _max <= 0) return;
+ double px = e.GetPosition(this).X;
+ var (x, w) = Thumb();
+ if (px < x || px > x + w)
+ {
+ // Off the pill: jump so the pill centres on the press, then drag from its middle.
+ MoveTo(px - w / 2);
+ (x, w) = Thumb();
+ }
+ _grabDx = px - x;
+ _dragging = true;
+ e.Pointer.Capture(this);
+ e.Handled = true;
+ InvalidateVisual();
+ }
+
+ protected override void OnPointerMoved(PointerEventArgs e)
+ {
+ double px = e.GetPosition(this).X;
+ if (_dragging) { MoveTo(px - _grabDx); return; }
+ var (x, w) = Thumb();
+ bool hot = px >= x && px <= x + w;
+ if (hot != _hot) { _hot = hot; InvalidateVisual(); }
+ }
+
+ protected override void OnPointerReleased(PointerReleasedEventArgs e)
+ {
+ if (!_dragging) return;
+ _dragging = false;
+ e.Pointer.Capture(null);
+ InvalidateVisual();
+ }
+
+ protected override void OnPointerExited(PointerEventArgs e)
+ {
+ if (_hot) { _hot = false; InvalidateVisual(); }
+ }
+
+ public override void Render(DrawingContext ctx)
+ {
+ ctx.FillRectangle(Brushes.Transparent, new Rect(Bounds.Size)); // the whole track takes presses
+ if (Bounds.Width <= 2 * PadX) return;
+ var (x, w) = Thumb();
+ double y = Math.Round((Bounds.Height - ThumbH) / 2);
+ ctx.DrawRectangle(_hot || _dragging ? ThumbHot : ThumbRest, null,
+ new RoundedRect(new Rect(x, y, w, ThumbH), ThumbH / 2));
+ }
+}
diff --git a/src/managed/Nota.App/MainWindow.Detail.cs b/src/managed/Nota.App/MainWindow.Detail.cs
index 0e1002f2..416a89b8 100644
--- a/src/managed/Nota.App/MainWindow.Detail.cs
+++ b/src/managed/Nota.App/MainWindow.Detail.cs
@@ -65,9 +65,9 @@ public partial class MainWindow
_chipKey = key;
var dot = new Rectangle { Width = 8, Height = 8, RadiusX = 2, RadiusY = 2, Fill = TrackBrush(trackId), VerticalAlignment = VerticalAlignment.Center };
- var nameText = new TextBlock { Text = name, FontSize = 11, FontWeight = FontWeight.SemiBold, Foreground = NotaPalette.TextPrimary, VerticalAlignment = VerticalAlignment.Center };
+ var nameText = new TextBlock { Text = name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = NotaPalette.TextPrimary, VerticalAlignment = VerticalAlignment.Center };
var sumText = new TextBlock { Text = summary, Classes = { "Caption" }, VerticalAlignment = VerticalAlignment.Center };
- DetailChipHost.Content = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center, Children = { dot, nameText, sumText } };
+ DetailChipHost.Content = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, VerticalAlignment = VerticalAlignment.Center, Children = { dot, nameText, sumText } };
}
private bool ChipTrackInfo(int trackId, out NotaTrackInfo info)
@@ -342,7 +342,7 @@ public partial class MainWindow
DetailDevicesBtn.IsChecked = true;
DetailPatternBtn.IsChecked = false;
DetailClipBtn.IsChecked = false;
- ShowDetail(320, honorPersist: false); // Devices: natural card-fitting height
+ ShowDetail(332, honorPersist: false); // Devices: natural card-fitting height (island: +12 gutter under it)
}
private void OpenClipEditor(int trackId, int clipIndex)
diff --git a/src/managed/Nota.App/MainWindow.Files.cs b/src/managed/Nota.App/MainWindow.Files.cs
index 9073dab5..c7ba2321 100644
--- a/src/managed/Nota.App/MainWindow.Files.cs
+++ b/src/managed/Nota.App/MainWindow.Files.cs
@@ -154,7 +154,10 @@ public partial class MainWindow
{
string title = $"Nota — {ProjectDisplayName()}";
Title = title;
- DocTitleText.Text = title; // frameless title-bar caption mirrors the window title
+ // The project's name leads the transport, so the frameless title-bar caption is just
+ // the app; the OS window title keeps both for the Dock and window switcher.
+ DocTitleText.Text = "Nota";
+ ProjectNameText.Text = ProjectDisplayName();
}
/// <summary>A crash-recovery snapshot to offer on open (set by App at launch). M7-7.</summary>
diff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axaml
index 6c59db54..57ccdd27 100644
--- a/src/managed/Nota.App/MainWindow.axaml
+++ b/src/managed/Nota.App/MainWindow.axaml
@@ -125,14 +125,19 @@
Margin="12,12,12,0">
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto">
- <!-- View switch -->
- <Border Grid.Column="0" Classes="segmented" Margin="0,0,14,0" VerticalAlignment="Center">
- <StackPanel Orientation="Horizontal" Spacing="2">
- <ToggleButton x:Name="ArrangeBtn" Classes="seg" Content="Arrangement" IsChecked="True" Click="OnShowArrangement"/>
- <ToggleButton x:Name="SessionBtn" Classes="seg" Content="Session" Click="OnShowSession"/>
- <ToggleButton x:Name="ModularBtn" Classes="seg" Content="Modular" Click="OnShowModular"/>
- </StackPanel>
- </Border>
+ <!-- Project name, then the view switch -->
+ <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="12" Margin="2,0,14,0" VerticalAlignment="Center">
+ <TextBlock x:Name="ProjectNameText" Text="Untitled" FontSize="13" FontWeight="SemiBold"
+ MaxWidth="220" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"
+ Foreground="{DynamicResource Brush.TextPrimary}"/>
+ <Border Classes="segmented" VerticalAlignment="Center">
+ <StackPanel Orientation="Horizontal" Spacing="2">
+ <ToggleButton x:Name="ArrangeBtn" Classes="seg" Content="Arrangement" IsChecked="True" Click="OnShowArrangement"/>
+ <ToggleButton x:Name="SessionBtn" Classes="seg" Content="Session" Click="OnShowSession"/>
+ <ToggleButton x:Name="ModularBtn" Classes="seg" Content="Modular" Click="OnShowModular"/>
+ </StackPanel>
+ </Border>
+ </StackPanel>
<!-- The console: transport · position · loop in one recess -->
<Border Grid.Column="1" Classes="console">
@@ -368,10 +373,9 @@
</Grid>
</Border>
- <!-- Status bar (22) -->
- <Border DockPanel.Dock="Bottom" Background="{DynamicResource Brush.ChromeBg}"
- BorderBrush="{DynamicResource Brush.BorderDefault}" BorderThickness="0,1,0,0"
- Height="22" Padding="12,0">
+ <!-- Status bar (22): plain text on the gutter under the islands — no bar, no rule. -->
+ <Border DockPanel.Dock="Bottom" Background="Transparent"
+ Height="22" Padding="16,0,16,4">
<Grid ColumnDefinitions="*,Auto,Auto,Auto">
<TextBlock Classes="Caption" VerticalAlignment="Center" Text="{Binding StatusText}"/>
<!-- Settings → Downloads job (MainWindow.Downloads.cs): it keeps running after Settings closes. -->
@@ -428,12 +432,15 @@
HorizontalAlignment="Stretch" ResizeDirection="Rows"
Background="Transparent"/>
- <!-- Detail panel: Devices chain / Clip (piano roll) / Mixer for the selected track -->
- <Border x:Name="DetailPanel" Grid.Row="2" Classes="Panel"
- IsVisible="False" Background="{DynamicResource Brush.Panel}">
+ <!-- Detail panel: Devices chain / Clip (piano roll) / Mixer for the selected track.
+ An island like the browser and the arrangement: it floats on the gutter with the
+ same even margin and rounded edge, so the window reads as three panels. -->
+ <Border x:Name="DetailPanel" Grid.Row="2" Margin="12,0,12,12" IsVisible="False" ClipToBounds="True"
+ Background="{DynamicResource Brush.Panel}" BorderBrush="{DynamicResource Brush.BorderDefault}"
+ BorderThickness="1" CornerRadius="{StaticResource Radius.Panel}">
<DockPanel>
- <!-- Header (1d/1e): mode tabs · track chip (routing/PDC) · Freeze · close -->
- <Grid DockPanel.Dock="Top" Height="34" Margin="12,0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
+ <!-- Header: mode tabs · track chip (routing/PDC) · Freeze · | · pop out · close -->
+ <Grid DockPanel.Dock="Top" Height="32" Margin="8,0,10,0" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto">
<Border Classes="segmented" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" Spacing="2">
<ToggleButton x:Name="DetailDevicesBtn" Classes="seg" Content="Devices" Click="OnDetailDevices"/>
@@ -444,9 +451,9 @@
ToolTip.Tip="Select a MIDI clip to edit it" Click="OnDetailClip"/>
</StackPanel>
</Border>
- <ContentControl x:Name="DetailChipHost" Grid.Column="1" Margin="12,0,0,0" VerticalAlignment="Center"/>
+ <ContentControl x:Name="DetailChipHost" Grid.Column="1" Margin="14,0,0,0" VerticalAlignment="Center"/>
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
- <Button x:Name="FreezeBtn" Classes="ghost" Height="24" Padding="8,0" VerticalAlignment="Center"
+ <Button x:Name="FreezeBtn" Classes="ghost" Height="22" Padding="9,0" BorderThickness="1" BorderBrush="{DynamicResource Brush.BorderDefault}" VerticalAlignment="Center"
Click="OnFreezeClick"
ToolTip.Tip="Freeze the track to audio to free CPU (right-click to flatten)">
<StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
@@ -455,7 +462,7 @@
Foreground="{DynamicResource Brush.TextSecondary}"/>
</StackPanel>
</Button>
- <Button x:Name="LiveFreezeBtn" Classes="ghost" Height="24" Padding="8,0" VerticalAlignment="Center"
+ <Button x:Name="LiveFreezeBtn" Classes="ghost" Height="22" Padding="9,0" BorderThickness="1" BorderBrush="{DynamicResource Brush.BorderDefault}" VerticalAlignment="Center"
IsVisible="False" Click="OnLiveFreezeClick"
ToolTip.Tip="Bounce to a linked audio track below and put the source to sleep">
<StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
@@ -466,7 +473,7 @@
Foreground="{DynamicResource Brush.TextSecondary}"/>
</StackPanel>
</Button>
- <Button x:Name="EditBtn" Classes="ghost" Height="24" Padding="8,0" VerticalAlignment="Center"
+ <Button x:Name="EditBtn" Classes="ghost" Height="22" Padding="9,0" BorderThickness="1" BorderBrush="{DynamicResource Brush.BorderDefault}" VerticalAlignment="Center"
IsVisible="False" Click="OnEditClick"
ToolTip.Tip="Wake the frozen source to edit it (right-click to unfreeze or flatten)">
<StackPanel Orientation="Horizontal" Spacing="5" VerticalAlignment="Center">
@@ -474,7 +481,7 @@
<TextBlock Text="Edit" FontSize="11" VerticalAlignment="Center" Foreground="{DynamicResource Brush.AccentBright}"/>
</StackPanel>
</Button>
- <Button x:Name="DoneBtn" Classes="ghost" Height="24" Padding="8,0" VerticalAlignment="Center"
+ <Button x:Name="DoneBtn" Classes="ghost" Height="22" Padding="9,0" BorderThickness="1" BorderBrush="{DynamicResource Brush.BorderDefault}" VerticalAlignment="Center"
IsVisible="False" Click="OnDoneClick"
ToolTip.Tip="Re-freeze the source and put it back to sleep">
<StackPanel Orientation="Horizontal" Spacing="5" VerticalAlignment="Center">
@@ -482,18 +489,20 @@
<TextBlock Text="Done" FontSize="11" VerticalAlignment="Center" Foreground="{DynamicResource Brush.AccentBright}"/>
</StackPanel>
</Button>
- <Button x:Name="DiscardBtn" Classes="ghost" Height="24" Padding="6,0" VerticalAlignment="Center"
+ <Button x:Name="DiscardBtn" Classes="ghost" Height="22" Padding="6,0" VerticalAlignment="Center"
IsVisible="False" Click="OnDiscardClick"
ToolTip.Tip="Leave edit mode without re-freezing">
<app:Glyph x:Name="DiscardGlyph" Kind="Cross" Foreground="{DynamicResource Brush.TextTertiary}"/>
</Button>
</StackPanel>
- <Button x:Name="DetailPopOut" Grid.Column="3" Classes="ghost" Margin="8,0,0,0" Padding="7,0"
+ <Border Grid.Column="3" Width="1" Height="16" Margin="12,0,6,0" VerticalAlignment="Center"
+ Background="{DynamicResource Brush.Hairline}"/>
+ <Button x:Name="DetailPopOut" Grid.Column="4" Classes="ghost" Height="22" Padding="6,0"
Foreground="{DynamicResource Brush.TextTertiary}" Click="OnToggleDetailWindow"
ToolTip.Tip="Open devices and clip in a separate window">
<app:Glyph x:Name="PopOutGlyph" Kind="PopOut"/>
</Button>
- <Button Grid.Column="4" Classes="ghost" Margin="4,0,0,0" Padding="7,0"
+ <Button Grid.Column="5" Classes="ghost" Height="22" Margin="2,0,0,0" Padding="6,0"
Foreground="{DynamicResource Brush.TextTertiary}" Click="OnCloseDetail" ToolTip.Tip="Close">
<app:Glyph x:Name="CloseDetailGlyph" Kind="Close"/>
</Button>
diff --git a/src/managed/Nota.App/MainWindow.axaml.cs b/src/managed/Nota.App/MainWindow.axaml.cs
index 3ab36578..66ea77cc 100644
--- a/src/managed/Nota.App/MainWindow.axaml.cs
+++ b/src/managed/Nota.App/MainWindow.axaml.cs
@@ -290,6 +290,9 @@ public partial class MainWindow : Window
// Arrangement view options (View menu) persist the same way.
Timeline.ClipLabels = (ClipLabelMode)Math.Clamp(vm.Settings.Current.ArrangementClipLabels, 0, 2);
Timeline.ShowSections = vm.Settings.Current.ArrangementShowSections;
+ Timeline.Waveform = (WaveformStyle)Math.Clamp(vm.Settings.Current.ArrangementWaveform, 0, 1);
+ // Settings → Appearance can switch the waveform style while the arrangement is open.
+ vm.Settings.Changed += () => Timeline.Waveform = (WaveformStyle)Math.Clamp(vm.Settings.Current.ArrangementWaveform, 0, 1);
Browser.SetViewModel(vm.Browser);
Browser.ProjectTempo = () => (double)vm.Transport.Bpm; // the Files filter's "project" shortcuts
Browser.ProjectKey = () => vm.Transport.Key;
diff --git a/src/managed/Nota.App/PreferencesWindow.cs b/src/managed/Nota.App/PreferencesWindow.cs
index 96ad8366..d54957f7 100644
--- a/src/managed/Nota.App/PreferencesWindow.cs
+++ b/src/managed/Nota.App/PreferencesWindow.cs
@@ -74,7 +74,7 @@ public sealed partial class PreferencesWindow : NotaWindow
("GENERAL", new[]
{
new Page("Library", "Content folders and version history", "M3 7 A1 1 0 0 1 4 6 H9 L11 8 H20 A1 1 0 0 1 21 9 V18 A1 1 0 0 1 20 19 H4 A1 1 0 0 1 3 18 Z"),
- new Page("Appearance", "Theme and AI control", "M12 4 A8 8 0 1 0 12 20 Z M12 4 A8 8 0 0 1 12 20"),
+ new Page("Appearance", "Theme, waveforms and AI control", "M12 4 A8 8 0 1 0 12 20 Z M12 4 A8 8 0 0 1 12 20"),
new Page("Shortcuts", "Keyboard reference", "M3 7 H21 V17 H3 Z M7 11 H7.01 M11 11 H11.01 M15 11 H15.01 M8 14 H16"),
}),
};
@@ -788,6 +788,30 @@ public sealed partial class PreferencesWindow : NotaWindow
return new Border { Classes = { "segmented" }, HorizontalAlignment = HorizontalAlignment.Left, Child = strip };
}
+ // Bars / Solid for the arrangement's audio-clip waveforms. Saving fires Settings.Changed,
+ // which the main window applies to the lanes at once.
+ private static Control WaveformPicker()
+ {
+ var settings = App.Services.GetRequiredService<ISettingsService>();
+ var strip = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
+ var buttons = new List<(int Style, ToggleButton Btn)>();
+ foreach (var (style, label) in new[] { (0, "Bars"), (1, "Solid") })
+ {
+ var st = style;
+ var btn = new ToggleButton { Classes = { "seg" }, FontSize = 12, Content = label, IsChecked = settings.Current.ArrangementWaveform == st };
+ btn.Click += (_, _) =>
+ {
+ foreach (var (bs, bb) in buttons) bb.IsChecked = bs == st;
+ if (settings.Current.ArrangementWaveform == st) return;
+ settings.Current.ArrangementWaveform = st;
+ settings.Save();
+ };
+ buttons.Add((st, btn));
+ strip.Children.Add(btn);
+ }
+ return new Border { Classes = { "segmented" }, HorizontalAlignment = HorizontalAlignment.Left, Child = strip };
+ }
+
// A 10px chip of a variant's ground — both variants at once, whichever one is live.
// System is split corner to corner, Paper over Graphite.
private sealed class ThemeSwatch : Control
@@ -906,7 +930,9 @@ public sealed partial class PreferencesWindow : NotaWindow
return Sections(
Section("UI", 10,
Row("Theme", ThemePicker()),
- Row("", Caption("Ember Graphite is the warm dark palette; Ember Paper is the same system on a light ground. System follows the OS appearance and switches with it."))),
+ Row("", Caption("Ember Graphite is the warm dark palette; Ember Paper is the same system on a light ground. System follows the OS appearance and switches with it.")),
+ Row("Waveform", WaveformPicker()),
+ Row("", Caption("How audio clips draw on the arrangement: Bars spaces the peaks out so the rhythm reads; Solid draws every pixel."))),
Section("AI CONTROL (MCP)", 12, enable, details));
}
diff --git a/src/managed/Nota.Application/Settings.cs b/src/managed/Nota.Application/Settings.cs
index 04db128e..89835672 100644
--- a/src/managed/Nota.Application/Settings.cs
+++ b/src/managed/Nota.Application/Settings.cs
@@ -97,6 +97,9 @@ public sealed class Settings
public int ArrangementClipLabels { get; set; } = 1;
/// <summary>Show the song-structure (sections) lane over the ruler.</summary>
public bool ArrangementShowSections { get; set; } = true;
+ /// <summary>How audio clips draw their waveform on the lanes (Settings → Appearance):
+ /// 0 bars — spaced peak strokes (default), 1 solid — one column per pixel.</summary>
+ public int ArrangementWaveform { get; set; }
}
public interface ISettingsService