Nota — a free DAW for macOS, Windows and Linux. No subscription, no account — just open it and make music.
C# audioaudio-unitavaloniacpp20cross-platformdawdigital-audio-workstationdspjucelinux-audiomcp-servermidimusicmusic-productionpiano-rollplugin-hostsequencersynthesizervstvst3
UI transport fix
Egor Khindikaynen4cb8218b7e27
diff --git a/DESIGN.html b/DESIGN.htmlindex adf47234..3c457071 100644--- a/DESIGN.html+++ b/DESIGN.html@@ -26,6 +26,7 @@--surface-card: #171613;--surface-raised: #1C1A16;--surface-hover: #252219;+ --surface-hover-clear: rgba(37,34,25,0.000);--track-off: #26231E;--surface-active: #100F0D;--lane-b: #131210;@@ -96,6 +97,7 @@--surface-card: #EFEADE;--surface-raised: #F8F5EC;--surface-hover: #E7E1D0;+ --surface-hover-clear: rgba(231,225,208,0.000);--track-off: #DBD4C0;--surface-active: #D5CEBB;--lane-b: #E7E2D4;@@ -249,12 +251,17 @@ td:first-child{color:var(--text-primary)}.states figure .btn{align-self:flex-start}.transport+.note{margin-top:8px}/* transport */-.transport{display:flex;align-items:center;gap:12px;height:42px;padding:0 10px;background:var(--surface-abyss);border:1px solid var(--border-default);border-radius:var(--r-panel);box-shadow:var(--sunken);overflow-x:auto}-.tp{flex:none;display:grid;place-items:center;width:34px;height:34px;border-radius:var(--r-tile);background:var(--surface-raised);border:1px solid var(--border-default);box-shadow:var(--raised)}-.tp.play{width:46px;background:var(--accent);border-color:var(--accent)}-.tp .stop{width:10px;height:10px;border-radius:1px;background:var(--text-strong)}-.tp .play-tri{width:0;height:0;border-left:11px solid var(--text-on-accent);border-top:7px solid transparent;border-bottom:7px solid transparent;margin-left:2px}-.tp .rec{width:11px;height:11px;border-radius:50%;background:var(--record)}+.transport{display:flex;align-items:center;gap:14px;height:60px;padding:0 14px;background:var(--bg-sunken);border:1px solid var(--border-default);border-radius:var(--r-panel);overflow-x:auto}+.transport .seg{background:var(--surface-card);border:0;box-shadow:none;padding:3px}+.console{flex:none;display:flex;align-items:center;gap:5px;height:42px;padding:0 14px 0 12px;background:var(--surface-abyss);border:1px solid var(--border-default);border-radius:var(--r-panel);box-shadow:var(--sunken)}+.console .vr{margin:0 7px}+.tp{flex:none;display:grid;place-items:center;width:28px;height:28px;border-radius:var(--r-tile);background:var(--surface-raised);border:1px solid var(--border-strong);box-shadow:var(--raised)}+.tp.play{width:40px}+.tp.play.on{background:var(--accent);border-color:var(--accent);box-shadow:none}+.tp .stop{width:9px;height:9px;border-radius:1px;background:var(--text-strong)}+.tp .play-tri{width:0;height:0;border-left:10px solid var(--text-strong);border-top:6px solid transparent;border-bottom:6px solid transparent;margin-left:2px}+.tp.play.on .play-tri{border-left-color:var(--text-on-accent)}+.tp .rec{width:10px;height:10px;border-radius:50%;background:var(--record)}.tp.rec-on{background:var(--record);border-color:var(--record)} .tp.rec-on .rec{background:var(--record-ink)}.readout{flex:none;display:flex;flex-direction:column;align-items:center;gap:2px}.readout b{font:500 13px/1 var(--font-mono);color:var(--accent-bright)}@@ -388,7 +395,7 @@ ul.plain{margin:0;padding-left:18px;color:var(--text-secondary)} ul.plain li{mar<div class="tbl"><table><tr><th>Element</th><th>px</th><th>Token</th></tr><tr><td>Device card</td><td class="mono">700 × 260</td><td><code>DeviceCardKit.CardH</code></td></tr>- <tr><td>Transport strip · buttons · Play</td><td class="mono">42 · 34 · 46</td><td><code>Control.Console / Transport / Play</code></td></tr>+ <tr><td>Transport island · console · buttons · Play</td><td class="mono">60 · 42 · 28 · 40</td><td><code>Control.TransportBar / Console / Transport / Play</code></td></tr><tr><td>Shell button, field</td><td class="mono">26</td><td><code>Control.Shell</code></td></tr><tr><td>Tab segment in its container</td><td class="mono">24 in 30</td><td><code>Control.Seg / SegGroup</code></td></tr><tr><td>Filter chip</td><td class="mono">20</td><td><code>Control.Chip</code></td></tr>@@ -443,13 +450,14 @@ ul.plain{margin:0;padding-left:18px;color:var(--text-secondary)} ul.plain li{mar<h3>Transport · shapes, not an icon font</h3><div class="transport"><div class="seg"><button aria-pressed="true">Arrangement</button><button aria-pressed="false">Session</button><button aria-pressed="false">Modular</button></div>- <span class="tp"><i class="stop"></i></span><span class="tp play"><i class="play-tri"></i></span><span class="tp"><i class="rec"></i></span><span class="tp rec-on"><i class="rec"></i></span>- <span class="vr"></span>- <span class="readout"><b>12.3.04</b><span>BARS</span></span>- <span class="vr"></span>+ <span class="console">+ <span class="tp"><i class="stop"></i></span><span class="tp play"><i class="play-tri"></i></span><span class="tp play on"><i class="play-tri"></i></span><span class="tp"><i class="rec"></i></span><span class="tp rec-on"><i class="rec"></i></span>+ <span class="vr"></span>+ <span class="readout"><b class="n">12.3.04</b><span>BARS</span></span>+ </span><span class="readout"><b class="n">120.00</b><span>BPM</span></span><span class="readout"><b class="n">4/4</b><span>SIG</span></span><span class="readout"><b class="n">1/4</b><span>GRID</span></span></div>- <p class="note">Play is 46 wide against 34 — found by hand, not by eye. Record at rest is neutral with a red disc; engaged it is solid Record with a pale disc.</p>+ <p class="note">The bar is an island on the gutter (60, Well); stop, play, record, position and loop share one 42 recess on Void inside it. Play is 40 wide against 28 and turns solid brass only while the transport runs. Record at rest is neutral with a red disc; engaged it is solid Record with a pale disc.</p></section><section id="states">diff --git a/DESIGN.md b/DESIGN.mdindex 21320a39..e29c48a5 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -93,7 +93,7 @@ reflection and pinned by hand where the reflection read poorly.| Key | Almanac | Graphite | Paper | Use ||---|---|---|---|---|-| `Brush.SurfaceAbyss` | Void | `#0A0908` | `#D8D1BE` | Deepest recess — the transport strip |+| `Brush.SurfaceAbyss` | Void | `#0A0908` | `#D8D1BE` | Deepest recess — the transport console || `Brush.BgApp` | App | `#0B0A09` | `#DCD6C5` | Window ground, plugin body || `Brush.Gutter` | Gutter | `#0C0B09` | `#E0DAC9` | The gaps panels float in || `Brush.BgSunken` | Well | `#100F0D` | `#E4DFD1` | Graph windows, fields, slider tracks (`ChromeBg`, `SurfaceActive` alias it) |@@ -194,7 +194,7 @@ now points at the new hue.| Size (`Control.*` / `NotaSize`) | px ||---|---|| Device card | 700 × 260 |-| Transport strip (`Console`) | 42 · buttons 34 · Play 46 |+| Transport island (`TransportBar`) · console (`Console`) | 60 · 42 · buttons 28 · Play 40 || Shell button / field (`Shell`) | 26 || Tab segment (`Seg`) in container (`SegGroup`) | 24 in 30 || Filter chip (`Chip`) | 20 |@@ -376,7 +376,7 @@ redesign) and the host-plugin / parameter-list stubs (230, 190). Rhythm moved on```┌ header 36 ─ project name, centred ─────────────────────────────────────┐-│ transport 42 ─ view switch · console · tempo · signature · grid · … CPU│+│ transport 60 ─ view switch · console · tempo · signature · grid · … CPU│├─────────────┬──────────────────────────────────────────────────────────┤│ browser │ canvas (arrangement · session · modular) │├─────────────┴──────────────────────────────────────────────────────────┤@@ -385,12 +385,16 @@ redesign) and the host-plugin / parameter-list stubs (230, 190). Rhythm moved on- **Header 36** — frameless; macOS traffic lights in a left inset, the project name(`Heading`) centred; Windows reserves 180 px for the caption buttons.-- **Transport 42, under the header** (`Border.transport` on Void, hairline below). It reads- left to right: view switch (Arrangement · Session · Modular) · the console (stop / play /- record, position, loop) · tempo `120.00`, signature, grid · the switches (metronome,- follow, snap, automation) · `+ Track` — then, pinned right, MIDI, CPU and master. Launch- quantize appears only in Session. Transport buttons are not focusable, so Space / R / L /- Return always reach the window.+- **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`,+ 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.+ Launch quantize appears only in Session. Transport buttons are not focusable, so+ Space / R / L / Return always reach the window.- **Body** — the browser on the left and the canvas float as panels on `Gutter` with 12 pxgaps; the canvas is always sunken relative to panels. The splitter is a transparent grabstrip inside the gap.@@ -410,7 +414,7 @@ redesign) and the host-plugin / parameter-list stubs (230, 190). Rhythm moved on| `RunType` | Fonts bundled and matched; no font names in views; nothing under 7 px || `RunControls` | No unicode icons typed as text; Knob / Switch / Slider sizes || `RunVisualisers` | Graph windows via `NotaGraph`; no fills under curves; no meter ballistics; meter 11/5; playhead without glow |-| `RunLayout` | Header 22; cards 700 except the listed exceptions; transport 42 at the top; rows 26–28 |+| `RunLayout` | Header 22; cards 700 except the listed exceptions; transport 60 island at the top with its 42 console; rows 26–28 || `RunNumbers` | Display culture installed; no hyphen minus; no invariant culture on readouts; thin space before units; no vowel-dropped labels || `RunBans` | No hex outside `Ink()` (bar three data tables), no RGB typed as numbers, no named system colours, `Opacity` only on drag ghosts, no brush snapshotting a theme colour |diff --git a/scripts/design-html.py b/scripts/design-html.pyindex 0a88e0f9..cb069498 100755--- a/scripts/design-html.py+++ b/scripts/design-html.py@@ -181,12 +181,17 @@ td:first-child{{color:var(--text-primary)}}.states figure .btn{{align-self:flex-start}}.transport+.note{{margin-top:8px}}/* transport */-.transport{{display:flex;align-items:center;gap:12px;height:42px;padding:0 10px;background:var(--surface-abyss);border:1px solid var(--border-default);border-radius:var(--r-panel);box-shadow:var(--sunken);overflow-x:auto}}-.tp{{flex:none;display:grid;place-items:center;width:34px;height:34px;border-radius:var(--r-tile);background:var(--surface-raised);border:1px solid var(--border-default);box-shadow:var(--raised)}}-.tp.play{{width:46px;background:var(--accent);border-color:var(--accent)}}-.tp .stop{{width:10px;height:10px;border-radius:1px;background:var(--text-strong)}}-.tp .play-tri{{width:0;height:0;border-left:11px solid var(--text-on-accent);border-top:7px solid transparent;border-bottom:7px solid transparent;margin-left:2px}}-.tp .rec{{width:11px;height:11px;border-radius:50%;background:var(--record)}}+.transport{{display:flex;align-items:center;gap:14px;height:60px;padding:0 14px;background:var(--bg-sunken);border:1px solid var(--border-default);border-radius:var(--r-panel);overflow-x:auto}}+.transport .seg{{background:var(--surface-card);border:0;box-shadow:none;padding:3px}}+.console{{flex:none;display:flex;align-items:center;gap:5px;height:42px;padding:0 14px 0 12px;background:var(--surface-abyss);border:1px solid var(--border-default);border-radius:var(--r-panel);box-shadow:var(--sunken)}}+.console .vr{{margin:0 7px}}+.tp{{flex:none;display:grid;place-items:center;width:28px;height:28px;border-radius:var(--r-tile);background:var(--surface-raised);border:1px solid var(--border-strong);box-shadow:var(--raised)}}+.tp.play{{width:40px}}+.tp.play.on{{background:var(--accent);border-color:var(--accent);box-shadow:none}}+.tp .stop{{width:9px;height:9px;border-radius:1px;background:var(--text-strong)}}+.tp .play-tri{{width:0;height:0;border-left:10px solid var(--text-strong);border-top:6px solid transparent;border-bottom:6px solid transparent;margin-left:2px}}+.tp.play.on .play-tri{{border-left-color:var(--text-on-accent)}}+.tp .rec{{width:10px;height:10px;border-radius:50%;background:var(--record)}}.tp.rec-on{{background:var(--record);border-color:var(--record)}} .tp.rec-on .rec{{background:var(--record-ink)}}.readout{{flex:none;display:flex;flex-direction:column;align-items:center;gap:2px}}.readout b{{font:500 13px/1 var(--font-mono);color:var(--accent-bright)}}@@ -320,7 +325,7 @@ ul.plain{{margin:0;padding-left:18px;color:var(--text-secondary)}} ul.plain li{{<div class="tbl"><table><tr><th>Element</th><th>px</th><th>Token</th></tr><tr><td>Device card</td><td class="mono">700 × 260</td><td><code>DeviceCardKit.CardH</code></td></tr>- <tr><td>Transport strip · buttons · Play</td><td class="mono">42 · 34 · 46</td><td><code>Control.Console / Transport / Play</code></td></tr>+ <tr><td>Transport island · console · buttons · Play</td><td class="mono">60 · 42 · 28 · 40</td><td><code>Control.TransportBar / Console / Transport / Play</code></td></tr><tr><td>Shell button, field</td><td class="mono">26</td><td><code>Control.Shell</code></td></tr><tr><td>Tab segment in its container</td><td class="mono">24 in 30</td><td><code>Control.Seg / SegGroup</code></td></tr><tr><td>Filter chip</td><td class="mono">20</td><td><code>Control.Chip</code></td></tr>@@ -375,13 +380,14 @@ ul.plain{{margin:0;padding-left:18px;color:var(--text-secondary)}} ul.plain li{{<h3>Transport · shapes, not an icon font</h3><div class="transport"><div class="seg"><button aria-pressed="true">Arrangement</button><button aria-pressed="false">Session</button><button aria-pressed="false">Modular</button></div>- <span class="tp"><i class="stop"></i></span><span class="tp play"><i class="play-tri"></i></span><span class="tp"><i class="rec"></i></span><span class="tp rec-on"><i class="rec"></i></span>- <span class="vr"></span>- <span class="readout"><b>12.3.04</b><span>BARS</span></span>- <span class="vr"></span>+ <span class="console">+ <span class="tp"><i class="stop"></i></span><span class="tp play"><i class="play-tri"></i></span><span class="tp play on"><i class="play-tri"></i></span><span class="tp"><i class="rec"></i></span><span class="tp rec-on"><i class="rec"></i></span>+ <span class="vr"></span>+ <span class="readout"><b class="n">12.3.04</b><span>BARS</span></span>+ </span><span class="readout"><b class="n">120.00</b><span>BPM</span></span><span class="readout"><b class="n">4/4</b><span>SIG</span></span><span class="readout"><b class="n">1/4</b><span>GRID</span></span></div>- <p class="note">Play is 46 wide against 34 — found by hand, not by eye. Record at rest is neutral with a red disc; engaged it is solid Record with a pale disc.</p>+ <p class="note">The bar is an island on the gutter (60, Well); stop, play, record, position and loop share one 42 recess on Void inside it. Play is 40 wide against 28 and turns solid brass only while the transport runs. Record at rest is neutral with a red disc; engaged it is solid Record with a pale disc.</p></section><section id="states">diff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axamlindex ff23930c..be3f4bc5 100644--- a/src/managed/Nota.App/MainWindow.axaml+++ b/src/managed/Nota.App/MainWindow.axaml@@ -93,7 +93,7 @@</NativeMenu.Menu><Panel>- <DockPanel>+ <DockPanel Background="{DynamicResource Brush.Gutter}"><!-- Header (36) — custom frameless: macOS traffic lights sit in the left inset;the project name is centred on the window. Draggable.(Transport sits right under it, at the top of the window.) -->@@ -112,16 +112,18 @@<!-- In-window menu bar for Windows/Linux (empty on macOS: menus go to the system bar) --><NativeMenuBar DockPanel.Dock="Top"/>- <!-- Transport (42) under the header, above the work area. The whole strip is one- recess on Void, so buttons, position, tempo and loop read as one object rather- than a row of buttons. Reads left to right as: which view · what plays · the numbers you set ·+ <!-- Transport (60) under the header, above the work area — an island on the gutter like+ the browser and the arrangement. Stop / play / record, position and loop share one+ 42px recess on Void inside it, so playback reads as one object rather than a row of+ buttons. Reads left to right as: which view · what plays · the numbers you set ·the switches you flip · then, pinned right, what the machine is doing. Launchquantize shows only in Session, where it applies. The view switch leads the row. -->- <Border x:Name="TransportBar" DockPanel.Dock="Top" Classes="transport" Height="{StaticResource Control.Console}" Padding="10,0">+ <Border x:Name="TransportBar" DockPanel.Dock="Top" Classes="transport" Height="{StaticResource Control.TransportBar}"+ 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,12,0" VerticalAlignment="Center">+ <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"/>@@ -131,36 +133,36 @@<!-- The console: transport · position · loop in one recess --><Border Grid.Column="1" Classes="console">- <StackPanel Orientation="Horizontal" Spacing="11" VerticalAlignment="Center">- <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">+ <StackPanel Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">+ <StackPanel Orientation="Horizontal" Spacing="5" VerticalAlignment="Center"><!-- Shapes built from geometry (almanac): stop a 10px square r1, play an 11×14triangle, record an 11px disc. No glyph font. --><Button x:Name="StopBtn" Classes="tp-icon" ToolTip.Tip="Stop"Foreground="{DynamicResource Brush.TextStrong}" Command="{Binding Transport.StopCommand}">- <app:Glyph x:Name="StopGlyph" Kind="Stop"/>+ <app:Glyph x:Name="StopGlyph" Kind="Stop" Width="9" Height="9"/></Button><Button x:Name="PlayBtn" Classes="tp-play" ToolTip.Tip="Play"- Foreground="{DynamicResource Brush.TextOnAccent}" Command="{Binding Transport.PlayCommand}">- <app:Glyph x:Name="PlayGlyph" Kind="Play" Margin="2,0,0,0"/>+ Classes.playing="{Binding Transport.IsPlaying}" Command="{Binding Transport.PlayCommand}">+ <app:Glyph x:Name="PlayGlyph" Kind="Play" Width="10" Height="12" Margin="2,0,0,0"/></Button><ToggleButton x:Name="RecordBtn" Classes="tp-icon rec" ToolTip.Tip="Record"IsChecked="{Binding Transport.RecordOn}">- <app:Glyph x:Name="RecordGlyph" Kind="Record"/>+ <app:Glyph x:Name="RecordGlyph" Kind="Record" Width="10" Height="10"/></ToggleButton></StackPanel>- <Border Width="1" Height="24" Background="{DynamicResource Brush.BorderDefault}"/>+ <Border Width="1" Height="24" Background="{DynamicResource Brush.Hairline}"/><!-- Position — click to flip bars.beats ↔ minutes:seconds; the unit below says which --><StackPanel Spacing="1" VerticalAlignment="Center" Cursor="Hand" Background="Transparent"PointerPressed="OnTogglePositionDisplay"ToolTip.Tip="Switch between bars and time">- <TextBlock Classes="Readout" Text="{Binding Transport.PositionText}" LineHeight="16"- MinWidth="72" Foreground="{DynamicResource Brush.AccentBright}"/>+ <TextBlock Classes="Readout" Text="{Binding Transport.PositionText}" FontSize="19" LineHeight="20"+ MinWidth="96" Foreground="{DynamicResource Brush.TextPrimary}"/><TextBlock Classes="CellLabel" Text="{Binding Transport.PositionUnitText}"/></StackPanel>- <Border Width="1" Height="24" Background="{DynamicResource Brush.BorderDefault}"/>+ <Border Width="1" Height="24" Background="{DynamicResource Brush.Hairline}"/><!-- Loop: the range is the button --><ToggleButton Classes="cell" IsChecked="{Binding Transport.LoopOn}" ToolTip.Tip="Loop the range set on the ruler">@@ -175,7 +177,7 @@</Border><!-- Readouts: value over label, one shape for all of them -->- <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="2" VerticalAlignment="Center" Margin="12,0,0,0">+ <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="2" VerticalAlignment="Center" Margin="14,0,0,0"><!-- Tempo (drag ↕ or double-click to type) --><StackPanel Spacing="2" VerticalAlignment="Center" Margin="7,0" ToolTip.Tip="Set the tempo — drag, or double-click to type"><Panel x:Name="BpmHost" Width="52" Height="18"/>@@ -213,7 +215,7 @@<!-- Switches. Each draws the thing it does, so the row carries no prose: ametronome, a magnet, a breakpoint envelope. None sets Foreground, so theengaged state turns the glyph brass through the base ToggleButton:checked. -->- <StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="5" VerticalAlignment="Center" Margin="12,0,0,0">+ <StackPanel Grid.Column="3" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" Margin="14,0,0,0"><!-- Metronome: body, pendulum rod, weight --><ToggleButton Classes="tp-icon" IsChecked="{Binding Transport.MetronomeOn}" ToolTip.Tip="Turn the metronome on or off (M)"><Viewbox Width="15" Height="15">@@ -310,7 +312,7 @@</ToggleButton><Border Grid.Column="7" Width="1" Height="26" Margin="14,0"- Background="{DynamicResource Brush.BorderDefault}"/>+ Background="{DynamicResource Brush.Hairline}"/><!-- CPU: live DSP load --><StackPanel Grid.Column="8" Spacing="3" VerticalAlignment="Center">@@ -323,9 +325,7 @@</StackPanel><!-- Master: fader over its meter, with the gain in dB -->- <Border Grid.Column="9" Height="{StaticResource Control.Transport}" Margin="12,0,0,0" Padding="10,0"- Background="{DynamicResource Brush.BgSunken}" CornerRadius="{StaticResource Radius.Tile}"- VerticalAlignment="Center">+ <Border Grid.Column="9" Classes="tp-well" Margin="14,0,0,0"><StackPanel Orientation="Horizontal" Spacing="9" VerticalAlignment="Center"><TextBlock Classes="CellLabel" Text="MST" VerticalAlignment="Center"/><StackPanel Spacing="3" VerticalAlignment="Center">diff --git a/src/managed/Nota.App/Theme/NotaGeometry.cs b/src/managed/Nota.App/Theme/NotaGeometry.csindex e39ce8fd..d19912da 100644--- a/src/managed/Nota.App/Theme/NotaGeometry.cs+++ b/src/managed/Nota.App/Theme/NotaGeometry.cs@@ -45,9 +45,10 @@ internal static class NotaSizepublic const double Seg = 24; // tab segmentpublic const double Shell = 26; // shell button, field, dropdownpublic const double SegGroup = 30; // segment container- public const double Transport = 34; // transport button- public const double Play = 46; // Play is wider on purpose- public const double Console = 42; // transport module+ public const double Transport = 28; // transport button+ public const double Play = 40; // Play is the one wide transport button+ public const double Console = 42; // transport module: the recess inside the bar+ public const double TransportBar = 60; // the transport islandpublic const double KnobSecondary = 34;public const double KnobRegular = 36;public const double KnobMain = 44;diff --git a/src/managed/Nota.App/Theme/NotaTheme.axaml b/src/managed/Nota.App/Theme/NotaTheme.axamlindex bfd09288..e09ca30c 100644--- a/src/managed/Nota.App/Theme/NotaTheme.axaml+++ b/src/managed/Nota.App/Theme/NotaTheme.axaml@@ -34,9 +34,10 @@<sys:Double x:Key="Control.Seg">24</sys:Double> <!-- tab segment --><sys:Double x:Key="Control.Shell">26</sys:Double> <!-- shell button, field, dropdown --><sys:Double x:Key="Control.SegGroup">30</sys:Double> <!-- segment container: 24 + 2 pad + 1 border -->- <sys:Double x:Key="Control.Transport">34</sys:Double> <!-- transport button -->- <sys:Double x:Key="Control.Play">46</sys:Double> <!-- Play is wider on purpose: found by hand -->- <sys:Double x:Key="Control.Console">42</sys:Double> <!-- transport module -->+ <sys:Double x:Key="Control.Transport">28</sys:Double> <!-- transport button -->+ <sys:Double x:Key="Control.Play">40</sys:Double> <!-- Play is the one wide transport button -->+ <sys:Double x:Key="Control.Console">42</sys:Double> <!-- transport module: the recess inside the bar -->+ <sys:Double x:Key="Control.TransportBar">60</sys:Double> <!-- the transport island --><sys:Double x:Key="Control.KnobSecondary">34</sys:Double><sys:Double x:Key="Control.KnobRegular">36</sys:Double><sys:Double x:Key="Control.KnobMain">44</sys:Double>@@ -335,7 +336,7 @@</Style><Style Selector="Button:pressed /template/ Border#PART_Lift, Button:disabled /template/ Border#PART_Lift,Button.primary /template/ Border#PART_Lift, Button.ghost /template/ Border#PART_Lift,- Button.tp-play /template/ Border#PART_Lift, Button.cell /template/ Border#PART_Lift">+ Button.tp-play.playing /template/ Border#PART_Lift, Button.cell /template/ Border#PART_Lift"><Setter Property="IsVisible" Value="False"/></Style><!-- Disabled: the ground drops to the panel colour and the text to Ink 6 — never opacity. -->@@ -468,20 +469,35 @@<Style Selector="ToggleButton.tp-icon.rec:checked"><Setter Property="Foreground" Value="{DynamicResource Brush.RecordInk}"/></Style>+ <!-- Play: a raised button like its neighbours at rest; while the transport runs it is+ the one solid brass control on the bar (brass means active). --><Style Selector="Button.tp-play"><Setter Property="Width" Value="{StaticResource Control.Play}"/><Setter Property="Height" Value="{StaticResource Control.Transport}"/><Setter Property="Padding" Value="0"/><Setter Property="CornerRadius" Value="{StaticResource Radius.Tile}"/>+ <Setter Property="Background" Value="{DynamicResource Brush.SurfaceRaised}"/>+ <Setter Property="BorderBrush" Value="{DynamicResource Brush.BorderStrong}"/>+ <Setter Property="BorderThickness" Value="1"/>+ </Style>+ <Style Selector="Button.tp-play.playing"><Setter Property="Background" Value="{DynamicResource Brush.Accent}"/>- <Setter Property="BorderThickness" Value="0"/>+ <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>+ <Setter Property="Foreground" Value="{DynamicResource Brush.TextOnAccent}"/></Style>- <!-- Play button turns green in the Session context -->- <Style Selector="Button.tp-play.session">+ <Style Selector="Button.tp-play.playing:pointerover /template/ ContentPresenter#PART_ContentPresenter">+ <Setter Property="Background" Value="{DynamicResource Brush.Accent}"/>+ <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>+ <Setter Property="Foreground" Value="{DynamicResource Brush.TextOnAccent}"/>+ </Style>+ <!-- Play turns green in the Session context -->+ <Style Selector="Button.tp-play.playing.session"><Setter Property="Background" Value="{DynamicResource Brush.Success}"/>+ <Setter Property="BorderBrush" Value="{DynamicResource Brush.Success}"/></Style>- <Style Selector="Button.tp-play.session:pointerover /template/ ContentPresenter#PART_ContentPresenter">+ <Style Selector="Button.tp-play.playing.session:pointerover /template/ ContentPresenter#PART_ContentPresenter"><Setter Property="Background" Value="{DynamicResource Brush.Success}"/>+ <Setter Property="BorderBrush" Value="{DynamicResource Brush.Success}"/></Style><!-- Bordered pill chips (Metro / Snap / add-track etc.), 28px -->@@ -548,17 +564,25 @@<!-- Transport console (mockup 1b): a recess cut into the chrome holding thetransport buttons, the position readout and the loop range, so playback readsas one object instead of three neighbours. -->- <!-- The transport strip: one 42px recess on Void across the bottom of the window. -->+ <!-- The transport bar: an island like the browser and the arrangement — a 60px rounded+ strip on Well floating on the gutter, with the console cut into it. --><Style Selector="Border.transport">- <Setter Property="Background" Value="{DynamicResource Brush.SurfaceAbyss}"/>+ <Setter Property="Height" Value="{StaticResource Control.TransportBar}"/>+ <Setter Property="Padding" Value="14,0"/>+ <Setter Property="Background" Value="{DynamicResource Brush.BgSunken}"/><Setter Property="BorderBrush" Value="{DynamicResource Brush.BorderDefault}"/>- <Setter Property="BorderThickness" Value="0,0,0,1"/>- <Setter Property="BoxShadow" Value="{DynamicResource Shadow.Sunken}"/>+ <Setter Property="BorderThickness" Value="1"/>+ <Setter Property="CornerRadius" Value="{StaticResource Radius.Panel}"/></Style>- <!-- Transport · position · loop: grouped inside the strip; the strip is the recess. -->+ <!-- Transport · position · loop: one 42px recess on Void inside the bar. --><Style Selector="Border.console">- <Setter Property="Background" Value="Transparent"/>- <Setter Property="Padding" Value="0,0,4,0"/>+ <Setter Property="Height" Value="{StaticResource Control.Console}"/>+ <Setter Property="Padding" Value="12,0,14,0"/>+ <Setter Property="Background" Value="{DynamicResource Brush.SurfaceAbyss}"/>+ <Setter Property="BorderBrush" Value="{DynamicResource Brush.BorderDefault}"/>+ <Setter Property="BorderThickness" Value="1"/>+ <Setter Property="CornerRadius" Value="{StaticResource Radius.Panel}"/>+ <Setter Property="BoxShadow" Value="{DynamicResource Shadow.Sunken}"/><Setter Property="VerticalAlignment" Value="Center"/></Style>@@ -598,6 +622,21 @@<Setter Property="Padding" Value="2"/><Setter Property="VerticalAlignment" Value="Center"/></Style>+ <!-- On the bar, the view switch and the master well sit one step up, on Card: the bar+ itself is already Well, so a Well-coloured group would vanish into it. -->+ <Style Selector="Border.transport Border.segmented">+ <Setter Property="Background" Value="{DynamicResource Brush.SurfaceCard}"/>+ <Setter Property="BorderThickness" Value="0"/>+ <Setter Property="BoxShadow" Value="none"/>+ <Setter Property="Padding" Value="3"/>+ </Style>+ <Style Selector="Border.transport Border.tp-well">+ <Setter Property="Height" Value="36"/>+ <Setter Property="Padding" Value="10,0"/>+ <Setter Property="Background" Value="{DynamicResource Brush.SurfaceCard}"/>+ <Setter Property="CornerRadius" Value="{StaticResource Radius.Tile}"/>+ <Setter Property="VerticalAlignment" Value="Center"/>+ </Style><Style Selector="ToggleButton.seg"><Setter Property="Height" Value="{StaticResource Control.Seg}"/><Setter Property="Padding" Value="10,0"/>diff --git a/tests/Nota.SmokeTest/DesignTokenCheck.cs b/tests/Nota.SmokeTest/DesignTokenCheck.csindex 4d6ea87c..ed5f0156 100644--- a/tests/Nota.SmokeTest/DesignTokenCheck.cs+++ b/tests/Nota.SmokeTest/DesignTokenCheck.cs@@ -394,8 +394,10 @@ internal static class DesignTokenCheckyield return (off.Length == 0, off.Length == 0 ? "device cards are 700 wide (documented exceptions aside)" : $"cards off the 700 format: {string.Join(", ", off)}");var main = File.ReadAllText(Path.Combine(app, "MainWindow.axaml"));- yield return (Regex.IsMatch(main, "x:Name=\"TransportBar\" DockPanel.Dock=\"Top\"[^>]*Height=\"\\{StaticResource Control.Console\\}\""),- "transport is a 42px strip at the top of the window");+ yield return (Regex.IsMatch(main, "x:Name=\"TransportBar\" DockPanel.Dock=\"Top\"[^>]*Height=\"\\{StaticResource Control.TransportBar\\}\""),+ "transport is a 60px island at the top of the window");+ yield return (Regex.IsMatch(main, "<Border Grid.Column=\"1\" Classes=\"console\">"),+ "transport console is the 42px recess inside it");var browser = File.ReadAllText(Path.Combine(app, "BrowserView.cs"));yield return (Regex.IsMatch(browser, @"const double RowH = 2[6-8];"), "browser list rows are 26–28px");