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
Add the Ember Paper light theme
Egor Khindikaynen102b0fb23a6f
diff --git a/.claude/skills/nota-design/SKILL.md b/.claude/skills/nota-design/SKILL.mdindex 35533e31..1097f298 100644--- a/.claude/skills/nota-design/SKILL.md+++ b/.claude/skills/nota-design/SKILL.md@@ -1,13 +1,16 @@---name: nota-design-description: Nota's UI design language — "Ember Graphite", a dark-only warm-graphite palette with a brass accent, used across the Avalonia/C# desktop app. Use whenever building or restyling any Nota UI (windows, panels, controls, device cards, custom-drawn views like the piano roll / waveform / arrangement) so everything stays visually consistent. Points at the authoritative token files and the full guideline rather than restating values.+description: Nota's UI design language — "Ember", a warm-graphite palette with a brass accent, in two variants (Ember Graphite dark, Ember Paper light), used across the Avalonia/C# desktop app. Use whenever building or restyling any Nota UI (windows, panels, controls, device cards, custom-drawn views like the piano roll / waveform / arrangement) so everything stays visually consistent. Points at the authoritative token files and the full guideline rather than restating values.user-invocable: true----# Nota design language — Ember Graphite+# Nota design language — Ember-Warm graphite neutrals (hue ~40°) lit by a single **brass** accent `#D8A03D`.-Dark-only by intent: a DAW is used in dark rooms for long sessions.+Warm neutrals (hue ~40°) lit by a single **brass** accent, in two variants:+**Ember Graphite** (dark, the default — a DAW is used in dark rooms for long sessions)+and **Ember Paper** (light — same hues and roles, brass darkened to bronze so a mark+carries the same emphasis against paper). Preferences → Appearance picks Dark / Light /+System; switching is live.## Read these first — do not work from memory@@ -17,6 +20,7 @@ Dark-only by intent: a DAW is used in dark rooms for long sessions.| `DESIGN.html` | The same thing rendered — swatches, live control specimens, card anatomy at true size. Open it when the question is "what should this look like". || `src/managed/Nota.App/Theme/NotaTheme.axaml` | **Definitive** source of colour, geometry and control styles. || `src/managed/Nota.App/Theme/NotaPalette.cs` | Mirror of the above for custom-drawn views. Kept in sync by hand. |+| `src/managed/Nota.App/Theme/NotaThemeService.cs` | Applies a variant to both layers and repaints. || `src/managed/Nota.App/DeviceCardKit.cs` | Palette aliases + atomic builders for device cards. |If `DESIGN.md` / `DESIGN.html` disagree with the theme files, **the theme files win** and@@ -28,9 +32,16 @@ the docs need fixing. Say so rather than propagating the drift.## Non-negotiables-- **Never hardcode a colour or size in a view.** XAML: `{DynamicResource Brush.*}` /- `{StaticResource Radius.*}`. Custom-drawn C#: read from `NotaPalette` or `DeviceCardKit`.- (The card layer currently breaks this in ~628 places — do not add to it.)+- **Never hardcode a colour or size in a view.** XAML: `{DynamicResource Brush.*}` —+ a `StaticResource` cannot follow the variant — and `{StaticResource Radius.*}` for+ geometry. Custom-drawn C#: `NotaPalette` (a named token, `Wash(slot, alpha)`, or+ `Ink("#hex")` for a one-off device hue) or `DeviceCardKit`. A literal is not just+ off-palette, it is stuck in one variant.+- **Nothing may snapshot a colour.** `NotaPalette` hands out long-lived brushes whose+ `Color` is re-pointed on a variant change, so `new SolidColorBrush(slot.Color)` freezes+ the view. A `static readonly Color` must become a property; a gradient must come from+ `NotaPalette.VGradient`; anything a view derives itself must be dropped on+ `NotaPalette.Changed`.- **One accent, spent sparingly.** Brass marks primary actions, selection, focus, activestate, and the time-domain data that is the point of a DAW. Everything else is neutral.Green / amber / red are status only.@@ -90,6 +101,7 @@ border. Families and existing views: `DESIGN.md` § Visualisers.## When you change a colour-1. Edit `NotaTheme.axaml`.-2. Mirror it into `NotaPalette.cs` — nothing enforces this.+1. Edit **both** branches in `NotaTheme.axaml` — `Dark` and `Light`.+2. Mirror the pair into the `NotaPalette` slot — nothing enforces this.3. Update `DESIGN.md` **and** `DESIGN.html` so the docs stay true.+4. Check it in both variants. `DESIGN.html` has a variant toggle in its masthead.diff --git a/CHANGELOG.md b/CHANGELOG.mdindex d05349b9..88f14abf 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -18,6 +18,23 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.## [Unreleased]+### Added+- **Light theme.** *Ember Paper* joins *Ember Graphite*: the same design system on a warm+ paper ground, with brass darkened to bronze so marks keep their weight against a light+ background. Preferences → Appearance picks Ember Graphite, Ember Paper or System (which+ follows the OS appearance and switches with it). Switching applies immediately — no+ restart — and the choice is remembered.++### Changed+- The colour tokens in `NotaTheme.axaml` now live in theme dictionaries, and `NotaPalette`+ hands out brushes that re-tint in place, so both the XAML and the custom-drawn layer+ follow the active variant. The ~970 hex literals that had accumulated across the device+ cards, visualisers and editors now route through the palette; colours that are genuinely+ data — tag swatches, Strata layer hues, Drum Rack kit dots — are re-tinted per variant+ at the point of use.+- `WaveformView` was still painted in the pre-Ember cool-slate palette; it now uses the+ tokens its own comments named.+## [0.38.0] — 2026-09-12### Highlightsdiff --git a/DESIGN.html b/DESIGN.htmlindex 97b564df..e1739ef1 100644--- a/DESIGN.html+++ b/DESIGN.html@@ -1,4 +1,4 @@-<title>Ember Graphite</title>+<title>Ember</title><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>@@ -6,11 +6,12 @@<style>/* ============================================================================- Ember Graphite — Nota's design system, documented in its own palette.+ Ember — Nota's design system, documented in its own palette.Every value below is lifted from src/managed/Nota.App/Theme/NotaTheme.axaml.- Single-theme by intent: Nota is dark-only, and these swatches are only- truthful on their real ground. Every colour is painted explicitly so the- page holds on any host background.+ Two variants: Ember Graphite (dark, the default) and Ember Paper (light).+ The toggle in the masthead flips data-variant on :root, so every specimen+ on this page is rendered by the same tokens the app uses. Nothing here is+ painted with a raw hex — that is the point.========================================================================= */:root {@@ -23,6 +24,8 @@--surface-hover: #2E2B24;--surface-active: #332F27;--surface-selected: #24D8A03D;+ --surface-inset: #1B1916;+ --graph-border: #221F1A;/* Grid lines */--grid-beat: #1F1D18;@@ -48,6 +51,13 @@--warning: #D9C34C;--danger: #D95F4C;--danger-hover: #E4715F;+ --danger-subtle: #33D95F4C;++ /* Track palette + returns */+ --track-1: #C4756A; --track-2: #C99C55; --track-3: #9BA65D; --track-4: #6FA383;+ --track-5: #5B9E9C; --track-6: #6D8FB5; --track-7: #9B7FA6; --track-8: #B57286;+ --return-a: #7C88A0; --return-b: #A08A7C;+ --teal: #5B9E9C;/* Geometry */--r-sm: 5px; --r-md: 7px; --r-lg: 10px; --r-xl: 14px; --r-clip: 4px; --r-pill: 8px;@@ -58,6 +68,55 @@--measure: 68ch;}+/* Ember Paper — the same roles on a warm paper ground. Only the colour tokens+ move; geometry and type are variant-independent. */+:root[data-variant="paper"] {+ --bg-sunken: #E4DFD1;+ --bg-app: #EFEADE;+ --lane-b: #E9E4D6;+ --surface-card: #F8F5EC;+ --surface-raised: #FFFEF8;+ --surface-hover: #E7E1D0;+ --surface-active: #DBD4C0;+ --surface-selected: #2EA87415;+ --surface-inset: #E7E2D4;+ --graph-border: #D5CFBE;++ --grid-beat: #DED8C8;+ --grid-bar: #CFC8B4;++ --text-primary: #241F17;+ --text-secondary: #5E5849;+ --text-tertiary: #8A8474;+ --text-disabled: #ADA694;+ --text-on-accent: #FFFBF2;++ --border-default: #D5CEBB;+ --border-strong: #BDB5A0;++ --accent: #A87415;+ --accent-hover: #8F6110;+ --accent-bright: #744D07;+ --accent-subtle: #24A87415;+ --success: #2C7A3E;+ --warning: #837010;+ --danger: #B03A28;+ --danger-hover: #C64A36;+ --danger-subtle: #33B03A28;++ --track-1: #9A4A3E; --track-2: #97682A; --track-3: #646E32; --track-4: #42765A;+ --track-5: #2F7472; --track-6: #3E6288; --track-7: #6A5176; --track-8: #86465B;+ --return-a: #4D5972; --return-b: #705B4E;+ --teal: #2F7472;+}++/* Variant toggle */+.variant { display: inline-flex; gap: 2px; padding: 2px; margin-top: 18px;+ background: var(--bg-sunken); border: 1px solid var(--border-default); border-radius: var(--r-sm); }+.variant button { appearance: none; border: 0; cursor: pointer; border-radius: 3px;+ padding: 4px 12px; font: 500 11px/1.4 var(--font-ui); color: var(--text-secondary); background: transparent; }+.variant button[aria-pressed="true"] { background: var(--accent); color: var(--text-on-accent); font-weight: 600; }+* { box-sizing: border-box; }body {@@ -608,7 +667,7 @@ footer {<div class="shell"><aside class="rail"><p class="rail__mark">Nota</p>- <p class="rail__sub">Ember Graphite<br>design system</p>+ <p class="rail__sub">Ember<br>design system</p><nav><a href="#principles">Principles</a><a href="#colour">Colour</a>@@ -628,11 +687,15 @@ footer {<main class="main"><header class="masthead">- <h1>Ember <em>Graphite</em></h1>- <p>Nota's UI runs on a warm graphite palette — neutrals pulled to roughly 40° hue, lit by a single brass accent. It is dark-only by intent: a DAW is used in dark rooms for long sessions, and every value here is tuned for that.</p>- <p>The concrete source of truth is <code>src/managed/Nota.App/Theme/NotaTheme.axaml</code>, mirrored for custom-drawn views in <code>Theme/NotaPalette.cs</code>. This page documents those two files. <strong style="color:var(--text-primary);font-weight:600">Never hardcode a colour or size in a view</strong> — reference the resource key.</p>+ <h1>Ember <em>Graphite</em> & <em>Paper</em></h1>+ <p>Nota's UI runs on a warm palette — neutrals pulled to roughly 40° hue, lit by a single brass accent. <strong style="color:var(--text-primary);font-weight:600">Ember Graphite</strong> is the dark default: a DAW is used in dark rooms for long sessions. <strong style="color:var(--text-primary);font-weight:600">Ember Paper</strong> is the same system on a warm light ground — same hues, same roles, with brass darkened to bronze because against paper a mark needs less lightness, not more, to carry the same emphasis.</p>+ <p>The concrete source of truth is <code>src/managed/Nota.App/Theme/NotaTheme.axaml</code> (both variants, in <code>ThemeDictionaries</code>), mirrored for custom-drawn views in <code>Theme/NotaPalette.cs</code>. This page documents those two files. <strong style="color:var(--text-primary);font-weight:600">Never hardcode a colour or size in a view</strong> — reference the token, or it is stuck in one variant.</p>+ <div class="variant" role="group" aria-label="Palette variant">+ <button type="button" data-set="graphite" aria-pressed="true">Ember Graphite</button>+ <button type="button" data-set="paper" aria-pressed="false">Ember Paper</button>+ </div><div class="hue-strip">- <span style="background:#100F0D"></span><span style="background:#171613"></span><span style="background:#1E1C18"></span><span style="background:#26231E"></span><span style="background:#3A362D"></span><span style="background:#6E6A5E"></span><span style="background:#A39D8F"></span><span style="background:#E9E4D8"></span><span style="background:#D8A03D"></span><span style="background:#F0C060"></span>+ <span style="background:var(--bg-sunken)"></span><span style="background:var(--bg-app)"></span><span style="background:var(--surface-card)"></span><span style="background:var(--surface-raised)"></span><span style="background:var(--border-strong)"></span><span style="background:var(--text-tertiary)"></span><span style="background:var(--text-secondary)"></span><span style="background:var(--text-primary)"></span><span style="background:var(--accent)"></span><span style="background:var(--accent-bright)"></span></div></header>@@ -671,47 +734,47 @@ footer {<section id="colour"><p class="eyebrow">02 — Colour</p><h2>Palette</h2>- <p>Click any swatch to copy its hex. Translucent tokens are shown over a checkerboard so the alpha reads honestly.</p>+ <p>Click any swatch to copy its hex. The hex shown is the one for the variant selected in the masthead. Translucent tokens are shown over a checkerboard so the alpha reads honestly.</p><h3>Surfaces</h3><div class="swatches">- <button class="sw" data-hex="#100F0D"><span class="sw__chip" style="background:#100F0D"></span><span class="sw__meta"><span class="sw__key">Brush.BgSunken</span><span class="sw__hex">#100F0D</span> <span class="sw__role">· wells, lanes, chrome</span></span></button>- <button class="sw" data-hex="#171613"><span class="sw__chip" style="background:#171613"></span><span class="sw__meta"><span class="sw__key">Brush.BgApp</span><span class="sw__hex">#171613</span> <span class="sw__role">· app ground</span></span></button>- <button class="sw" data-hex="#191814"><span class="sw__chip" style="background:#191814"></span><span class="sw__meta"><span class="sw__key">Brush.LaneB</span><span class="sw__hex">#191814</span> <span class="sw__role">· lane alternation</span></span></button>- <button class="sw" data-hex="#1E1C18"><span class="sw__chip" style="background:#1E1C18"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceCard</span><span class="sw__hex">#1E1C18</span> <span class="sw__role">· panels, cards</span></span></button>- <button class="sw" data-hex="#26231E"><span class="sw__chip" style="background:#26231E"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceRaised</span><span class="sw__hex">#26231E</span> <span class="sw__role">· transport, chips</span></span></button>- <button class="sw" data-hex="#2E2B24"><span class="sw__chip" style="background:#2E2B24"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceHover</span><span class="sw__hex">#2E2B24</span> <span class="sw__role">· hover</span></span></button>- <button class="sw" data-hex="#332F27"><span class="sw__chip" style="background:#332F27"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceActive</span><span class="sw__hex">#332F27</span> <span class="sw__role">· pressed</span></span></button>- <button class="sw" data-hex="#24D8A03D"><span class="sw__chip alpha"><i style="background:#24D8A03D"></i></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceSelected</span><span class="sw__hex">#24D8A03D</span> <span class="sw__role">· 14% brass</span></span></button>+ <button class="sw" data-hex="#100F0D" data-paper="#E4DFD1"><span class="sw__chip" style="background:var(--bg-sunken)"></span><span class="sw__meta"><span class="sw__key">Brush.BgSunken</span><span class="sw__hex">#100F0D</span> <span class="sw__role">· wells, lanes, chrome</span></span></button>+ <button class="sw" data-hex="#171613" data-paper="#EFEADE"><span class="sw__chip" style="background:var(--bg-app)"></span><span class="sw__meta"><span class="sw__key">Brush.BgApp</span><span class="sw__hex">#171613</span> <span class="sw__role">· app ground</span></span></button>+ <button class="sw" data-hex="#191814" data-paper="#E9E4D6"><span class="sw__chip" style="background:var(--lane-b)"></span><span class="sw__meta"><span class="sw__key">Brush.LaneB</span><span class="sw__hex">#191814</span> <span class="sw__role">· lane alternation</span></span></button>+ <button class="sw" data-hex="#1E1C18" data-paper="#F8F5EC"><span class="sw__chip" style="background:var(--surface-card)"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceCard</span><span class="sw__hex">#1E1C18</span> <span class="sw__role">· panels, cards</span></span></button>+ <button class="sw" data-hex="#26231E" data-paper="#FFFEF8"><span class="sw__chip" style="background:var(--surface-raised)"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceRaised</span><span class="sw__hex">#26231E</span> <span class="sw__role">· transport, chips</span></span></button>+ <button class="sw" data-hex="#2E2B24" data-paper="#E7E1D0"><span class="sw__chip" style="background:var(--surface-hover)"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceHover</span><span class="sw__hex">#2E2B24</span> <span class="sw__role">· hover</span></span></button>+ <button class="sw" data-hex="#332F27" data-paper="#DBD4C0"><span class="sw__chip" style="background:var(--surface-active)"></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceActive</span><span class="sw__hex">#332F27</span> <span class="sw__role">· pressed</span></span></button>+ <button class="sw" data-hex="#24D8A03D" data-paper="#24A87415"><span class="sw__chip alpha"><i style="background:var(--accent-subtle)"></i></span><span class="sw__meta"><span class="sw__key">Brush.SurfaceSelected</span><span class="sw__hex">#24D8A03D</span> <span class="sw__role">· 14% brass</span></span></button></div><h3>Text</h3><div class="swatches">- <button class="sw" data-hex="#E9E4D8"><span class="sw__chip" style="background:#E9E4D8"></span><span class="sw__meta"><span class="sw__key">Brush.TextPrimary</span><span class="sw__hex">#E9E4D8</span> <span class="sw__role">· warm off-white</span></span></button>- <button class="sw" data-hex="#A39D8F"><span class="sw__chip" style="background:#A39D8F"></span><span class="sw__meta"><span class="sw__key">Brush.TextSecondary</span><span class="sw__hex">#A39D8F</span> <span class="sw__role">· labels, captions</span></span></button>- <button class="sw" data-hex="#6E6A5E"><span class="sw__chip" style="background:#6E6A5E"></span><span class="sw__meta"><span class="sw__key">Brush.TextTertiary</span><span class="sw__hex">#6E6A5E</span> <span class="sw__role">· section labels</span></span></button>- <button class="sw" data-hex="#4A463D"><span class="sw__chip" style="background:#4A463D"></span><span class="sw__meta"><span class="sw__key">Brush.TextDisabled</span><span class="sw__hex">#4A463D</span> <span class="sw__role">· disabled</span></span></button>- <button class="sw" data-hex="#171613"><span class="sw__chip" style="background:#171613"></span><span class="sw__meta"><span class="sw__key">Brush.TextOnAccent</span><span class="sw__hex">#171613</span> <span class="sw__role">· ink on brass</span></span></button>+ <button class="sw" data-hex="#E9E4D8" data-paper="#241F17"><span class="sw__chip" style="background:var(--text-primary)"></span><span class="sw__meta"><span class="sw__key">Brush.TextPrimary</span><span class="sw__hex">#E9E4D8</span> <span class="sw__role">· warm off-white</span></span></button>+ <button class="sw" data-hex="#A39D8F" data-paper="#5E5849"><span class="sw__chip" style="background:var(--text-secondary)"></span><span class="sw__meta"><span class="sw__key">Brush.TextSecondary</span><span class="sw__hex">#A39D8F</span> <span class="sw__role">· labels, captions</span></span></button>+ <button class="sw" data-hex="#6E6A5E" data-paper="#8A8474"><span class="sw__chip" style="background:var(--text-tertiary)"></span><span class="sw__meta"><span class="sw__key">Brush.TextTertiary</span><span class="sw__hex">#6E6A5E</span> <span class="sw__role">· section labels</span></span></button>+ <button class="sw" data-hex="#4A463D" data-paper="#ADA694"><span class="sw__chip" style="background:var(--text-disabled)"></span><span class="sw__meta"><span class="sw__key">Brush.TextDisabled</span><span class="sw__hex">#4A463D</span> <span class="sw__role">· disabled</span></span></button>+ <button class="sw" data-hex="#171613" data-paper="#FFFBF2"><span class="sw__chip" style="background:var(--text-on-accent)"></span><span class="sw__meta"><span class="sw__key">Brush.TextOnAccent</span><span class="sw__hex">#171613</span> <span class="sw__role">· ink on brass</span></span></button></div><h3>Borders & grid</h3><div class="swatches">- <button class="sw" data-hex="#2C2923"><span class="sw__chip" style="background:#2C2923"></span><span class="sw__meta"><span class="sw__key">Brush.BorderDefault</span><span class="sw__hex">#2C2923</span> <span class="sw__role">· panel separation</span></span></button>- <button class="sw" data-hex="#3A362D"><span class="sw__chip" style="background:#3A362D"></span><span class="sw__meta"><span class="sw__key">Brush.BorderStrong</span><span class="sw__hex">#3A362D</span> <span class="sw__role">· control outlines</span></span></button>- <button class="sw" data-hex="#1F1D18"><span class="sw__chip" style="background:#1F1D18"></span><span class="sw__meta"><span class="sw__key">Brush.GridBeat</span><span class="sw__hex">#1F1D18</span> <span class="sw__role">· beat lines</span></span></button>- <button class="sw" data-hex="#2A2721"><span class="sw__chip" style="background:#2A2721"></span><span class="sw__meta"><span class="sw__key">Brush.GridBar</span><span class="sw__hex">#2A2721</span> <span class="sw__role">· bar lines</span></span></button>+ <button class="sw" data-hex="#2C2923" data-paper="#D5CEBB"><span class="sw__chip" style="background:var(--border-default)"></span><span class="sw__meta"><span class="sw__key">Brush.BorderDefault</span><span class="sw__hex">#2C2923</span> <span class="sw__role">· panel separation</span></span></button>+ <button class="sw" data-hex="#3A362D" data-paper="#BDB5A0"><span class="sw__chip" style="background:var(--border-strong)"></span><span class="sw__meta"><span class="sw__key">Brush.BorderStrong</span><span class="sw__hex">#3A362D</span> <span class="sw__role">· control outlines</span></span></button>+ <button class="sw" data-hex="#1F1D18" data-paper="#DED8C8"><span class="sw__chip" style="background:var(--grid-beat)"></span><span class="sw__meta"><span class="sw__key">Brush.GridBeat</span><span class="sw__hex">#1F1D18</span> <span class="sw__role">· beat lines</span></span></button>+ <button class="sw" data-hex="#2A2721" data-paper="#CFC8B4"><span class="sw__chip" style="background:var(--grid-bar)"></span><span class="sw__meta"><span class="sw__key">Brush.GridBar</span><span class="sw__hex">#2A2721</span> <span class="sw__role">· bar lines</span></span></button></div><h3>Accent & semantic</h3><div class="swatches">- <button class="sw" data-hex="#D8A03D"><span class="sw__chip" style="background:#D8A03D"></span><span class="sw__meta"><span class="sw__key">Brush.Accent</span><span class="sw__hex">#D8A03D</span> <span class="sw__role">· brass</span></span></button>- <button class="sw" data-hex="#E8B24C"><span class="sw__chip" style="background:#E8B24C"></span><span class="sw__meta"><span class="sw__key">Brush.AccentHover</span><span class="sw__hex">#E8B24C</span> <span class="sw__role">· hover</span></span></button>- <button class="sw" data-hex="#F0C060"><span class="sw__chip" style="background:#F0C060"></span><span class="sw__meta"><span class="sw__key">Brush.AccentBright</span><span class="sw__hex">#F0C060</span> <span class="sw__role">· focus, playhead</span></span></button>- <button class="sw" data-hex="#24D8A03D"><span class="sw__chip alpha"><i style="background:#24D8A03D"></i></span><span class="sw__meta"><span class="sw__key">Brush.AccentSubtle</span><span class="sw__hex">#24D8A03D</span> <span class="sw__role">· toggle-on wash</span></span></button>- <button class="sw" data-hex="#58B368"><span class="sw__chip" style="background:#58B368"></span><span class="sw__meta"><span class="sw__key">Brush.Success</span><span class="sw__hex">#58B368</span> <span class="sw__role">· session play</span></span></button>- <button class="sw" data-hex="#D9C34C"><span class="sw__chip" style="background:#D9C34C"></span><span class="sw__meta"><span class="sw__key">Brush.Warning</span><span class="sw__hex">#D9C34C</span> <span class="sw__role">· caution</span></span></button>- <button class="sw" data-hex="#D95F4C"><span class="sw__chip" style="background:#D95F4C"></span><span class="sw__meta"><span class="sw__key">Brush.Danger</span><span class="sw__hex">#D95F4C</span> <span class="sw__role">· record, destructive</span></span></button>- <button class="sw" data-hex="#E4715F"><span class="sw__chip" style="background:#E4715F"></span><span class="sw__meta"><span class="sw__key">Brush.DangerHover</span><span class="sw__hex">#E4715F</span> <span class="sw__role">· hover</span></span></button>+ <button class="sw" data-hex="#D8A03D" data-paper="#A87415"><span class="sw__chip" style="background:var(--accent)"></span><span class="sw__meta"><span class="sw__key">Brush.Accent</span><span class="sw__hex">#D8A03D</span> <span class="sw__role">· brass</span></span></button>+ <button class="sw" data-hex="#E8B24C" data-paper="#8F6110"><span class="sw__chip" style="background:var(--accent-hover)"></span><span class="sw__meta"><span class="sw__key">Brush.AccentHover</span><span class="sw__hex">#E8B24C</span> <span class="sw__role">· hover</span></span></button>+ <button class="sw" data-hex="#F0C060" data-paper="#744D07"><span class="sw__chip" style="background:var(--accent-bright)"></span><span class="sw__meta"><span class="sw__key">Brush.AccentBright</span><span class="sw__hex">#F0C060</span> <span class="sw__role">· focus, playhead</span></span></button>+ <button class="sw" data-hex="#24D8A03D" data-paper="#24A87415"><span class="sw__chip alpha"><i style="background:var(--accent-subtle)"></i></span><span class="sw__meta"><span class="sw__key">Brush.AccentSubtle</span><span class="sw__hex">#24D8A03D</span> <span class="sw__role">· toggle-on wash</span></span></button>+ <button class="sw" data-hex="#58B368" data-paper="#2C7A3E"><span class="sw__chip" style="background:var(--success)"></span><span class="sw__meta"><span class="sw__key">Brush.Success</span><span class="sw__hex">#58B368</span> <span class="sw__role">· session play</span></span></button>+ <button class="sw" data-hex="#D9C34C" data-paper="#837010"><span class="sw__chip" style="background:var(--warning)"></span><span class="sw__meta"><span class="sw__key">Brush.Warning</span><span class="sw__hex">#D9C34C</span> <span class="sw__role">· caution</span></span></button>+ <button class="sw" data-hex="#D95F4C" data-paper="#B03A28"><span class="sw__chip" style="background:var(--danger)"></span><span class="sw__meta"><span class="sw__key">Brush.Danger</span><span class="sw__hex">#D95F4C</span> <span class="sw__role">· record, destructive</span></span></button>+ <button class="sw" data-hex="#E4715F" data-paper="#C64A36"><span class="sw__chip" style="background:var(--danger-hover)"></span><span class="sw__meta"><span class="sw__key">Brush.DangerHover</span><span class="sw__hex">#E4715F</span> <span class="sw__role">· hover</span></span></button></div><div class="note" style="margin-top:20px">@@ -823,7 +886,7 @@ footer {<div class="specimen"><span class="specimen__label">Inputs sit in a sunken well; focus borders brass</span><input class="field" type="text" placeholder="Search devices…" aria-label="Search devices">- <label class="cbx cbx--on"><span class="cbx__box"><svg width="9" height="7" viewBox="0 0 9 7" fill="none" aria-hidden="true"><path d="M0 3.5 L3.2 6.7 L9 0" stroke="#171613" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/></svg></span>Normalize</label>+ <label class="cbx cbx--on"><span class="cbx__box"><svg width="9" height="7" viewBox="0 0 9 7" fill="none" aria-hidden="true"><path d="M0 3.5 L3.2 6.7 L9 0" stroke="var(--text-on-accent)" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/></svg></span>Normalize</label><label class="cbx"><span class="cbx__box"></span>Dither</label></div><div class="specimen" style="margin-top:10px">@@ -862,21 +925,21 @@ footer {<p>Custom-drawn views — arrangement, piano roll, waveform — sit on <code>Brush.BgSunken</code> and carry the accent family. Grid lines stay under ~12% contrast against the lane so they read as structure, never as content.</p><div class="lane-demo" aria-hidden="true">- <div class="lane"><span class="clip" style="left:12px;width:150px;background:#C99C55">Drums</span><span class="clip" style="left:184px;width:96px;background:#C99C55">Fill</span></div>- <div class="lane"><span class="clip" style="left:52px;width:210px;background:#5B9E9C">Bass</span></div>- <div class="lane"><span class="clip" style="left:92px;width:170px;background:#9B7FA6">Keys</span><span class="playhead" style="left:196px"></span></div>+ <div class="lane"><span class="clip" style="left:12px;width:150px;background:var(--track-2)">Drums</span><span class="clip" style="left:184px;width:96px;background:var(--track-2)">Fill</span></div>+ <div class="lane"><span class="clip" style="left:52px;width:210px;background:var(--track-5)">Bass</span></div>+ <div class="lane"><span class="clip" style="left:92px;width:170px;background:var(--track-7)">Keys</span><span class="playhead" style="left:196px"></span></div></div><div class="tablewrap" style="margin-top:16px"><table><thead><tr><th>Element</th><th>Token</th><th>Value</th></tr></thead><tbody>- <tr><td class="d">Lane ground</td><td class="k">Brush.BgApp / Brush.LaneB</td><td class="v">#171613 / #191814</td></tr>- <tr><td class="d">Beat lines</td><td class="k">Brush.GridBeat</td><td class="v">#1F1D18</td></tr>- <tr><td class="d">Bar lines</td><td class="k">Brush.GridBar</td><td class="v">#2A2721</td></tr>+ <tr><td class="d">Lane ground</td><td class="k">Brush.BgApp / Brush.LaneB</td><td class="v">#171613 / #191814 · paper #EFEADE / #E9E4D6</td></tr>+ <tr><td class="d">Beat lines</td><td class="k">Brush.GridBeat</td><td class="v">#1F1D18 · paper #DED8C8</td></tr>+ <tr><td class="d">Bar lines</td><td class="k">Brush.GridBar</td><td class="v">#2A2721 · paper #CFC8B4</td></tr><tr><td class="d">Clip radius</td><td class="k">Radius.Clip</td><td class="v">4</td></tr>- <tr><td class="d">Playhead, selected note</td><td class="k">Brush.AccentBright</td><td class="v">#F0C060</td></tr>- <tr><td class="d">Waveform, MIDI note</td><td class="k">Brush.Accent</td><td class="v">#D8A03D</td></tr>+ <tr><td class="d">Playhead, selected note</td><td class="k">Brush.AccentBright</td><td class="v">#F0C060 · paper #744D07</td></tr>+ <tr><td class="d">Waveform, MIDI note</td><td class="k">Brush.Accent</td><td class="v">#D8A03D · paper #A87415</td></tr></tbody></table></div>@@ -892,17 +955,17 @@ footer {<p>Track colours are assigned round-robin from <code>Brush.Track1..8</code>. They are muted and equal-weight on purpose: no track should look more important than another, and none competes with the brass accent.</p><div class="tracks">- <div class="track"><div class="track__bar" style="background:#C4756A"></div><div class="track__body"><div class="track__name">Track 1 · rust</div><div class="track__hex">#C4756A</div></div></div>- <div class="track"><div class="track__bar" style="background:#C99C55"></div><div class="track__body"><div class="track__name">Track 2 · amber</div><div class="track__hex">#C99C55</div></div></div>- <div class="track"><div class="track__bar" style="background:#9BA65D"></div><div class="track__body"><div class="track__name">Track 3 · olive</div><div class="track__hex">#9BA65D</div></div></div>- <div class="track"><div class="track__bar" style="background:#6FA383"></div><div class="track__body"><div class="track__name">Track 4 · sage</div><div class="track__hex">#6FA383</div></div></div>- <div class="track"><div class="track__bar" style="background:#5B9E9C"></div><div class="track__body"><div class="track__name">Track 5 · teal</div><div class="track__hex">#5B9E9C</div></div></div>- <div class="track"><div class="track__bar" style="background:#6D8FB5"></div><div class="track__body"><div class="track__name">Track 6 · slate</div><div class="track__hex">#6D8FB5</div></div></div>- <div class="track"><div class="track__bar" style="background:#9B7FA6"></div><div class="track__body"><div class="track__name">Track 7 · mauve</div><div class="track__hex">#9B7FA6</div></div></div>- <div class="track"><div class="track__bar" style="background:#B57286"></div><div class="track__body"><div class="track__name">Track 8 · rose</div><div class="track__hex">#B57286</div></div></div>- <div class="track"><div class="track__bar" style="background:#7C88A0"></div><div class="track__body"><div class="track__name">Return A</div><div class="track__hex">#7C88A0</div></div></div>- <div class="track"><div class="track__bar" style="background:#A08A7C"></div><div class="track__body"><div class="track__name">Return B</div><div class="track__hex">#A08A7C</div></div></div>- <div class="track"><div class="track__bar" style="background:#D8A03D"></div><div class="track__body"><div class="track__name">Master</div><div class="track__hex">#D8A03D</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-1)"></div><div class="track__body"><div class="track__name">Track 1 · rust</div><div class="track__hex">#C4756A</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-2)"></div><div class="track__body"><div class="track__name">Track 2 · amber</div><div class="track__hex">#C99C55</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-3)"></div><div class="track__body"><div class="track__name">Track 3 · olive</div><div class="track__hex">#9BA65D</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-4)"></div><div class="track__body"><div class="track__name">Track 4 · sage</div><div class="track__hex">#6FA383</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-5)"></div><div class="track__body"><div class="track__name">Track 5 · teal</div><div class="track__hex">#5B9E9C</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-6)"></div><div class="track__body"><div class="track__name">Track 6 · slate</div><div class="track__hex">#6D8FB5</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-7)"></div><div class="track__body"><div class="track__name">Track 7 · mauve</div><div class="track__hex">#9B7FA6</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--track-8)"></div><div class="track__body"><div class="track__name">Track 8 · rose</div><div class="track__hex">#B57286</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--return-a)"></div><div class="track__body"><div class="track__name">Return A</div><div class="track__hex">#7C88A0</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--return-b)"></div><div class="track__body"><div class="track__name">Return B</div><div class="track__hex">#A08A7C</div></div></div>+ <div class="track"><div class="track__bar" style="background:var(--accent)"></div><div class="track__body"><div class="track__name">Master</div><div class="track__hex">#D8A03D</div></div></div></div><p style="margin-top:14px;font-size:12.5px">Track 5 (teal) doubles as the modulation accent in custom-drawn views. Master reuses the brass accent — the master strip is the one channel that <em>should</em> read as primary.</p></section>@@ -934,7 +997,7 @@ footer {<span class="ca-seclabel">LIVE</span><span class="ca-slider"><b>FREQ</b><span class="ca-track"><i style="width:58%;background:var(--accent)"></i><span class="ca-thumb" style="left:58%"></span></span><span class="ca-val">1.2 kHz</span></span><span class="ca-slider"><b>RES</b><span class="ca-track"><i style="width:34%;background:var(--accent)"></i><span class="ca-thumb" style="left:34%"></span></span><span class="ca-val">0.34</span></span>- <span class="ca-slider"><b>LFO</b><span class="ca-track"><i style="width:45%;background:#5B9E9C"></i><span class="ca-thumb" style="left:45%"></span></span><span class="ca-val">2.0 Hz</span></span>+ <span class="ca-slider"><b>LFO</b><span class="ca-track"><i style="width:45%;background:var(--track-5)"></i><span class="ca-thumb" style="left:45%"></span></span><span class="ca-val">2.0 Hz</span></span></div><div class="ca-body">@@ -947,9 +1010,9 @@ footer {<div class="knobcell"><figure><svg viewBox="0 0 38 38" width="38" height="38" aria-hidden="true">- <path d="M7.69 30.31 A16 16 0 1 1 30.31 30.31" fill="none" stroke="#100F0D" stroke-width="3.52" stroke-linecap="round"/>- <path d="M7.69 30.31 A16 16 0 0 1 27.57 5.49" fill="none" stroke="#D8A03D" stroke-width="3.52" stroke-linecap="round"/>- <line x1="19" y1="19" x2="24.66" y2="10.08" stroke="#E9E4D8" stroke-width="2" stroke-linecap="round"/>+ <path d="M7.69 30.31 A16 16 0 1 1 30.31 30.31" fill="none" stroke="var(--bg-sunken)" stroke-width="3.52" stroke-linecap="round"/>+ <path d="M7.69 30.31 A16 16 0 0 1 27.57 5.49" fill="none" stroke="var(--accent)" stroke-width="3.52" stroke-linecap="round"/>+ <line x1="19" y1="19" x2="24.66" y2="10.08" stroke="var(--text-primary)" stroke-width="2" stroke-linecap="round"/></svg></figure><span class="kv">1.2k</span><span class="kl">Freq</span>@@ -957,9 +1020,9 @@ footer {<div class="knobcell"><figure><svg viewBox="0 0 38 38" width="38" height="38" aria-hidden="true">- <path d="M7.69 30.31 A16 16 0 1 1 30.31 30.31" fill="none" stroke="#100F0D" stroke-width="3.52" stroke-linecap="round"/>- <path d="M7.69 30.31 A16 16 0 0 1 8.61 6.83" fill="none" stroke="#3A362D" stroke-width="3.52" stroke-linecap="round"/>- <line x1="19" y1="19" x2="12.14" y2="10.97" stroke="#E9E4D8" stroke-width="2" stroke-linecap="round"/>+ <path d="M7.69 30.31 A16 16 0 1 1 30.31 30.31" fill="none" stroke="var(--bg-sunken)" stroke-width="3.52" stroke-linecap="round"/>+ <path d="M7.69 30.31 A16 16 0 0 1 8.61 6.83" fill="none" stroke="var(--border-strong)" stroke-width="3.52" stroke-linecap="round"/>+ <line x1="19" y1="19" x2="12.14" y2="10.97" stroke="var(--text-primary)" stroke-width="2" stroke-linecap="round"/></svg></figure><span class="kv">0.35</span><span class="kl">Res</span>@@ -969,9 +1032,9 @@ footer {<div class="knobcell" style="width:46px"><figure><svg viewBox="0 0 38 38" width="38" height="38" aria-hidden="true">- <path d="M7.69 30.31 A16 16 0 1 1 30.31 30.31" fill="none" stroke="#100F0D" stroke-width="3.52" stroke-linecap="round"/>- <path d="M7.69 30.31 A16 16 0 1 1 34.80 16.50" fill="none" stroke="#5B9E9C" stroke-width="3.52" stroke-linecap="round"/>- <line x1="19" y1="19" x2="29.43" y2="17.35" stroke="#E9E4D8" stroke-width="2" stroke-linecap="round"/>+ <path d="M7.69 30.31 A16 16 0 1 1 30.31 30.31" fill="none" stroke="var(--bg-sunken)" stroke-width="3.52" stroke-linecap="round"/>+ <path d="M7.69 30.31 A16 16 0 1 1 34.80 16.50" fill="none" stroke="var(--track-5)" stroke-width="3.52" stroke-linecap="round"/>+ <line x1="19" y1="19" x2="29.43" y2="17.35" stroke="var(--text-primary)" stroke-width="2" stroke-linecap="round"/></svg></figure><span class="kv" style="font-size:7px">80%</span><span class="kl" style="font-size:7px">Amount</span>@@ -988,7 +1051,7 @@ footer {<div class="ca-legend"><span><i style="background:var(--accent)"></i> Brass — audio path</span>- <span><i style="background:#5B9E9C"></i> Teal — modulation & detection</span>+ <span><i style="background:var(--track-5)"></i> Teal — modulation & detection</span><span><i style="background:var(--border-strong)"></i> Muted — output rail</span><span><i style="background:var(--success)"></i> Green — signal present</span></div>@@ -1220,14 +1283,13 @@ footer {<table><thead><tr><th>Item</th><th>Status</th></tr></thead><tbody>- <tr><td class="d">The <code>nota-design</code> agent skill</td><td class="d"><strong style="color:var(--danger)">Stale.</strong> It still documents a cool-slate palette with a cyan accent (<code>#1690B2</code>) from an earlier direction. The theme file is authoritative; the skill needs rewriting to match this page.</td></tr>+ <tr><td class="d">The <code>nota-design</code> agent skill</td><td class="d">Rewritten to point at the theme files rather than restate values — the earlier copy had drifted to a cool-slate palette with a cyan accent. Now current for both variants.</td></tr><tr><td class="d">Custom title bar</td><td class="d">Not built. The OS title bar is still in use; the status bar carries the chrome identity until a frameless 40px bar lands.</td></tr><tr><td class="d">Display face</td><td class="d">Inter is bundled as a stand-in for Geist. Swap <code>Font.UI</code> once Geist ships with the app.</td></tr><tr><td class="d"><code>Space.*</code> tokens</td><td class="d">Do not exist. The 4px grid is honoured by convention only.</td></tr>- <tr><td class="d">Two palette files</td><td class="d"><code>NotaTheme.axaml</code> and <code>NotaPalette.cs</code> must be edited together — nothing enforces it.</td></tr>- <tr><td class="d">Hardcoded hex in card bodies</td><td class="d"><strong style="color:var(--warning)">628 literal hex values</strong> across <code>DeviceCards/</code> and <code>Controls/</code>. The “never hardcode a colour” rule holds in XAML but has largely not held in the custom-drawn layer.</td></tr>- <tr><td class="d">Undeclared surfaces</td><td class="d"><code>#1B1916</code> (rail) and <code>#221F1A</code> (graph border) behave like tokens but are not declared anywhere.</td></tr>- <tr><td class="d"><code>AccentSubtle</code> alpha</td><td class="d">The theme defines <code>#24D8A03D</code>; <code>DeviceCardKit.AccentSubtleB</code> uses <code>#28D8A03D</code>. Two slightly different washes ship side by side.</td></tr>+ <tr><td class="d">Two palette files</td><td class="d"><code>NotaTheme.axaml</code> and <code>NotaPalette.cs</code> must be edited together — nothing enforces it. Each token now carries two values, so one colour change is four edits: the Dark and Light dictionaries, the palette slot, and this page.</td></tr>+ <tr><td class="d">Ink hues are derived</td><td class="d">A one-off device hue (<code>NotaPalette.Ink</code>) gets its Ember Paper counterpart from a lightness reflection rather than an authored value. Most land well; pin the ones that do not in <code>NotaPalette.InkOverrides</code> instead of reaching for a literal.</td></tr>+ <tr><td class="d">Stored colours</td><td class="d">Tag swatches, Strata layer hues and Drum Rack kit dots are <em>data</em>, not tokens — they stay hex in source and are re-tinted through <code>Ink()</code> at the point of use.</td></tr><tr><td class="d">Mockup typography</td><td class="d">The mockups specify Geist and Geist Mono throughout. The app substitutes Inter and the Cascadia/Menlo/Consolas stack, so weights sit slightly differently than the source designs.</td></tr></tbody></table>@@ -1235,7 +1297,7 @@ footer {</section><footer>- Nota · Ember Graphite. Generated from <code>Theme/NotaTheme.axaml</code> and <code>Theme/NotaPalette.cs</code>. When this page and those files disagree, the files win — and this page is wrong.+ Nota · Ember Graphite & Ember Paper. Generated from <code>Theme/NotaTheme.axaml</code> and <code>Theme/NotaPalette.cs</code>. When this page and those files disagree, the files win — and this page is wrong.</footer></main>@@ -1245,7 +1307,8 @@ footer {(function () {document.querySelectorAll(".sw").forEach(function (sw) {sw.addEventListener("click", function () {- var hex = sw.getAttribute("data-hex") || "";+ var paper = document.documentElement.getAttribute("data-variant") === "paper";+ var hex = (paper ? sw.getAttribute("data-paper") : sw.getAttribute("data-hex")) || "";var done = function () {sw.classList.add("copied");var el = sw.querySelector(".sw__hex");@@ -1261,5 +1324,25 @@ footer {} catch (e) { /* clipboard unavailable — the swatch still shows its hex */ }});});++ // Variant toggle. Flipping data-variant re-tints every specimen through the+ // tokens; the swatch labels carry both hexes and swap with it.+ var root = document.documentElement;+ function setVariant(name) {+ if (name === "paper") root.setAttribute("data-variant", "paper");+ else root.removeAttribute("data-variant");+ document.querySelectorAll(".variant button").forEach(function (b) {+ b.setAttribute("aria-pressed", String(b.getAttribute("data-set") === name));+ });+ document.querySelectorAll(".sw").forEach(function (sw) {+ var hex = name === "paper" ? sw.getAttribute("data-paper") : sw.getAttribute("data-hex");+ if (!hex) return;+ var el = sw.querySelector(".sw__hex");+ if (el) el.textContent = hex;+ });+ }+ document.querySelectorAll(".variant button").forEach(function (b) {+ b.addEventListener("click", function () { setVariant(b.getAttribute("data-set")); });+ });})();</script>diff --git a/DESIGN.md b/DESIGN.mdindex b12edbd7..8843b353 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -1,10 +1,19 @@<!-- SPDX-License-Identifier: AGPL-3.0-only --><!-- Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms. -->-# Nota design guideline — Ember Graphite+# Nota design guideline — Ember-Nota's UI runs on **Ember Graphite**: warm graphite neutrals (hue ~40°) lit by a single-brass accent. It is dark-only by intent — a DAW is used in dark rooms for long sessions.+Nota's UI runs on **Ember**, one system in two variants:++- **Ember Graphite** (dark, the default) — warm graphite neutrals (hue ~40°) lit by a+ single brass accent. A DAW is used in dark rooms for long sessions, so this is what+ the app ships with.+- **Ember Paper** (light) — the same hue family and the same roles on a warm paper+ ground. Brass darkens to bronze: against paper a mark needs *less* lightness, not+ more, to carry the emphasis it had against graphite.++Preferences → Appearance offers Ember Graphite / Ember Paper / System. The choice applies+live — no restart — and System follows the OS appearance as it changes.**[→ Open `DESIGN.html`](DESIGN.html) for the visual reference.** That page renders everyswatch, control specimen and card layout at true size in the real palette, and is the@@ -17,11 +26,42 @@ rules, the token values, and what to do when they disagree.|---|---|---|| 1 | `src/managed/Nota.App/Theme/NotaTheme.axaml` | **Definitive.** Colour, geometry and control styles. || 2 | `src/managed/Nota.App/Theme/NotaPalette.cs` | Mirror of (1) for custom-drawn views that cannot resolve XAML resources cheaply. Must stay in sync by hand. |-| 3 | `src/managed/Nota.App/DeviceCardKit.cs` | Palette aliases and the atomic builders for device cards. |-| 4 | `DESIGN.html` / this file | Documentation. If these disagree with 1–3, **these are wrong** — fix them. |+| 3 | `src/managed/Nota.App/Theme/NotaThemeService.cs` | Applies a variant to both layers and repaints. |+| 4 | `src/managed/Nota.App/DeviceCardKit.cs` | Palette aliases and the atomic builders for device cards. |+| 5 | `DESIGN.html` / this file | Documentation. If these disagree with 1–4, **these are wrong** — fix them. |**Never hardcode a colour or size in a view.** In XAML use `{DynamicResource Brush.*}` /`{StaticResource Radius.*}`. In custom-drawn C# read from `NotaPalette` or `DeviceCardKit`.+A literal is not just off-palette — it is stuck in one variant.++## How theming works++The colour tokens in `NotaTheme.axaml` live in `ResourceDictionary.ThemeDictionaries`+under `Dark` and `Light`, so **`{DynamicResource Brush.*}` is mandatory** — a+`StaticResource` cannot follow the variant. Geometry, fonts and control heights are+variant-independent and stay in the shared dictionary as `StaticResource`.++`NotaPalette` serves the custom-drawn layer. Each token is a **slot**: one long-lived+`SolidColorBrush` whose `Color` is re-pointed on a variant change. Views (and the private+`static readonly` fields that alias them) keep the same brush object, so nothing has to be+rebuilt. Three ways to get a colour:++| Call | For | Light value |+|---|---|---|+| `NotaPalette.SurfaceCard` | a named token | authored by hand |+| `NotaPalette.Wash(slot, 0x24)` | a translucent tint of a token | tracks its source slot |+| `NotaPalette.Ink("#D06FB0")` | the identity hue of one visualiser, band or stored tag | derived (same hue, lightness reflected), or pinned in `InkOverrides` |++Two shapes cannot ride a slot and need care:++- **`Color` values.** A `static readonly Color` snapshots the variant. Declare it as an+ expression-bodied property (`static Color X => NotaPalette.Accent.Color;`).+- **Gradients.** `LinearGradientBrush` copies its stop colours. Build one with+ `NotaPalette.VGradient(...)`, and only ever into a `static` field — the registration+ that re-tints it is permanent.++Anything a view derives itself — per-index clip brushes, alpha-blended track fills — must+be dropped on `NotaPalette.Changed`.## The rules@@ -55,43 +95,51 @@ rules, the token values, and what to do when they disagree.### Surfaces-| Key | Value | Use |-|---|---|---|-| `Brush.BgSunken` | `#100F0D` | Wells, lanes, graph grounds, chrome |-| `Brush.BgApp` | `#171613` | App ground |-| `Brush.LaneB` | `#191814` | Lane alternation |-| `Brush.SurfaceCard` | `#1E1C18` | Panels, cards |-| `Brush.SurfaceRaised` | `#26231E` | Transport, chips, device cards |-| `Brush.SurfaceHover` | `#2E2B24` | Hover |-| `Brush.SurfaceActive` | `#332F27` | Pressed |-| `Brush.SurfaceSelected` | `#24D8A03D` | Selection (14% brass) |+| Key | Graphite | Paper | Use |+|---|---|---|---|+| `Brush.BgSunken` | `#100F0D` | `#E4DFD1` | Wells, lanes, graph grounds, chrome |+| `Brush.BgApp` | `#171613` | `#EFEADE` | App ground |+| `Brush.LaneB` | `#191814` | `#E9E4D6` | Lane alternation |+| `Brush.SurfaceCard` | `#1E1C18` | `#F8F5EC` | Panels, cards |+| `Brush.SurfaceRaised` | `#26231E` | `#FFFEF8` | Transport, chips, device cards |+| `Brush.SurfaceHover` | `#2E2B24` | `#E7E1D0` | Hover |+| `Brush.SurfaceActive` | `#332F27` | `#DBD4C0` | Pressed |+| `Brush.SurfaceSelected` | `#24D8A03D` | `#2EA87415` | Selection (accent wash) |++Forward still means lighter in both variants, and a well is still darker than the surface+it sits in. Hover is the one role that flips direction: it lifts on graphite and settles+on paper.### Text and borders-| Key | Value | Use |-|---|---|---|-| `Brush.TextPrimary` | `#E9E4D8` | Warm off-white |-| `Brush.TextSecondary` | `#A39D8F` | Labels, captions |-| `Brush.TextTertiary` | `#6E6A5E` | Section labels |-| `Brush.TextDisabled` | `#4A463D` | Disabled |-| `Brush.TextOnAccent` | `#171613` | Ink on brass |-| `Brush.BorderDefault` | `#2C2923` | Panel separation |-| `Brush.BorderStrong` | `#3A362D` | Control outlines |-| `Brush.GridBeat` | `#1F1D18` | Beat lines |-| `Brush.GridBar` | `#2A2721` | Bar lines |+| Key | Graphite | Paper | Use |+|---|---|---|---|+| `Brush.TextPrimary` | `#E9E4D8` | `#241F17` | Warm off-white / warm near-black |+| `Brush.TextSecondary` | `#A39D8F` | `#5E5849` | Labels, captions |+| `Brush.TextTertiary` | `#6E6A5E` | `#8A8474` | Section labels |+| `Brush.TextDisabled` | `#4A463D` | `#ADA694` | Disabled |+| `Brush.TextOnAccent` | `#171613` | `#FFFBF2` | Ink on the accent fill |+| `Brush.BorderDefault` | `#2C2923` | `#D5CEBB` | Panel separation |+| `Brush.BorderStrong` | `#3A362D` | `#BDB5A0` | Control outlines |+| `Brush.GridBeat` | `#1F1D18` | `#DED8C8` | Beat lines |+| `Brush.GridBar` | `#2A2721` | `#CFC8B4` | Bar lines |### Accent and semantic-| Key | Value | Use |-|---|---|---|-| `Brush.Accent` | `#D8A03D` | Brass — the audio path |-| `Brush.AccentHover` | `#E8B24C` | Hover on solid fills |-| `Brush.AccentBright` | `#F0C060` | Focus ring, playhead, selected note |-| `Brush.AccentSubtle` | `#24D8A03D` | Toggle-on wash |-| `Brush.Success` | `#58B368` | Signal present, Session play |-| `Brush.Warning` | `#D9C34C` | Meter caution zone |-| `Brush.Danger` | `#D95F4C` | Record, destructive |-| `Brush.DangerHover` | `#E4715F` | Hover |+| Key | Graphite | Paper | Use |+|---|---|---|---|+| `Brush.Accent` | `#D8A03D` | `#A87415` | Brass / bronze — the audio path |+| `Brush.AccentHover` | `#E8B24C` | `#8F6110` | Hover on solid fills |+| `Brush.AccentBright` | `#F0C060` | `#744D07` | Focus ring, playhead, selected note |+| `Brush.AccentSubtle` | `#24D8A03D` | `#24A87415` | Toggle-on wash |+| `Brush.Success` | `#58B368` | `#2C7A3E` | Signal present, Session play |+| `Brush.Warning` | `#D9C34C` | `#837010` | Meter caution zone |+| `Brush.Danger` | `#D95F4C` | `#B03A28` | Record, destructive |+| `Brush.DangerHover` | `#E4715F` | `#C64A36` | Hover |++The accent ramp reads "more prominent" downward on paper and upward on graphite:+`AccentBright` is the hottest mark in both, which means the *lightest* on graphite and the+*darkest* on paper.Fluent's `SystemAccentColor` and its six ramps are retinted to brass, so stock Avaloniacontrols match instead of shipping default blue.@@ -104,10 +152,16 @@ controls match instead of shipping default blue.### Track palette-Assigned round-robin, muted and equal-weight so no track outranks another:-`#C4756A` rust · `#C99C55` amber · `#9BA65D` olive · `#6FA383` sage · `#5B9E9C` teal ·-`#6D8FB5` slate · `#9B7FA6` mauve · `#B57286` rose.-Returns `#7C88A0` / `#A08A7C`; master reuses brass.+Assigned round-robin, muted and equal-weight so no track outranks another. Paper keeps+the eight hues and darkens them, so a clip's full-strength content still reads over a 16%+fill of itself:++| | rust | amber | olive | sage | teal | slate | mauve | rose |+|---|---|---|---|---|---|---|---|---|+| Graphite | `#C4756A` | `#C99C55` | `#9BA65D` | `#6FA383` | `#5B9E9C` | `#6D8FB5` | `#9B7FA6` | `#B57286` |+| Paper | `#9A4A3E` | `#97682A` | `#646E32` | `#42765A` | `#2F7472` | `#3E6288` | `#6A5176` | `#86465B` |++Returns `#7C88A0` / `#A08A7C` (paper `#4D5972` / `#705B4E`); master reuses the accent.Track 5 (teal, `#5B9E9C`) doubles as the **modulation accent** — see below.@@ -146,9 +200,9 @@ strategy sets `FullBleed`.This carries the most meaning and is the easiest to get wrong:-- **Brass `#D8A03D` = the audio path.** Anything the signal passes through — gain,+- **Brass `Brush.Accent` = the audio path.** Anything the signal passes through — gain,frequency, drive, mix. On a knob: `Accent = true`.-- **Teal `#5B9E9C` = modulation and detection.** Anything that *controls* rather than+- **Teal `NotaPalette.Teal` = modulation and detection.** Anything that *controls* rather thancarries the signal — LFOs, envelopes, sidechain detectors, followers. Pass it as theknob's `ArcColor`, and group those parameters behind a 2px teal left border with a tealsection label.@@ -202,7 +256,7 @@ Every value control behaves identically — match this exactly when adding one:## Visualisers~40 custom-drawn views in `Controls/`. The rule: **a device draws the thing it does**, not-a generic graph. Shared ground is `Brush.BgSunken` with a `#221F1A` inner border.+a generic graph. Shared ground is `Brush.BgSunken` with a `NotaPalette.GraphBorder` inner border.Families: transfer curves (`AmpCurve`, `CompTransfer`, `VintageViz`) · frequency response(`AutoFilterCurve`, `DynamicEqCurve`, `EqCurve`) · spectra (`AmpHarmonics`,@@ -229,15 +283,21 @@ L, Return) always reach the window instead of a focused control.Things that are true today and should not surprise you:-- **628 hardcoded hex literals** across `DeviceCards/` and `Controls/`. The "never- hardcode" rule holds in XAML but has largely not held in the custom-drawn layer.-- **`#1B1916`** (rail background, 36 files) and **`#221F1A`** (graph border, 22 files)- behave like tokens but are declared nowhere. They should be promoted.-- **`AccentSubtle` disagrees with itself** — `#24D8A03D` in the theme, `#28D8A03D` in- `DeviceCardKit.AccentSubtleB`.+- **The hex literals are gone.** The custom-drawn layer used to carry ~970 of them; they+ now route through `NotaPalette` (`#1B1916` → `SurfaceInset`, `#221F1A` → `GraphBorder`,+ and so on). What remains as a literal is *data*: the tag-colour swatches in+ `TagEditorWindow`, the layer hues in `StrataDeviceBody`, the kit-voice dots in+ `RhythmInstrumentCard` — each resolved through `NotaPalette.Ink()` at use.+- **Ink light values are derived, not authored.** A one-off device hue gets its paper+ counterpart from a lightness reflection. Most land well; pin the ones that don't in+ `NotaPalette.InkOverrides` rather than reaching for a literal.+- **Black stays black.** Drop shadows and the black-key row tint are alpha-over-black in+ both variants — that is correct, not drift.- **No custom title bar.** The OS title bar is still in use; the status bar carries thechrome identity.- **Font substitution.** Mockups specify Geist / Geist Mono; the app ships Inter and theCascadia → Menlo → Consolas stack, so weights sit slightly differently.- **No `Space.*` tokens.** The 4px grid is honoured by convention only.-- **Two palette files** must be edited together and nothing enforces it.+- **Two palette files** must be edited together and nothing enforces it — and each token+ now carries two values, so a change is four edits (`NotaTheme.axaml` Dark + Light,+ `NotaPalette.cs`, this file).diff --git a/src/managed/Nota.App/AboutWindow.cs b/src/managed/Nota.App/AboutWindow.csindex c5d82b1e..a780e5bf 100644--- a/src/managed/Nota.App/AboutWindow.cs+++ b/src/managed/Nota.App/AboutWindow.cs@@ -70,5 +70,5 @@ public sealed class AboutWindow : NotaWindow}private IBrush Brush(string key)- => this.TryFindResource(key, out var v) && v is IBrush b ? b : Brushes.Magenta;+ => (IBrush?)NotaPalette.ByKey(key) ?? Brushes.Magenta;}diff --git a/src/managed/Nota.App/App.axaml b/src/managed/Nota.App/App.axamlindex 141c1632..13899e16 100644--- a/src/managed/Nota.App/App.axaml+++ b/src/managed/Nota.App/App.axaml@@ -1,28 +1,30 @@-<Application xmlns="https://github.com/avaloniaui"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"- x:Class="Nota.App.App"- Name="Nota"- RequestedThemeVariant="Dark">- <!-- Nota is dark-first (see .claude/skills/nota-design). -->-- <!-- macOS application menu (the bold "Nota" menu). Its first item is merged into- the app menu, so About/Settings live there instead of a duplicate "Nota". -->- <NativeMenu.Menu>- <NativeMenu>- <NativeMenuItem Header="Nota">- <NativeMenuItem.Menu>- <NativeMenu>- <NativeMenuItem Header="About Nota" Click="OnAppAbout"/>- <NativeMenuItemSeparator/>- <NativeMenuItem Header="Settings…" Click="OnAppPreferences" Gesture="Cmd+,"/>- </NativeMenu>- </NativeMenuItem.Menu>- </NativeMenuItem>- </NativeMenu>- </NativeMenu.Menu>-- <Application.Styles>- <FluentTheme />- <StyleInclude Source="avares://Nota.App/Theme/NotaTheme.axaml"/>- </Application.Styles>+<Application xmlns="https://github.com/avaloniaui"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ x:Class="Nota.App.App"+ Name="Nota"+ RequestedThemeVariant="Dark">+ <!-- Dark is the default; App.OnFrameworkInitializationCompleted hands the+ real choice (Preferences → Appearance) to NotaThemeService before the+ first window paints. See .claude/skills/nota-design. -->++ <!-- macOS application menu (the bold "Nota" menu). Its first item is merged into+ the app menu, so About/Settings live there instead of a duplicate "Nota". -->+ <NativeMenu.Menu>+ <NativeMenu>+ <NativeMenuItem Header="Nota">+ <NativeMenuItem.Menu>+ <NativeMenu>+ <NativeMenuItem Header="About Nota" Click="OnAppAbout"/>+ <NativeMenuItemSeparator/>+ <NativeMenuItem Header="Settings…" Click="OnAppPreferences" Gesture="Cmd+,"/>+ </NativeMenu>+ </NativeMenuItem.Menu>+ </NativeMenuItem>+ </NativeMenu>+ </NativeMenu.Menu>++ <Application.Styles>+ <FluentTheme />+ <StyleInclude Source="avares://Nota.App/Theme/NotaTheme.axaml"/>+ </Application.Styles></Application>\ No newline at end of filediff --git a/src/managed/Nota.App/App.axaml.cs b/src/managed/Nota.App/App.axaml.csindex 60608169..390e35a0 100644--- a/src/managed/Nota.App/App.axaml.cs+++ b/src/managed/Nota.App/App.axaml.cs@@ -71,6 +71,10 @@ public partial class App : Avalonia.Applicatione.SetObserved();};+ // Palette variant (Preferences → Appearance), applied before the first window+ // paints so nothing flashes graphite on the way to paper.+ NotaThemeService.Set(Services.GetRequiredService<ISettingsService>().Current.Theme);+if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop){// Show the splash immediately, then defer the heavy engine spin-up to adiff --git a/src/managed/Nota.App/ArrangementView.Overview.cs b/src/managed/Nota.App/ArrangementView.Overview.csindex 08106c8f..fcd75b53 100644--- a/src/managed/Nota.App/ArrangementView.Overview.cs+++ b/src/managed/Nota.App/ArrangementView.Overview.cs@@ -134,10 +134,10 @@ public sealed partial class ArrangementView{// 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 = new SolidColorBrush(Color.FromArgb(0x9C, 0x0D, 0x0C, 0x0A));- private static readonly IPen OvFrame = new Pen(new SolidColorBrush(Color.FromArgb(0x99, 0xD8, 0xA0, 0x3D)), 1);- private static readonly IBrush OvHandle = new SolidColorBrush(Color.FromArgb(0xCC, 0xF0, 0xC0, 0x60));- private static readonly IPen OvBarPen = new Pen(new SolidColorBrush(Color.FromArgb(0xC0, 0x2A, 0x27, 0x21)), 1);+ 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);private static readonly IBrush OvEmptyText = NotaPalette.TextDisabled;private static readonly Cursor HandCursor = new(StandardCursorType.Hand);private static readonly Cursor EdgeCursor = new(StandardCursorType.SizeWestEast);@@ -149,7 +149,7 @@ public sealed partial class ArrangementView{var cache = active ? _ovClip : _ovClipOff;if (cache.TryGetValue(colorIndex, out var b)) return b;- b = Alpha(TrackColorForIndex(colorIndex), active ? 0.82 : 0.26);+ b = ClipTint(colorIndex, active ? 0.82 : 0.26);cache[colorIndex] = b;return b;}diff --git a/src/managed/Nota.App/ArrangementView.cs b/src/managed/Nota.App/ArrangementView.csindex fed90ef5..2a8d12bf 100644--- a/src/managed/Nota.App/ArrangementView.cs+++ b/src/managed/Nota.App/ArrangementView.cs@@ -1875,8 +1875,7 @@ public sealed partial class ArrangementView : UserControlflyout.ShowAt(anchor, showAtPointer: true);}- private IBrush Brush(string key)- => this.TryFindResource(key, out var v) && v is IBrush b ? b : Brushes.Magenta;+ private static IBrush Brush(string key) => (IBrush?)NotaPalette.ByKey(key) ?? Brushes.Magenta;// Small bordered "−"/"+" zoom chip (HANDOFF 1b ruler: 11px, bordered, radius 4).private static Button ZoomChip(string text) => new()@@ -1909,61 +1908,61 @@ public sealed partial class ArrangementView : UserControlprivate static readonly Color PlayheadColor = NotaPalette.AccentBrightColor; // Brush.AccentBrightprivate static readonly IBrush PlayheadBrush = new SolidColorBrush(PlayheadColor);private static readonly IPen PlayheadPen = new Pen(PlayheadBrush, 1.5);- private static readonly IPen PlayheadGlow = new Pen(new SolidColorBrush(Color.FromArgb(0x40, 0xF0, 0xC0, 0x60)), 4);+ private static readonly IPen PlayheadGlow = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x40), 4);private static readonly IPen ClipSelBorder = new Pen(PlayheadBrush, 2);- private static readonly IBrush EdgeHighlight = new SolidColorBrush(Color.Parse("#CDEEF8")); // resize-edge affordance- private static readonly IBrush InactiveVeil = new SolidColorBrush(Color.FromArgb(0xB0, 0x12, 0x14, 0x18)); // deactivated-clip scrim+ private static readonly IBrush EdgeHighlight = NotaPalette.MarkerHot; // resize-edge affordance+ private static readonly IBrush InactiveVeil = NotaPalette.Wash(NotaPalette.Veil, 0xB0); // deactivated-clip scrimprivate static readonly IBrush RulerText = NotaPalette.TextSecondary; // Brush.TextSecondary// Drag position tooltip (req 2.9): dark pill + bright text near the cursor.- private static readonly IBrush TooltipBg = new SolidColorBrush(Color.FromArgb(0xDC, 0x18, 0x18, 0x1E));- private static readonly IBrush TooltipText = new SolidColorBrush(Color.Parse("#F0E4C8"));+ private static readonly IBrush TooltipBg = NotaPalette.Wash(NotaPalette.TooltipBg, 0xDC);+ private static readonly IBrush TooltipText = NotaPalette.TooltipText;// Selected-track highlight: just a soft brass wash on the lane row — no edge// lines, so it never fights the grid. Header uses a warm tinted background.- private static readonly IBrush SelWash = new SolidColorBrush(Color.FromArgb(0x20, 0xD8, 0xA0, 0x3D)); // Accent @ ~12%+ private static readonly IBrush SelWash = NotaPalette.Wash(NotaPalette.Accent, 0x20); // Accent @ ~12%// Browser drag-over: the lane the drop would land on glows (bright accent wash + edge).- private static readonly IBrush DropWash = new SolidColorBrush(Color.FromArgb(0x28, 0xF0, 0xC0, 0x60));- private static readonly IBrush DropEdge = new SolidColorBrush(Color.FromArgb(0xC0, 0xF0, 0xC0, 0x60));+ private static readonly IBrush DropWash = NotaPalette.Wash(NotaPalette.AccentBright, 0x28);+ private static readonly IBrush DropEdge = NotaPalette.Wash(NotaPalette.AccentBright, 0xC0);internal int DropTrackIndex = -1; // -1 = no drag over; set by OnLaneDragOver, drawn by LaneControl// In-progress audio take (M-fix): audio clips only materialise on stop, so a// translucent red region grows from the take start to the playhead as feedback.- private static readonly IBrush RecFill = new SolidColorBrush(Color.FromArgb(0x33, 0xD8, 0x56, 0x4B));- private static readonly IPen RecBorder = new Pen(new SolidColorBrush(Color.FromArgb(0xC0, 0xD8, 0x56, 0x4B)), 1.5);- private static readonly IBrush RecText = new SolidColorBrush(Color.Parse("#F0928A"));+ private static readonly IBrush RecFill = NotaPalette.Wash(NotaPalette.Danger, 0x33);+ private static readonly IPen RecBorder = new Pen(NotaPalette.Wash(NotaPalette.Danger, 0xC0), 1.5);+ private static readonly IBrush RecText = NotaPalette.DangerPale;// Live capture waveform inside the growing take region — a brighter red so it// reads clearly against the translucent RecFill.- private static readonly IBrush RecWave = new SolidColorBrush(Color.FromArgb(0xE0, 0xF0, 0x92, 0x8A));+ private static readonly IBrush RecWave = NotaPalette.Wash(NotaPalette.DangerPale, 0xE0);// Marquee rubber-band (multi-select): accent wash + accent border.- private static readonly IBrush MarqueeFill = new SolidColorBrush(Color.FromArgb(0x28, 0x7F, 0xCC, 0xE1));- private static readonly IPen MarqueePen = new Pen(new SolidColorBrush(Color.FromArgb(0xC0, 0x7F, 0xCC, 0xE1)), 1);+ private static readonly IBrush MarqueeFill = NotaPalette.Wash(NotaPalette.Marker, 0x28);+ private static readonly IPen MarqueePen = new Pen(NotaPalette.Wash(NotaPalette.Marker, 0xC0), 1);// Loop region: the transport-accent hue (AccentBright #F0C060). A solid brace// fills the ruler strip; a faint wash + edge lines mark the span over the lanes.- private static readonly IBrush LoopBrace = new SolidColorBrush(Color.FromArgb(0x66, 0xF0, 0xC0, 0x60));- private static readonly IBrush LoopBand = new SolidColorBrush(Color.FromArgb(0x14, 0xF0, 0xC0, 0x60));- private static readonly IPen LoopEdge = new Pen(new SolidColorBrush(Color.FromArgb(0xA0, 0xF0, 0xC0, 0x60)), 1);+ private static readonly IBrush LoopBrace = NotaPalette.Wash(NotaPalette.AccentBright, 0x66);+ private static readonly IBrush LoopBand = NotaPalette.Wash(NotaPalette.AccentBright, 0x14);+ private static readonly IPen LoopEdge = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0xA0), 1);// Automation overlay (M9-A3): a scrim mutes the clip content, a dashed line marks// the flat baseline of an empty lane.- private static readonly IBrush AutoScrim = new SolidColorBrush(Color.FromArgb(0xC0, 0x10, 0x0F, 0x0D));- private static readonly IPen AutoBasePen = new Pen(new SolidColorBrush(Color.Parse("#6A6558")), 1)+ private static readonly IBrush AutoScrim = NotaPalette.Wash(NotaPalette.BgSunken, 0xC0);+ private static readonly IPen AutoBasePen = new Pen(NotaPalette.TextTertiary, 1){ DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };// Write-arm REC button (M9-C): red dot + "REC", lit when armed.- private static readonly IBrush AutoArmOn = new SolidColorBrush(Color.Parse("#D8564B")); // Brush.Danger-ish- private static readonly IPen AutoArmOff = new Pen(new SolidColorBrush(Color.Parse("#6A6558")), 1);- private static readonly IBrush RecBgOff = new SolidColorBrush(Color.Parse("#1E1B16")); // sunken chip- private static readonly IBrush RecBgOn = new SolidColorBrush(Color.FromArgb(0x33, 0xD8, 0x56, 0x4B));- private static readonly IBrush RecDotOff = new SolidColorBrush(Color.Parse("#6A6558"));- private static readonly IBrush RecTextOff = new SolidColorBrush(Color.Parse("#9A9384"));+ private static readonly IBrush AutoArmOn = NotaPalette.Danger; // Brush.Danger-ish+ private static readonly IPen AutoArmOff = new Pen(NotaPalette.TextTertiary, 1);+ private static readonly IBrush RecBgOff = NotaPalette.SurfaceInset; // sunken chip+ private static readonly IBrush RecBgOn = NotaPalette.Wash(NotaPalette.Danger, 0x33);+ private static readonly IBrush RecDotOff = NotaPalette.TextTertiary;+ private static readonly IBrush RecTextOff = NotaPalette.TextSecondary;// Hover feedback (M9-D): brass-accent brighter line + point ring under the cursor.private static readonly IPen AutoHoverPen = new Pen(PlayheadBrush, 2.6);private static readonly IPen AutoHoverRing = new Pen(PlayheadBrush, 1.5);// Automation range selection (Phase 2): teal band + edges over the picked time span,// distinct from the brass loop band so the two never read as the same thing.- private static readonly IBrush AutoSelBand = new SolidColorBrush(Color.FromArgb(0x30, 0x4C, 0xC2, 0xB0));- private static readonly IPen AutoSelEdge = new Pen(new SolidColorBrush(Color.FromArgb(0xC0, 0x4C, 0xC2, 0xB0)), 1);- private static readonly IBrush SelHeaderBg = new SolidColorBrush(Color.Parse("#332C1E")); // warm accent-tinted raised surface+ private static readonly IBrush AutoSelBand = NotaPalette.Wash(NotaPalette.Ink("#4CC2B0"), 0x30);+ private static readonly IPen AutoSelEdge = new Pen(NotaPalette.Wash(NotaPalette.Ink("#4CC2B0"), 0xC0), 1);+ private static readonly IBrush SelHeaderBg = NotaPalette.SelHeaderBg; // warm accent-tinted raised surface// Freeze (M7): cool ice tint for a frozen track's header + its snowflake glyph.- private static readonly IBrush FrozenHeaderBg = new SolidColorBrush(Color.Parse("#1B2A33"));- private static readonly IBrush FrozenAccent = new SolidColorBrush(Color.Parse("#7FC7EC"));+ private static readonly IBrush FrozenHeaderBg = NotaPalette.FrozenHeaderBg;+ private static readonly IBrush FrozenAccent = NotaPalette.Frozen;// Track palette (mirror Brush.Track1..8 + ReturnA/B), each base offered in 3 shades// (normal / lighter / darker) so a colour index is base*Shades + shade. Return buses@@ -2005,21 +2004,33 @@ public sealed partial class ArrangementView : UserControlvar baseColor = NotaPalette.TrackColors[(idx / PaletteShades) % PaletteBases];return (idx % PaletteShades) switch{- 1 => Mix(baseColor, Colors.White, 0.24), // lighter- 2 => Mix(baseColor, Color.FromRgb(0x14, 0x12, 0x10), 0.30), // darker+ 1 => Mix(baseColor, NotaPalette.ShadeUp.Color, 0.24), // lighter+ 2 => Mix(baseColor, NotaPalette.ShadeDown.Color, 0.30), // darker_ => baseColor,};}+ // Clip brushes are alpha-derived from a track colour rather than being a slot, so they+ // are registered as derivations: the cache survives a variant change and re-tints with it,+ // which also keeps an already-open clip editor (handed `content`) honest.private static readonly Dictionary<int, (IBrush fill, IPen border, IBrush strip, IBrush content)> _clipColors = new();private static (IBrush fill, IPen border, IBrush strip, IBrush content) ClipColors(int idx){if (_clipColors.TryGetValue(idx, out var v)) return v;- var c = TrackColorForIndex(idx);- v = (Alpha(c, 0.16), new Pen(Alpha(c, 0.50), 1), Alpha(c, 0.20), new SolidColorBrush(c));+ v = (ClipTint(idx, 0.16), new Pen(ClipTint(idx, 0.50), 1), ClipTint(idx, 0.20),+ NotaPalette.Derived(() => TrackColorForIndex(idx)));_clipColors[idx] = v;return v;}+ /// <summary>A cached, theme-following tint of a palette index. Registers a derivation,+ /// so only call it behind a per-index cache — never per frame; <see cref="Alpha"/> is the+ /// throwaway form for a Render pass.</summary>+ private static SolidColorBrush ClipTint(int idx, double a) => NotaPalette.Derived(() =>+ {+ var c = TrackColorForIndex(idx);+ return Color.FromArgb((byte)(a * 255), c.R, c.G, c.B);+ });+private static IBrush Alpha(Color c, double a) => new SolidColorBrush(Color.FromArgb((byte)(a * 255), c.R, c.G, c.B));private double BeatToX(double beat) => (beat - _scrollBeats) * _pixelsPerBeat;diff --git a/src/managed/Nota.App/AudioClipEditorView.cs b/src/managed/Nota.App/AudioClipEditorView.csindex d21540f2..7052eb20 100644--- a/src/managed/Nota.App/AudioClipEditorView.cs+++ b/src/managed/Nota.App/AudioClipEditorView.cs@@ -590,17 +590,17 @@ public sealed class AudioClipEditorView : UserControlprivate sealed class WaveformView : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IBrush Mid = new SolidColorBrush(Color.FromArgb(0x40, 0xA3, 0x9D, 0x8F));+ private static readonly IBrush Mid = NotaPalette.Wash(NotaPalette.TextSecondary, 0x40);private static readonly IBrush PlayheadCursor = NotaPalette.AccentBright;- private static readonly IBrush Marker = new SolidColorBrush(Color.Parse("#7FCCE1"));- private static readonly IBrush GridBeat = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));- private static readonly IBrush GridBar = new SolidColorBrush(Color.FromArgb(0xC0, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Marker = NotaPalette.Marker;+ private static readonly IBrush GridBeat = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);+ private static readonly IBrush GridBar = NotaPalette.Wash(NotaPalette.BorderStrong, 0xC0);private static readonly IBrush GridLabel = NotaPalette.TextTertiary;private static readonly Typeface GridFace = new(FontFamily.Default);// BPM chip on the warp bar (drag to scrub the segment tempo).- private static readonly IBrush BpmChipBg = new SolidColorBrush(Color.FromArgb(0xDE, 0x12, 0x18, 0x1B));- private static readonly IBrush BpmChipBgHot = new SolidColorBrush(Color.FromArgb(0xF2, 0x1A, 0x2B, 0x31));- private static readonly IBrush BpmSuffix = new SolidColorBrush(Color.FromArgb(0x99, 0x7F, 0xCC, 0xE1));+ private static readonly IBrush BpmChipBg = NotaPalette.Wash(NotaPalette.Ink("#12181B"), 0xDE);+ private static readonly IBrush BpmChipBgHot = NotaPalette.Wash(NotaPalette.Ink("#1A2B31"), 0xF2);+ private static readonly IBrush BpmSuffix = NotaPalette.Wash(NotaPalette.Marker, 0x99);private const int BeatsPerBar = 4; // matches the props-rail bar.beat readoutsprivate IBrush _wave = new SolidColorBrush(NotaPalette.TrackColors[1]);private float[]? _peaks;@@ -615,9 +615,9 @@ public sealed class AudioClipEditorView : UserControl// Source-region brackets (unwarped clips): whole sample drawn, Start/End handles// pick the playable region [_srcOff, _srcOff+_srcLen] within _srcTotal frames.- private static readonly IBrush Bracket = new SolidColorBrush(Color.Parse("#7FCCE1"));- private static readonly IBrush BracketHot = new SolidColorBrush(Color.Parse("#CDEEF8"));- private static readonly IBrush OutsideDim = new SolidColorBrush(Color.FromArgb(0xAA, 0x10, 0x0F, 0x0D));+ private static readonly IBrush Bracket = NotaPalette.Marker;+ private static readonly IBrush BracketHot = NotaPalette.MarkerHot;+ private static readonly IBrush OutsideDim = NotaPalette.Wash(NotaPalette.BgSunken, 0xAA);private double _srcOff, _srcLen, _srcTotal;private bool _srcMode;private int _srcDrag = -1; // 0 = start bracket, 1 = end bracket, -1 = none@@ -641,7 +641,7 @@ public sealed class AudioClipEditorView : UserControl// Volume envelope (M9 follow-up): points (beat, value 0..1) in clip-local beats.private static readonly IBrush EnvLine = NotaPalette.AccentBright;- private static readonly IBrush EnvLineDim = new SolidColorBrush(Color.FromArgb(0x60, 0xF0, 0xC0, 0x60));+ private static readonly IBrush EnvLineDim = NotaPalette.Wash(NotaPalette.AccentBright, 0x60);private sealed class EnvPt { public double beat; public double val; public float curve; }private readonly System.Collections.Generic.List<EnvPt> _env = new();private double _clipBeats = 1;diff --git a/src/managed/Nota.App/BrowserView.cs b/src/managed/Nota.App/BrowserView.csindex 2cf59b39..3046d2e6 100644--- a/src/managed/Nota.App/BrowserView.cs+++ b/src/managed/Nota.App/BrowserView.cs@@ -541,7 +541,9 @@ public sealed class BrowserView : UserControlprivate static IBrush BrushFromHex(string hex){- try { return new SolidColorBrush(Color.Parse(hex)); }+ // A tag colour comes from the library, not the palette — Ink() re-tints it for the+ // active theme instead of painting a graphite-tuned hue onto paper.+ try { return NotaPalette.Ink(hex); }catch { return Brushes.Gray; }}@@ -588,7 +590,7 @@ public sealed class BrowserView : UserControl{BorderThickness = new Thickness(0, 1, 0, 0),Padding = new Thickness(10, 8),- Background = new SolidColorBrush(Color.Parse("#1B1916")),+ Background = NotaPalette.SurfaceInset,Child = new StackPanel { Children = { infoRow, playRow, row3 } },};footer.BindResource(Border.BorderBrushProperty, "Brush.BorderDefault");diff --git a/src/managed/Nota.App/ClipEditorView.cs b/src/managed/Nota.App/ClipEditorView.csindex 899ae08d..ff3e47bc 100644--- a/src/managed/Nota.App/ClipEditorView.cs+++ b/src/managed/Nota.App/ClipEditorView.cs@@ -243,7 +243,7 @@ public sealed class ClipEditorView : UserControlprivate sealed class EnvCanvas : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IBrush GridBeat = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush GridBeat = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly IBrush EnvLine = NotaPalette.AccentBright;private readonly System.Collections.Generic.List<EnvPt> _pts = new();private double _clipBeats;diff --git a/src/managed/Nota.App/ConfirmWindow.cs b/src/managed/Nota.App/ConfirmWindow.csindex c7d58632..1974c0af 100644--- a/src/managed/Nota.App/ConfirmWindow.cs+++ b/src/managed/Nota.App/ConfirmWindow.cs@@ -20,7 +20,7 @@ public sealed class ConfirmWindow : NotaWindowSizeToContent = SizeToContent.Height;CanResize = false;WindowStartupLocation = WindowStartupLocation.CenterOwner;- Background = this.TryFindResource("Brush.BgApp", out var bg) && bg is IBrush b ? b : Brushes.Magenta;+ Background = NotaPalette.BgApp;var yes = new Button { Content = affirmative, Classes = { "primary" } };yes.Click += (_, _) => Close(true);diff --git a/src/managed/Nota.App/Controls/AmpCurve.cs b/src/managed/Nota.App/Controls/AmpCurve.csindex 34df099e..38781587 100644--- a/src/managed/Nota.App/Controls/AmpCurve.cs+++ b/src/managed/Nota.App/Controls/AmpCurve.cs@@ -20,7 +20,7 @@ internal sealed class AmpCurve : Controlprivate static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private float _drive = 1f, _bias;@@ -81,7 +81,7 @@ internal sealed class AmpCurve : Controlctx.DrawText(t2, new Point(x1 - t2.Width, pad - 2));}// input-drive axis (−40 dB … 0 dB).- var axisB = new SolidColorBrush(Color.Parse("#4A463D"));+ var axisB = NotaPalette.TextDisabled;ctx.DrawText(new FormattedText("in −40 dB", CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 7, axisB), new Point(x0, bot + 2));var zt = new FormattedText("0 dB", CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 7, axisB);ctx.DrawText(zt, new Point(x1 - zt.Width, bot + 2));diff --git a/src/managed/Nota.App/Controls/AmpHarmonics.cs b/src/managed/Nota.App/Controls/AmpHarmonics.csindex a40d8bd8..cadca1fa 100644--- a/src/managed/Nota.App/Controls/AmpHarmonics.cs+++ b/src/managed/Nota.App/Controls/AmpHarmonics.cs@@ -15,11 +15,11 @@ namespace Nota.App;internal sealed class AmpHarmonics : Control{- private static readonly IBrush Well = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly Color Amber = Color.Parse("#D8A03D");- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush Well = NotaPalette.BgSunken;+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;+ private static Color Amber => NotaPalette.Accent.Color;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));private float _drive = 1, _bias;diff --git a/src/managed/Nota.App/Controls/AmpToneCurve.cs b/src/managed/Nota.App/Controls/AmpToneCurve.csindex 64959015..eb96ea88 100644--- a/src/managed/Nota.App/Controls/AmpToneCurve.cs+++ b/src/managed/Nota.App/Controls/AmpToneCurve.cs@@ -15,12 +15,12 @@ namespace Nota.App;internal sealed class AmpToneCurve : Control{- private static readonly IBrush Well = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush Grid = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Ref = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Axis = new SolidColorBrush(Color.Parse("#4A463D"));+ private static readonly IBrush Well = NotaPalette.BgSunken;+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush Grid = NotaPalette.SurfaceCard;+ private static readonly IBrush Ref = NotaPalette.SurfaceRaised;+ private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));private double _bass, _mid, _treb, _pres; // dBdiff --git a/src/managed/Nota.App/Controls/ArpGrid.cs b/src/managed/Nota.App/Controls/ArpGrid.csindex 4899b12b..3e5dad9c 100644--- a/src/managed/Nota.App/Controls/ArpGrid.cs+++ b/src/managed/Nota.App/Controls/ArpGrid.cs@@ -21,9 +21,9 @@ internal sealed class ArpGrid : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush Group = new SolidColorBrush(Color.FromArgb(0x30, 0x00, 0x00, 0x00));- private static readonly IBrush Play = new SolidColorBrush(Color.FromArgb(0x2A, 0xF0, 0xC0, 0x60));+ private static readonly IBrush Play = NotaPalette.Wash(NotaPalette.AccentBright, 0x2A);private static readonly IBrush Teal = NotaPalette.Teal;- private static readonly IBrush WellPen = new SolidColorBrush(Color.FromArgb(0x60, 0x3A, 0x36, 0x2D));+ private static readonly IBrush WellPen = NotaPalette.Wash(NotaPalette.BorderStrong, 0x60);private static readonly IBrush Muted = NotaPalette.TextTertiary;private static readonly IBrush Txt = NotaPalette.TextSecondary;private static readonly IBrush AccentBright = NotaPalette.AccentBright;@@ -117,7 +117,7 @@ internal sealed class ArpGrid : Control}// Step number strip (click to mute).- var numBrush = s == _playStep ? AccentBright : muted ? new SolidColorBrush(Color.FromArgb(0x66, 0x6E, 0x6A, 0x5E)) : Txt;+ var numBrush = s == _playStep ? AccentBright : muted ? NotaPalette.Wash(NotaPalette.TextTertiary, 0x66) : Txt;DrawText(ctx, (s + 1).ToString(), x + cw / 2, numY, numBrush, 8);}if (_min < 0) ctx.DrawLine(new Pen(WellPen, 1), new Point(0, zero), new Point(w, zero));diff --git a/src/managed/Nota.App/Controls/AuroraStack.cs b/src/managed/Nota.App/Controls/AuroraStack.csindex 0b12a9ba..094bbeca 100644--- a/src/managed/Nota.App/Controls/AuroraStack.cs+++ b/src/managed/Nota.App/Controls/AuroraStack.cs@@ -19,7 +19,7 @@ internal sealed class AuroraStack : Controlprivate static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush Accent = NotaPalette.AccentBright;- private static readonly IBrush Faint = new SolidColorBrush(Color.FromArgb(0x42, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush Faint = NotaPalette.Wash(NotaPalette.Accent, 0x42);private const int Frames = 16, N = 72, HarmMax = 28;private int _bank;diff --git a/src/managed/Nota.App/Controls/AuroraViz.cs b/src/managed/Nota.App/Controls/AuroraViz.csindex 1accbcee..7f57f88f 100644--- a/src/managed/Nota.App/Controls/AuroraViz.cs+++ b/src/managed/Nota.App/Controls/AuroraViz.cs@@ -21,7 +21,7 @@ namespace Nota.App;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;private static readonly IBrush TextSecondary = NotaPalette.TextSecondary;public enum K { Wave, Filter }- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private readonly K _k;private int _bank;@@ -82,7 +82,7 @@ namespace Nota.App;int samples = 128;double span = x1 - x0, mid = (top + bot) / 2, amp = (bot - top) * 0.42;// Faint stack of neighbouring frames (behind), offset up-left to suggest depth.- var faint = new Pen(new SolidColorBrush(Color.FromArgb(0x40, 0xF0, 0xC0, 0x60)), 1);+ var faint = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x40), 1);for (int s = 2; s >= 1; s--){double nf = Math.Clamp(_pos + s * 0.14, 0, 1) * 7.0;diff --git a/src/managed/Nota.App/Controls/AutoFilterCurve.cs b/src/managed/Nota.App/Controls/AutoFilterCurve.csindex 63b127f7..b98ec09c 100644--- a/src/managed/Nota.App/Controls/AutoFilterCurve.cs+++ b/src/managed/Nota.App/Controls/AutoFilterCurve.cs@@ -23,19 +23,19 @@ internal sealed class AutoFilterCurve : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush BorderB = NotaPalette.BorderDefault;- private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(0x22, 0x3A, 0x36, 0x2D)));+ private static readonly IPen GridPen = new Pen(NotaPalette.Wash(NotaPalette.BorderStrong, 0x22));private static readonly IPen CurvePen = new Pen(NotaPalette.Accent, 1.8); // solid brass = current response- private static readonly IBrush CurveFill = new SolidColorBrush(Color.FromArgb(0x18, 0xD8, 0xA0, 0x3D));- private static readonly IBrush SpecFill = new SolidColorBrush(Color.FromArgb(0x22, 0x8A, 0xA6, 0xC0));- private static readonly IPen SpecPen = new Pen(new SolidColorBrush(Color.FromArgb(0x44, 0x9C, 0xB4, 0xCC)));+ private static readonly IBrush CurveFill = NotaPalette.Wash(NotaPalette.Accent, 0x18);+ private static readonly IBrush SpecFill = NotaPalette.Wash(NotaPalette.Ink("#8AA6C0"), 0x22);+ private static readonly IPen SpecPen = new Pen(NotaPalette.Wash(NotaPalette.Ink("#9CB4CC"), 0x44));private static readonly IBrush HandleB = NotaPalette.AccentBright;private static readonly IPen ModPen = new Pen(NotaPalette.Teal, 1.2){ DashStyle = new DashStyle(new double[] { 4, 3 }, 0) }; // dashed teal = at modulation- private static readonly IBrush SweepFill = new SolidColorBrush(Color.FromArgb(0x12, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush SweepFill = NotaPalette.Wash(NotaPalette.Teal, 0x12);- private static readonly IPen SweepEdge = new Pen(new SolidColorBrush(Color.FromArgb(0x55, 0x5B, 0x9E, 0x9C)))+ private static readonly IPen SweepEdge = new Pen(NotaPalette.Wash(NotaPalette.Teal, 0x55)){ DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };private static readonly IBrush AxisB = NotaPalette.TextTertiary;diff --git a/src/managed/Nota.App/Controls/AutoFilterIcons.cs b/src/managed/Nota.App/Controls/AutoFilterIcons.csindex cac20f98..4d93d64c 100644--- a/src/managed/Nota.App/Controls/AutoFilterIcons.cs+++ b/src/managed/Nota.App/Controls/AutoFilterIcons.cs@@ -81,7 +81,7 @@ internal sealed class LfoWaveIcon : Control, IIconColorinternal sealed class EnvGlyph : Control{private static readonly IBrush Line = NotaPalette.Teal;- private static readonly IBrush Fill = new SolidColorBrush(Color.FromArgb(0x1E, 0x5A, 0xC8, 0xD8));+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Ink("#5AC8D8"), 0x1E);public EnvGlyph() { }public override void Render(DrawingContext ctx){diff --git a/src/managed/Nota.App/Controls/AutoGainViz.cs b/src/managed/Nota.App/Controls/AutoGainViz.csindex ef499260..0e4b1770 100644--- a/src/managed/Nota.App/Controls/AutoGainViz.cs+++ b/src/managed/Nota.App/Controls/AutoGainViz.cs@@ -24,14 +24,14 @@ internal sealed class AutoGainHistory : Controlprivate static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush BorderB = NotaPalette.BorderDefault;- private static readonly IPen Grid = new Pen(new SolidColorBrush(Color.FromArgb(0x40, 0x1E, 0x1C, 0x18)), 1);- private static readonly IBrush InFill = new SolidColorBrush(Color.FromArgb(0x8C, 0x3E, 0x4A, 0x3C));- private static readonly IPen InPen = new Pen(new SolidColorBrush(Color.FromArgb(0xB0, 0x52, 0x60, 0x50)), 1);+ private static readonly IPen Grid = new Pen(NotaPalette.Wash(NotaPalette.SurfaceCard, 0x40), 1);+ private static readonly IBrush InFill = NotaPalette.Wash(NotaPalette.SignalInFill, 0x8C);+ private static readonly IPen InPen = new Pen(NotaPalette.Wash(NotaPalette.SignalIn, 0xB0), 1);private static readonly IPen OutPen = new Pen(NotaPalette.Accent, 1.8);private static readonly IPen TargetPen = new Pen(NotaPalette.Teal, 1) { DashStyle = new DashStyle(new double[] { 4, 3 }, 0) };- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Correcting = new SolidColorBrush(Color.Parse("#C48A6A"));- private static readonly IBrush TealBright = new SolidColorBrush(Color.Parse("#7FC9C6"));+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Correcting = NotaPalette.Ink("#C48A6A");+ private static readonly IBrush TealBright = NotaPalette.TealBright;private static readonly IBrush AxisB = NotaPalette.TextTertiary;private static readonly Typeface Face = new(FontFamily.Default);@@ -99,7 +99,7 @@ internal sealed class AutoGainHistory : Controlvoid Lbl(string s, double x, double y, IBrush b) => ctx.DrawText(new FormattedText(s, System.Globalization.CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 8, b), new Point(x, y));Lbl("LOUDNESS", gx, 2, Muted);- Lbl("▩ input", gx + gw - 150, 2, new SolidColorBrush(Color.Parse("#52604F")));+ Lbl("▩ input", gx + gw - 150, 2, NotaPalette.SignalIn);Lbl("─ output", gx + gw - 96, 2, NotaPalette.Accent);Lbl("┄ target", gx + gw - 44, 2, NotaPalette.Teal);if (_primed && Math.Abs(_desired - _applied) > 0.15f)diff --git a/src/managed/Nota.App/Controls/AutoPanViz.cs b/src/managed/Nota.App/Controls/AutoPanViz.csindex c2406851..e878b1ab 100644--- a/src/managed/Nota.App/Controls/AutoPanViz.cs+++ b/src/managed/Nota.App/Controls/AutoPanViz.cs@@ -22,7 +22,7 @@ internal sealed class AutoPanViz : Controlprivate static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush Teal = NotaPalette.Teal;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private static readonly string[] WaveNames = { "SINE", "TRI", "SAW", "SQUARE", "S&H" };@@ -91,7 +91,7 @@ internal sealed class AutoPanViz : Control// Live L—R position bar with a moving dot.double by = bot + 8, bh = 4;- ctx.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D)), null, new Rect(x0, by, x1 - x0, bh), 2, 2);+ ctx.DrawRectangle(NotaPalette.Wash(NotaPalette.BorderStrong, 0x40), null, new Rect(x0, by, x1 - x0, bh), 2, 2);ctx.DrawLine(new Pen(Grid, 1), new Point((x0 + x1) / 2, by - 1), new Point((x0 + x1) / 2, by + bh + 1));double dotX = x0 + Math.Clamp(_pan, 0f, 1f) * (x1 - x0);ctx.DrawEllipse(AccentBright, null, new Point(dotX, by + bh / 2), 3, 3);diff --git a/src/managed/Nota.App/Controls/AutoShiftViz.cs b/src/managed/Nota.App/Controls/AutoShiftViz.csindex 5441336a..f34b1d9d 100644--- a/src/managed/Nota.App/Controls/AutoShiftViz.cs+++ b/src/managed/Nota.App/Controls/AutoShiftViz.cs@@ -17,17 +17,17 @@ namespace Nota.App;internal sealed class AutoShiftViz : Control{- private static readonly IBrush Sunken = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderDef = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Brass = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealDim = new SolidColorBrush(Color.FromArgb(0x8C, 0x5B, 0x9E, 0x9C));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Faint = new SolidColorBrush(Color.Parse("#4A463D"));- private static readonly IBrush LaneLine = new SolidColorBrush(Color.FromArgb(0x2A, 0x3A, 0x36, 0x2D));- private static readonly IBrush WhiteLane = new SolidColorBrush(Color.FromArgb(0x44, 0x3A, 0x36, 0x2D));- private static readonly IBrush TargetLine = new SolidColorBrush(Color.FromArgb(0x55, 0xF0, 0xC0, 0x60));- private static readonly IBrush TargetLabel = new SolidColorBrush(Color.Parse("#F0C060"));+ private static readonly IBrush Sunken = NotaPalette.BgSunken;+ private static readonly IBrush BorderDef = NotaPalette.GraphBorder;+ private static readonly IBrush Brass = NotaPalette.Accent;+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush TealDim = NotaPalette.Wash(NotaPalette.Teal, 0x8C);+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Faint = NotaPalette.TextDisabled;+ private static readonly IBrush LaneLine = NotaPalette.Wash(NotaPalette.BorderStrong, 0x2A);+ private static readonly IBrush WhiteLane = NotaPalette.Wash(NotaPalette.BorderStrong, 0x44);+ private static readonly IBrush TargetLine = NotaPalette.Wash(NotaPalette.AccentBright, 0x55);+ private static readonly IBrush TargetLabel = NotaPalette.AccentBright;private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));private static readonly Typeface Bold = new(FontFamily.Default, FontStyle.Normal, FontWeight.Bold);private static readonly string[] Names = { "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" };diff --git a/src/managed/Nota.App/Controls/BeatRepeatViz.cs b/src/managed/Nota.App/Controls/BeatRepeatViz.csindex 948dc5e0..c4b84605 100644--- a/src/managed/Nota.App/Controls/BeatRepeatViz.cs+++ b/src/managed/Nota.App/Controls/BeatRepeatViz.cs@@ -16,16 +16,16 @@ namespace Nota.App;internal sealed class BeatRepeatViz : Control{- private static readonly IBrush Sunken = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderDef = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Well = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush WellBd = new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Faint = new SolidColorBrush(Color.Parse("#4A463D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush BarLine = new SolidColorBrush(Color.Parse("#4A463D"));- private static readonly Color Brass = Color.Parse("#D8A03D");+ private static readonly IBrush Sunken = NotaPalette.BgSunken;+ private static readonly IBrush BorderDef = NotaPalette.GraphBorder;+ private static readonly IBrush Well = NotaPalette.SurfaceInset;+ private static readonly IBrush WellBd = NotaPalette.Wash(NotaPalette.BorderStrong, 0x40);+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Faint = NotaPalette.TextDisabled;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush BarLine = NotaPalette.TextDisabled;+ private static Color Brass => NotaPalette.Accent.Color;private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));private static readonly Typeface Bold = new(FontFamily.Default, FontStyle.Normal, FontWeight.Bold);@@ -84,7 +84,7 @@ internal sealed class BeatRepeatViz : Control// Playhead.double px = x0 + _phase * (x1 - x0);- g.DrawLine(new Pen(new SolidColorBrush(Color.FromArgb(0x55, 0xF0, 0xC0, 0x60)), 3), new Point(px, top), new Point(px, bot));+ g.DrawLine(new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x55), 3), new Point(px, top), new Point(px, bot));g.DrawLine(new Pen(AmberLit, 1.5), new Point(px, top), new Point(px, bot));// Legend.diff --git a/src/managed/Nota.App/Controls/CeilingScope.cs b/src/managed/Nota.App/Controls/CeilingScope.csindex 02b83940..3ab0f853 100644--- a/src/managed/Nota.App/Controls/CeilingScope.cs+++ b/src/managed/Nota.App/Controls/CeilingScope.cs@@ -36,11 +36,11 @@ internal sealed class CeilingMetersinternal sealed class CeilingLevelPlot : Control{private static readonly IBrush Sunken = NotaPalette.BgSunken;- private static readonly IBrush Border = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush InC = new SolidColorBrush(Color.Parse("#3E4A3C"));- private static readonly IBrush OutC = new SolidColorBrush(Color.FromArgb(0xD9, 0xD8, 0xA0, 0x3D));- private static readonly IBrush OverC = new SolidColorBrush(Color.FromArgb(0x99, 0xD9, 0x5F, 0x4C));- private static readonly IBrush CeilC = new SolidColorBrush(Color.Parse("#F0C060"));+ private static readonly IBrush Border = NotaPalette.GraphBorder;+ private static readonly IBrush InC = NotaPalette.SignalInFill;+ private static readonly IBrush OutC = NotaPalette.Wash(NotaPalette.Accent, 0xD9);+ private static readonly IBrush OverC = NotaPalette.Wash(NotaPalette.Danger, 0x99);+ private static readonly IBrush CeilC = NotaPalette.AccentBright;private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly Typeface Face = new(FontFamily.Default);private const double Lo = -30, Hi = 3; // dBFS display range@@ -84,9 +84,9 @@ internal sealed class CeilingLevelPlot : Controlinternal sealed class CeilingGrLane : Control{private static readonly IBrush Sunken = NotaPalette.BgSunken;- private static readonly IBrush Border = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D9C34C"));+ private static readonly IBrush Border = NotaPalette.GraphBorder;+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush Amber = NotaPalette.Warning;private static readonly Typeface Face = new(FontFamily.Default);private const double MaxGr = 6.0;diff --git a/src/managed/Nota.App/Controls/ChamberViews.cs b/src/managed/Nota.App/Controls/ChamberViews.csindex f4884c0c..3628c93e 100644--- a/src/managed/Nota.App/Controls/ChamberViews.cs+++ b/src/managed/Nota.App/Controls/ChamberViews.cs@@ -20,11 +20,11 @@ namespace Nota.App;internal static class ChamberInk{- public static readonly Color SlateColor = Color.Parse("#6D8FB5"); // convolution- public static readonly Color MauveColor = Color.Parse("#B57286"); // shimmer / pitch, low band+ public static Color SlateColor => NotaPalette.InkColor("#6D8FB5"); // convolution+ public static Color MauveColor => NotaPalette.InkColor("#B57286"); // shimmer / pitch, low bandpublic static readonly IBrush Slate = new SolidColorBrush(SlateColor);public static readonly IBrush Mauve = new SolidColorBrush(MauveColor);- public static readonly IBrush Veil = new SolidColorBrush(Color.FromArgb(0xB8, 0x0B, 0x0A, 0x09));+ public static readonly IBrush Veil = NotaPalette.Wash(NotaPalette.SurfaceAbyss, 0xB8);public static readonly IBrush GridLine = NotaPalette.SurfaceCard;private static readonly Typeface Mono = new("ui-monospace, Menlo, monospace");private static readonly Typeface Sans = new("Inter, system-ui, sans-serif", FontStyle.Normal, FontWeight.Bold);@@ -274,7 +274,7 @@ internal sealed class ChamberIrView : Control{double lh = full - top;if (lh < 10) return;- ctx.FillRectangle(ChamberInk.Alpha(Color.Parse("#0B0A09"), 0xFF), new Rect(0, top, w, lh));+ ctx.FillRectangle(ChamberInk.Alpha(NotaPalette.SurfaceAbyss.Color, 0xFF), new Rect(0, top, w, lh));ctx.DrawLine(new Pen(NotaPalette.BorderDefault, 1), new Point(0, top + 0.5), new Point(w, top + 0.5));double axis = _axis > 0 ? _axis : 1, bot = full - 2, peakY = top + 9;double X(double t) => Math.Clamp(t / axis, 0, 1) * w;diff --git a/src/managed/Nota.App/Controls/ChordKeysViz.cs b/src/managed/Nota.App/Controls/ChordKeysViz.csindex 1157166c..f293aee7 100644--- a/src/managed/Nota.App/Controls/ChordKeysViz.cs+++ b/src/managed/Nota.App/Controls/ChordKeysViz.cs@@ -14,12 +14,12 @@ namespace Nota.App;internal sealed class ChordKeysViz : Control{- private static readonly IBrush Well = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush WhiteKey = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush BlackKey = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Line = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Added = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush Played = new SolidColorBrush(Color.Parse("#F0C060"));+ private static readonly IBrush Well = NotaPalette.BgSunken;+ private static readonly IBrush WhiteKey = NotaPalette.SurfaceRaised;+ private static readonly IBrush BlackKey = NotaPalette.SurfaceInset;+ private static readonly IBrush Line = NotaPalette.BorderDefault;+ private static readonly IBrush Added = NotaPalette.Accent;+ private static readonly IBrush Played = NotaPalette.AccentBright;private int _root = 60, _low = 60;private const int Span = 25; // two octaves + 1diff --git a/src/managed/Nota.App/Controls/CollisionViz.cs b/src/managed/Nota.App/Controls/CollisionViz.csindex 2972f940..2fdf9d49 100644--- a/src/managed/Nota.App/Controls/CollisionViz.cs+++ b/src/managed/Nota.App/Controls/CollisionViz.cs@@ -20,7 +20,7 @@ internal sealed class CollisionViz : Controlprivate static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private static readonly string[] TypeNames = { "BEAM", "MARIMBA", "STRING", "MEMBRANE", "PLATE", "PIPE" };diff --git a/src/managed/Nota.App/Controls/CompGrHistory.cs b/src/managed/Nota.App/Controls/CompGrHistory.csindex 763658ba..0a41fc60 100644--- a/src/managed/Nota.App/Controls/CompGrHistory.cs+++ b/src/managed/Nota.App/Controls/CompGrHistory.cs@@ -18,9 +18,9 @@ internal sealed class CompGrHistory : Control{private static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x30, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x30);private static readonly IBrush Red = NotaPalette.Danger; // design-system red- private static readonly IBrush RedFill = new SolidColorBrush(Color.FromArgb(0x55, 0xD9, 0x5F, 0x4C));+ private static readonly IBrush RedFill = NotaPalette.Wash(NotaPalette.Danger, 0x55);private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly Typeface Face = new(FontFamily.Default);private const int N = 220;@@ -68,7 +68,7 @@ internal sealed class CompGrHistory : Controlfor (int i = 1; i < top.Count; i++) ctx.DrawLine(pen, top[i - 1], top[i]);}// Peak-hold line.- if (Peak > 0.05) { double py = top0 + Math.Clamp(Peak / MaxDb, 0, 1) * plotH; ctx.DrawLine(new Pen(new SolidColorBrush(Color.FromArgb(0x99, 0xD9, 0x5F, 0x4C)), 1) { DashStyle = DashStyle.Dash }, new Point(2, py), new Point(w - 2, py)); }+ if (Peak > 0.05) { double py = top0 + Math.Clamp(Peak / MaxDb, 0, 1) * plotH; ctx.DrawLine(new Pen(NotaPalette.Wash(NotaPalette.Danger, 0x99), 1) { DashStyle = DashStyle.Dash }, new Point(2, py), new Point(w - 2, py)); }// Labels drawn in the reserved header band: title top-left, current · peak top-right (in red).ctx.DrawText(new FormattedText("GAIN REDUCTION", CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 8, Axis), new Point(5, 2));string cur = Current <= 0.05 ? "0.0" : $"−{Current:0.0}", pk = Peak <= 0.05 ? "0.0" : $"−{Peak:0.0}";diff --git a/src/managed/Nota.App/Controls/CompTransfer.cs b/src/managed/Nota.App/Controls/CompTransfer.csindex c1e5a053..106a1007 100644--- a/src/managed/Nota.App/Controls/CompTransfer.cs+++ b/src/managed/Nota.App/Controls/CompTransfer.cs@@ -22,9 +22,9 @@ internal sealed class CompTransfer : Controlprivate static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush Accent = NotaPalette.AccentBright;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x3C, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x3C);private static readonly IBrush Axis = NotaPalette.TextDisabled;- private static readonly IBrush Fill = new SolidColorBrush(Color.FromArgb(0x16, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Accent, 0x16);private static readonly Typeface Face = new(FontFamily.Default);private const int Threshold = 0, Ratio = 1, Knee = 5;private const double Lo = -60, Hi = 0;@@ -78,7 +78,7 @@ internal sealed class CompTransfer : Controldouble thr = P(Threshold), ratio = Math.Max(1, P(Ratio)), knee = P(Knee);// Threshold line.double tx = X(thr, x0, x1);- ctx.DrawLine(new Pen(new SolidColorBrush(Color.FromArgb(0x50, 0xF0, 0xC0, 0x60)), 1), new Point(tx, top), new Point(tx, bot));+ ctx.DrawLine(new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x50), 1), new Point(tx, top), new Point(tx, bot));// Transfer curve + fill.var geo = new StreamGeometry();diff --git a/src/managed/Nota.App/Controls/CompViz.cs b/src/managed/Nota.App/Controls/CompViz.csindex ebea10dd..8fff5424 100644--- a/src/managed/Nota.App/Controls/CompViz.cs+++ b/src/managed/Nota.App/Controls/CompViz.cs@@ -17,7 +17,7 @@ namespace Nota.App;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private float _thr = -18f, _ratio = 3f, _makeup;public CompViz() { MinWidth = 120; MinHeight = 70; }diff --git a/src/managed/Nota.App/Controls/ConsortViews.cs b/src/managed/Nota.App/Controls/ConsortViews.csindex 18b631d4..3225672e 100644--- a/src/managed/Nota.App/Controls/ConsortViews.cs+++ b/src/managed/Nota.App/Controls/ConsortViews.cs@@ -83,7 +83,7 @@ internal static class ConsortJackspublic static int Points => Sources.Length - 1 + Dests.Length - 1;public static IBrush ToneBrush(Tone t) => t switch { Tone.Env => NotaPalette.Teal, Tone.Audio => NotaPalette.Accent, _ => ChamberInk.Mauve };- public static Color ToneColor(Tone t) => t switch { Tone.Env => Color.Parse("#5B9E9C"), Tone.Audio => NotaPalette.AccentColor, _ => ChamberInk.MauveColor };+ public static Color ToneColor(Tone t) => t switch { Tone.Env => NotaPalette.Teal.Color, Tone.Audio => NotaPalette.AccentColor, _ => ChamberInk.MauveColor };public static Jack Src(int i) => i > 0 && i < Sources.Length ? Sources[i] : Sources[0];public static Jack Dst(int i) => i > 0 && i < Dests.Length ? Dests[i] : Dests[0];public static string ShortName(string n) => n.Replace(" out", "").Replace(" in", "").Replace("Osc ", "Osc").Replace("Filt ", "Filt").Replace(" cutoff", "").Replace("Delay ", "Dly ").Replace(" pitch", "").Replace("Env ", "Env");@@ -228,7 +228,7 @@ internal sealed class ConsortFilterCurve : Controlvar brass = NotaPalette.Accent;if (_mode == 0){- var faint = new SolidColorBrush(Color.FromArgb(0x55, 0x6D, 0x8F, 0xB5));+ var faint = NotaPalette.Wash(NotaPalette.Ink("#6D8FB5"), 0x55);ctx.DrawGeometry(null, new Pen(faint, 1), Curve(x => Db(Mag(Wr(x, _cut), true))));ctx.DrawGeometry(null, new Pen(brass, 1.5), Curve(x => Db(Mag(Wr(x, _cut), true) * Mag(Wr(x, cutB), false))));}@@ -340,7 +340,7 @@ internal sealed class ConsortStepGrid : Controlif (w < 16 || h < 4) return;const double gap = 3;double cw = (w - gap * 15) / 16;- var ac = NotaPalette.AccentColor; var mv = ChamberInk.MauveColor; var tl = Color.Parse("#5B9E9C");+ var ac = NotaPalette.AccentColor; var mv = ChamberInk.MauveColor; var tl = NotaPalette.Teal.Color;for (int i = 0; i < 16; i++){var r = new Rect(i * (cw + gap) + 0.5, 0.5, cw - 1, h - 1);@@ -408,7 +408,7 @@ internal sealed class ConsortPitchLane : Controldouble Y(int p) => Top + (1 - (p + 24) / 48.0) * hh;var grid = new Pen(NotaPalette.SurfaceCard, 1);foreach (int p in new[] { -12, 0, 12 }) ctx.DrawLine(grid, new Point(0, Y(p)), new Point(w, Y(p)));- var ac = NotaPalette.AccentColor; var mv = ChamberInk.MauveColor; var tl = Color.Parse("#5B9E9C");+ var ac = NotaPalette.AccentColor; var mv = ChamberInk.MauveColor; var tl = NotaPalette.Teal.Color;for (int i = 0; i < 16; i++){if (_t[i] == 3) continue;diff --git a/src/managed/Nota.App/Controls/DelayTaps.cs b/src/managed/Nota.App/Controls/DelayTaps.csindex fb5e7a20..3b5c7b14 100644--- a/src/managed/Nota.App/Controls/DelayTaps.cs+++ b/src/managed/Nota.App/Controls/DelayTaps.cs@@ -20,7 +20,7 @@ internal sealed class DelayTaps : Controlprivate static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush Accent = NotaPalette.Accent;private static readonly IBrush AccentBright = NotaPalette.AccentBright;- private static readonly IBrush GridB = new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D));+ private static readonly IBrush GridB = NotaPalette.Wash(NotaPalette.BorderStrong, 0x40);private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly Typeface Face = new(FontFamily.Default);diff --git a/src/managed/Nota.App/Controls/DistributionViz.cs b/src/managed/Nota.App/Controls/DistributionViz.csindex 2e98f905..fd24336e 100644--- a/src/managed/Nota.App/Controls/DistributionViz.cs+++ b/src/managed/Nota.App/Controls/DistributionViz.cs@@ -14,9 +14,9 @@ namespace Nota.App;internal sealed class DistributionViz : Control{- private static readonly IBrush Well = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly Color Teal = Color.Parse("#5B9E9C");+ private static readonly IBrush Well = NotaPalette.BgSunken;+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;+ private static Color Teal => NotaPalette.Teal.Color;private const int N = 16;private int _dist;diff --git a/src/managed/Nota.App/Controls/DynamicEqCurve.cs b/src/managed/Nota.App/Controls/DynamicEqCurve.csindex 8bc1e88e..7e43c240 100644--- a/src/managed/Nota.App/Controls/DynamicEqCurve.cs+++ b/src/managed/Nota.App/Controls/DynamicEqCurve.cs@@ -34,18 +34,18 @@ public sealed class DynamicEqCurve : Controlpublic const int HistLen = 120; // 2 s at 60 Hzprivate static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.Parse("#232019")), 1);- private static readonly IPen GridPenFaint = new Pen(new SolidColorBrush(Color.FromArgb(0x60, 0x23, 0x20, 0x19)), 1);+ private static readonly IPen GridPen = new Pen(NotaPalette.WellGrid, 1);+ private static readonly IPen GridPenFaint = new Pen(NotaPalette.Wash(NotaPalette.WellGrid, 0x60), 1);private static readonly IPen ZeroPen = new Pen(NotaPalette.BorderStrong, 1);private static readonly IPen CurvePen = new Pen(NotaPalette.Accent, 1.7);- private static readonly IBrush CurveFill = new SolidColorBrush(Color.FromArgb(0x1E, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush CurveFill = NotaPalette.Wash(NotaPalette.Accent, 0x1E);private static readonly IPen DynPen = new Pen(NotaPalette.Teal, 1.5) { DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };- private static readonly IPen ReachPen = new Pen(new SolidColorBrush(Color.FromArgb(0x88, 0x5B, 0x9E, 0x9C)), 1) { DashStyle = new DashStyle(new double[] { 2, 3 }, 0) };+ private static readonly IPen ReachPen = new Pen(NotaPalette.Wash(NotaPalette.Teal, 0x88), 1) { DashStyle = new DashStyle(new double[] { 2, 3 }, 0) };private static readonly IBrush DotBrass = NotaPalette.AccentBright;private static readonly IBrush DotTeal = NotaPalette.Teal;- private static readonly IBrush DotOff = new SolidColorBrush(Color.Parse("#4A463D"));+ private static readonly IBrush DotOff = NotaPalette.TextDisabled;private static readonly IBrush DotRing = NotaPalette.BgSunken;- private static readonly IBrush SelRing = new SolidColorBrush(Color.Parse("#F0C060"));+ private static readonly IBrush SelRing = NotaPalette.AccentBright;private static readonly IBrush LabelDim = NotaPalette.TextTertiary;private static readonly IBrush LabelBright = NotaPalette.TextSecondary;private static readonly IBrush OnAccentText = NotaPalette.TextOnAccent;diff --git a/src/managed/Nota.App/Controls/EqThreeCurve.cs b/src/managed/Nota.App/Controls/EqThreeCurve.csindex 7efbf6a3..542c5e52 100644--- a/src/managed/Nota.App/Controls/EqThreeCurve.cs+++ b/src/managed/Nota.App/Controls/EqThreeCurve.cs@@ -23,17 +23,17 @@ internal sealed class EqThreeCurve : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush BorderB = NotaPalette.BorderDefault;- private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(0x22, 0x3A, 0x36, 0x2D)), 1);+ private static readonly IPen GridPen = new Pen(NotaPalette.Wash(NotaPalette.BorderStrong, 0x22), 1);private static readonly IPen CurvePen = new Pen(NotaPalette.Accent, 1.8);- private static readonly IBrush CurveFill = new SolidColorBrush(Color.FromArgb(0x18, 0xD8, 0xA0, 0x3D));- private static readonly IBrush SpecFill = new SolidColorBrush(Color.FromArgb(0x22, 0x3E, 0x4A, 0x3C));- private static readonly IPen SpecPen = new Pen(new SolidColorBrush(Color.FromArgb(0x44, 0x52, 0x60, 0x50)), 1);- private static readonly IPen XoverPen = new Pen(new SolidColorBrush(Color.FromArgb(0x66, 0xD8, 0xA0, 0x3D)), 1) { DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };+ private static readonly IBrush CurveFill = NotaPalette.Wash(NotaPalette.Accent, 0x18);+ private static readonly IBrush SpecFill = NotaPalette.Wash(NotaPalette.SignalInFill, 0x22);+ private static readonly IPen SpecPen = new Pen(NotaPalette.Wash(NotaPalette.SignalIn, 0x44), 1);+ private static readonly IPen XoverPen = new Pen(NotaPalette.Wash(NotaPalette.Accent, 0x66), 1) { DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };private static readonly IBrush AxisB = NotaPalette.TextTertiary;- private static readonly IBrush LowB = new SolidColorBrush(Color.Parse("#C4756A"));- private static readonly IBrush MidB = new SolidColorBrush(Color.Parse("#C99C55"));- private static readonly IBrush HighB = new SolidColorBrush(Color.Parse("#6D8FB5"));- private static readonly IBrush KillB = new SolidColorBrush(Color.Parse("#D95F4C"));+ private static readonly IBrush LowB = NotaPalette.Ink("#C4756A");+ private static readonly IBrush MidB = NotaPalette.Ink("#C99C55");+ private static readonly IBrush HighB = NotaPalette.Ink("#6D8FB5");+ private static readonly IBrush KillB = NotaPalette.Danger;private static readonly Typeface Face = new(FontFamily.Default);private const double FMin = 20.0, FMax = 20000.0;diff --git a/src/managed/Nota.App/Controls/FluxReactScope.cs b/src/managed/Nota.App/Controls/FluxReactScope.csindex 88781d2a..a4db7e20 100644--- a/src/managed/Nota.App/Controls/FluxReactScope.cs+++ b/src/managed/Nota.App/Controls/FluxReactScope.cs@@ -22,10 +22,10 @@ internal sealed class FluxReactScope : Controlprivate int _head;private float _tilt = 0.5f, _follow;- private static readonly Color Inset = Color.Parse("#100F0D");- private static readonly Color Olive = Color.Parse("#52604F");- private static readonly Color Teal = Color.Parse("#5B9E9C");- private static readonly Color TealBright = Color.Parse("#7FC9C6");+ private static Color Inset => NotaPalette.BgSunken.Color;+ private static Color Olive => NotaPalette.SignalIn.Color;+ private static Color Teal => NotaPalette.Teal.Color;+ private static Color TealBright => NotaPalette.TealBright.Color;public FluxReactScope() { ClipToBounds = true; }@@ -103,7 +103,7 @@ internal sealed class FluxReactScope : Control// right-edge spectral-tilt bar.double bx = w - barW;- ctx.FillRectangle(new SolidColorBrush(Color.Parse("#0A0908")), new Rect(bx, 3, barW, h - 6), 3);+ ctx.FillRectangle(NotaPalette.SurfaceAbyss, new Rect(bx, 3, barW, h - 6), 3);double fillH = (h - 6) * _tilt;var grad = new LinearGradientBrush{diff --git a/src/managed/Nota.App/Controls/FluxVectorPad.cs b/src/managed/Nota.App/Controls/FluxVectorPad.csindex 1cf76fd1..2608469b 100644--- a/src/managed/Nota.App/Controls/FluxVectorPad.cs+++ b/src/managed/Nota.App/Controls/FluxVectorPad.cs@@ -19,16 +19,16 @@ namespace Nota.App;internal sealed class FluxVectorPad : Control{- private static readonly Color Inset = Color.Parse("#100F0D");- private static readonly Color GridCol = Color.Parse("#1C1A16");- private static readonly Color BorderCol = Color.Parse("#221F1A");- private static readonly Color Warm = Color.Parse("#D8A03D"); // top-left- private static readonly Color Glass = Color.Parse("#6D8FB5"); // top-right- private static readonly Color Moog = Color.Parse("#C4756A"); // bottom-left- private static readonly Color Grain = Color.Parse("#7E8A6A"); // bottom-right- private static readonly Color DotCol = Color.Parse("#F0C060");- private static readonly Color Teal = Color.Parse("#5B9E9C");- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));+ private static Color Inset => NotaPalette.BgSunken.Color;+ private static Color GridCol => NotaPalette.PadGrid.Color;+ private static Color BorderCol => NotaPalette.GraphBorder.Color;+ private static Color Warm => NotaPalette.Accent.Color; // top-left+ private static Color Glass => NotaPalette.InkColor("#6D8FB5"); // top-right+ private static Color Moog => NotaPalette.InkColor("#C4756A"); // bottom-left+ private static Color Grain => NotaPalette.InkColor("#7E8A6A"); // bottom-right+ private static Color DotCol => NotaPalette.AccentBright.Color;+ private static Color Teal => NotaPalette.Teal.Color;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;private double _x = 0.34, _y = 0.28; // base vector (params)private double _gx = 0.34, _gy = 0.28; // effective (Motion + React) ghost@@ -115,7 +115,7 @@ internal sealed class FluxVectorPad : Control// current vector dot (glow + bright core).ctx.DrawEllipse(new SolidColorBrush(DotCol, 0.28), null, new Point(bx, by), 11, 11);- ctx.DrawEllipse(new SolidColorBrush(DotCol), new Pen(new SolidColorBrush(Color.Parse("#171613")), 1), new Point(bx, by), 6, 6);+ ctx.DrawEllipse(new SolidColorBrush(DotCol), new Pen(NotaPalette.BgApp, 1), new Point(bx, by), 6, 6);// 1px inner border to match the mockup pad frame.ctx.DrawRectangle(null, new Pen(new SolidColorBrush(BorderCol), 1), r, 8, 8);diff --git a/src/managed/Nota.App/Controls/ForgeViz.cs b/src/managed/Nota.App/Controls/ForgeViz.csindex 5e72b70a..9b2ab2f6 100644--- a/src/managed/Nota.App/Controls/ForgeViz.cs+++ b/src/managed/Nota.App/Controls/ForgeViz.cs@@ -68,13 +68,13 @@ internal sealed class ForgeTransferCurve : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush BorderB = NotaPalette.BorderDefault;- private static readonly IPen Grid = new Pen(new SolidColorBrush(Color.FromArgb(0x30, 0x1E, 0x1C, 0x18)), 1);- private static readonly IPen Diag = new Pen(new SolidColorBrush(Color.FromArgb(0x40, 0x26, 0x23, 0x1E)), 1) { DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };+ private static readonly IPen Grid = new Pen(NotaPalette.Wash(NotaPalette.SurfaceCard, 0x30), 1);+ private static readonly IPen Diag = new Pen(NotaPalette.Wash(NotaPalette.SurfaceRaised, 0x40), 1) { DashStyle = new DashStyle(new double[] { 3, 3 }, 0) };private static readonly IPen CurvePen = new Pen(NotaPalette.Accent, 1.8);- private static readonly IBrush CurveFill = new SolidColorBrush(Color.FromArgb(0x14, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush CurveFill = NotaPalette.Wash(NotaPalette.Accent, 0x14);private static readonly IPen ModPen = new Pen(NotaPalette.Teal, 1.3) { DashStyle = new DashStyle(new double[] { 4, 3 }, 0) };private static readonly IBrush AxisB = NotaPalette.TextTertiary;- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));+ private static readonly IBrush Muted = NotaPalette.TextTertiary;private static readonly Typeface Face = new(FontFamily.Default);private readonly IAudioEngine _engine;@@ -151,9 +151,9 @@ internal sealed class ForgeHarmonics : Controlprivate static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush BorderB = NotaPalette.BorderDefault;private static readonly IBrush OddB = NotaPalette.Accent;- private static readonly IBrush EvenB = new SolidColorBrush(Color.FromArgb(0x73, 0xD8, 0xA0, 0x3D)); // 45%- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush LabelC = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush EvenB = NotaPalette.Wash(NotaPalette.Accent, 0x73); // 45%+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush LabelC = NotaPalette.TextSecondary;private static readonly Typeface Face = new(FontFamily.Default);private readonly IAudioEngine _engine;diff --git a/src/managed/Nota.App/Controls/GrainWaveViz.cs b/src/managed/Nota.App/Controls/GrainWaveViz.csindex a42e3e16..af46c448 100644--- a/src/managed/Nota.App/Controls/GrainWaveViz.cs+++ b/src/managed/Nota.App/Controls/GrainWaveViz.cs@@ -21,10 +21,10 @@ internal sealed class GrainWaveViz : Controlprivate static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush Wave = NotaPalette.Accent;private static readonly IPen MidLine = new Pen(NotaPalette.GridBar, 1);- private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(0x55, 0x3A, 0x36, 0x2D)), 1);- private static readonly IBrush SprayFill = new SolidColorBrush(Color.FromArgb(0x16, 0xD8, 0xA0, 0x3D));- private static readonly IPen SprayEdge = new Pen(new SolidColorBrush(Color.FromArgb(0x55, 0xD8, 0xA0, 0x3D)), 1);- private static readonly IPen PosPen = new Pen(new SolidColorBrush(Color.FromArgb(0x9A, 0xF0, 0xC0, 0x60)), 1) { DashStyle = DashStyle.Dash };+ private static readonly IPen GridPen = new Pen(NotaPalette.Wash(NotaPalette.BorderStrong, 0x55), 1);+ private static readonly IBrush SprayFill = NotaPalette.Wash(NotaPalette.Accent, 0x16);+ private static readonly IPen SprayEdge = new Pen(NotaPalette.Wash(NotaPalette.Accent, 0x55), 1);+ private static readonly IPen PosPen = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x9A), 1) { DashStyle = DashStyle.Dash };private static readonly IBrush PlayCol = NotaPalette.Success;private static readonly IBrush GridText = NotaPalette.TextTertiary;private static readonly Typeface Mono = new("monospace");diff --git a/src/managed/Nota.App/Controls/LengthGateViz.cs b/src/managed/Nota.App/Controls/LengthGateViz.csindex 3709b73e..419beea1 100644--- a/src/managed/Nota.App/Controls/LengthGateViz.cs+++ b/src/managed/Nota.App/Controls/LengthGateViz.cs@@ -15,14 +15,14 @@ namespace Nota.App;internal sealed class LengthGateViz : Control{- private static readonly IBrush Well = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Track = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberDim = new SolidColorBrush(Color.FromArgb(0x88, 0xD8, 0xA0, 0x3D));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Axis = new SolidColorBrush(Color.Parse("#4A463D"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush Well = NotaPalette.BgSunken;+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;+ private static readonly IBrush Track = NotaPalette.BgApp;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberDim = NotaPalette.Wash(NotaPalette.Accent, 0x88);+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Axis = NotaPalette.TextDisabled;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));private const double FullMs = 2000.0;diff --git a/src/managed/Nota.App/Controls/MixBar.cs b/src/managed/Nota.App/Controls/MixBar.csindex 5735837b..b52ba184 100644--- a/src/managed/Nota.App/Controls/MixBar.cs+++ b/src/managed/Nota.App/Controls/MixBar.cs@@ -15,8 +15,8 @@ namespace Nota.App;private static readonly IBrush Sunken = NotaPalette.BgSunken;private readonly IAudioEngine _e; private readonly int _t; private readonly int[] _ix;private static readonly IBrush S0 = NotaPalette.Accent;- private static readonly IBrush S1 = new SolidColorBrush(Color.FromArgb(0x8C, 0xD8, 0xA0, 0x3D));- private static readonly IBrush S2 = new SolidColorBrush(Color.FromArgb(0x47, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush S1 = NotaPalette.Wash(NotaPalette.Accent, 0x8C);+ private static readonly IBrush S2 = NotaPalette.Wash(NotaPalette.Accent, 0x47);public MixBar(IAudioEngine e, int t, int[] ix) { _e = e; _t = t; _ix = ix; Height = 6; }public void Refresh() => InvalidateVisual();private float V(int k) => _ix[k] >= 0 ? _e.PluginParamGet(_t, -1, _ix[k]) : 0f;diff --git a/src/managed/Nota.App/Controls/MonolithViews.cs b/src/managed/Nota.App/Controls/MonolithViews.csindex ee8f7a65..521d8def 100644--- a/src/managed/Nota.App/Controls/MonolithViews.cs+++ b/src/managed/Nota.App/Controls/MonolithViews.cs@@ -69,11 +69,11 @@ internal sealed class MonolithWaveIcon : Control// roll-off. Draggable — X sets cutoff, Y sets emphasis (via the Changed callback).internal sealed class MonolithFilterCurve : Control{- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Grid = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Fill = new SolidColorBrush(Color.FromArgb(0x1E, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Grid = NotaPalette.SurfaceCard;+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Accent, 0x1E);private static readonly Typeface Mono = new("ui-monospace, monospace");private double _cut = 0.5, _reso;private bool _drag;@@ -151,7 +151,7 @@ internal sealed class MonolithFilterCurve : Controlinternal sealed class MonolithEnvCurve : Control{private double _a, _d, _s = 0.8;- public IBrush Accent { get; set; } = new SolidColorBrush(Color.Parse("#D8A03D"));+ public IBrush Accent { get; set; } = NotaPalette.Accent;public void Set(double a, double d, double s) { _a = a; _d = d; _s = s; }diff --git a/src/managed/Nota.App/Controls/OperatorAlgoViz.cs b/src/managed/Nota.App/Controls/OperatorAlgoViz.csindex 63f90f96..eb32568e 100644--- a/src/managed/Nota.App/Controls/OperatorAlgoViz.cs+++ b/src/managed/Nota.App/Controls/OperatorAlgoViz.cs@@ -126,7 +126,7 @@ internal sealed class OperatorRoutingViz : Controlprivate static readonly IBrush Teal = NotaPalette.Teal;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush AccentSubtle = NotaPalette.AccentSubtle;- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.Parse("#5B9E9C"), 0.18);+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x2E);private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;private static readonly Typeface Bold = new(FontFamily.Default, FontStyle.Normal, FontWeight.Bold);private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));diff --git a/src/managed/Nota.App/Controls/OperatorSpectrumViz.cs b/src/managed/Nota.App/Controls/OperatorSpectrumViz.csindex 5025b099..ddd2bec2 100644--- a/src/managed/Nota.App/Controls/OperatorSpectrumViz.cs+++ b/src/managed/Nota.App/Controls/OperatorSpectrumViz.cs@@ -20,7 +20,7 @@ internal sealed class OperatorSpectrumViz : Controlprivate static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly Color Brass = ((SolidColorBrush)NotaPalette.Accent).Color;private static readonly Color BrassLit = ((SolidColorBrush)NotaPalette.AccentBright).Color;- private static readonly IBrush Axis = new SolidColorBrush(Color.Parse("#4A463D"));+ private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly IBrush Amber = NotaPalette.AccentBright;private static readonly Typeface Mono = new(new FontFamily("Geist Mono, monospace"));diff --git a/src/managed/Nota.App/Controls/PendulumViz.cs b/src/managed/Nota.App/Controls/PendulumViz.csindex 7e1b5ea9..3b56a2de 100644--- a/src/managed/Nota.App/Controls/PendulumViz.cs+++ b/src/managed/Nota.App/Controls/PendulumViz.cs@@ -24,16 +24,16 @@ namespace Nota.App;internal sealed class PendulumViz : Control{private static readonly IBrush Sunken = NotaPalette.BgSunken;- private static readonly IBrush FieldBorder = new SolidColorBrush(Color.Parse("#221F1A"));+ private static readonly IBrush FieldBorder = NotaPalette.GraphBorder;private static readonly IBrush Brass = NotaPalette.Accent;private static readonly IBrush AccentBright = NotaPalette.AccentBright;- private static readonly IBrush Lane = new SolidColorBrush(Color.Parse("#1E1C18"));+ private static readonly IBrush Lane = NotaPalette.SurfaceCard;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly Color TrailColor = Color.Parse("#D8A03D");- private static readonly IBrush RailUp = new SolidColorBrush(Color.Parse("#5B9E9C")); // ∧ solid teal- private static readonly IBrush RailDn = new SolidColorBrush(Color.FromArgb(0x8C, 0x5B, 0x9E, 0x9C)); // ∨ dimmed- private static readonly Pen TriggerPen = new(new SolidColorBrush(Color.FromArgb(0x47, 0xF0, 0xC0, 0x60)), 1) { DashStyle = DashStyle.Dash };- private static readonly Pen ApexPen = new(new SolidColorBrush(Color.FromArgb(0x59, 0xF0, 0xC0, 0x60)), 1);+ private static Color TrailColor => NotaPalette.Accent.Color;+ private static readonly IBrush RailUp = NotaPalette.Teal; // ∧ solid teal+ private static readonly IBrush RailDn = NotaPalette.Wash(NotaPalette.Teal, 0x8C); // ∨ dimmed+ private static readonly Pen TriggerPen = new(NotaPalette.Wash(NotaPalette.AccentBright, 0x47), 1) { DashStyle = DashStyle.Dash };+ private static readonly Pen ApexPen = new(NotaPalette.Wash(NotaPalette.AccentBright, 0x59), 1);private static readonly Typeface Face = new(FontFamily.Default);private const int MaxBalls = 6;diff --git a/src/managed/Nota.App/Controls/PentadViews.cs b/src/managed/Nota.App/Controls/PentadViews.csindex 74b3bcab..03340cd4 100644--- a/src/managed/Nota.App/Controls/PentadViews.cs+++ b/src/managed/Nota.App/Controls/PentadViews.cs@@ -58,7 +58,7 @@ internal sealed class PentadWaveIcon : Controlinternal sealed class PentadFilterCurve : Control{private static readonly IBrush Grid = NotaPalette.SurfaceCard;- private static readonly IBrush Fill = new SolidColorBrush(Color.FromArgb(0x1E, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Accent, 0x1E);private static readonly Typeface Mono = new("ui-monospace, monospace");private double _cut = 0.5, _reso, _comp;private bool _drag;diff --git a/src/managed/Nota.App/Controls/PhysViz.cs b/src/managed/Nota.App/Controls/PhysViz.csindex afd93659..cf0224b3 100644--- a/src/managed/Nota.App/Controls/PhysViz.cs+++ b/src/managed/Nota.App/Controls/PhysViz.cs@@ -18,7 +18,7 @@ namespace Nota.App;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;public enum K { Glyph, Decay }- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private readonly K _k;private int _st;@@ -43,7 +43,7 @@ namespace Nota.App;string[] names = { "STRING", "MEMBRANE", "TUBE", "BODY" };Label(ctx, names[Math.Clamp(_st, 0, 3)], x0, pad - 1, TextTertiary);double cx = (x0 + x1) / 2, cy = (top + bot) / 2, rw = (x1 - x0) / 2, rh = (bot - top) / 2;- var faint = new Pen(new SolidColorBrush(Color.FromArgb(0x66, 0xF0, 0xC0, 0x60)), 1.2, lineCap: PenLineCap.Round);+ var faint = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x66), 1.2, lineCap: PenLineCap.Round);switch (Math.Clamp(_st, 0, 3)){case 0: // String: a plucked line pulled aside at the pluck position.@@ -130,7 +130,7 @@ namespace Nota.App;double oy = cyMid(top, bot) - a * (bot - top) * 0.42 * Math.Sin(t * f);go.LineTo(new Point(x, oy));}- ctx.DrawGeometry(null, new Pen(new SolidColorBrush(Color.FromArgb(0x55, 0xF0, 0xC0, 0x60)), 1), osc);+ ctx.DrawGeometry(null, new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x55), 1), osc);ctx.DrawGeometry(null, pen, env);}}diff --git a/src/managed/Nota.App/Controls/PrismViews.cs b/src/managed/Nota.App/Controls/PrismViews.csindex adc55ef0..a310477e 100644--- a/src/managed/Nota.App/Controls/PrismViews.cs+++ b/src/managed/Nota.App/Controls/PrismViews.cs@@ -30,7 +30,7 @@ internal static class PrismInk// Text / handle tint for the selected band (the brass band lights up to AccentBright).public static readonly IBrush[] BandLit = { Band[0], NotaPalette.AccentBright, Band[2] };public static readonly string[] Names = { "Low", "Mid", "High" };- public static readonly IBrush InnerBorder = new SolidColorBrush(Color.Parse("#221F1A"));+ public static readonly IBrush InnerBorder = NotaPalette.GraphBorder;public static readonly IPen InnerPen = new Pen(InnerBorder, 1);private static readonly Typeface Mono = new("ui-monospace, Menlo, monospace");private static readonly Typeface Sans = new("Inter, system-ui, sans-serif", FontStyle.Normal, FontWeight.Bold);diff --git a/src/managed/Nota.App/Controls/ReverbTail.cs b/src/managed/Nota.App/Controls/ReverbTail.csindex 21109770..7f005237 100644--- a/src/managed/Nota.App/Controls/ReverbTail.cs+++ b/src/managed/Nota.App/Controls/ReverbTail.cs@@ -22,9 +22,9 @@ internal sealed class ReverbTail : Controlprivate static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush Accent = NotaPalette.AccentBright;private static readonly IBrush Teal = NotaPalette.Teal;- private static readonly IBrush GridB = new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D));- private static readonly IBrush Fill = new SolidColorBrush(Color.FromArgb(0x20, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TealFill = new SolidColorBrush(Color.FromArgb(0x1E, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush GridB = NotaPalette.Wash(NotaPalette.BorderStrong, 0x40);+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Accent, 0x20);+ private static readonly IBrush TealFill = NotaPalette.Wash(NotaPalette.Teal, 0x1E);private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly Typeface Face = new(FontFamily.Default);diff --git a/src/managed/Nota.App/Controls/RhythmHitViz.cs b/src/managed/Nota.App/Controls/RhythmHitViz.csindex 0e3c8c89..068e0aba 100644--- a/src/managed/Nota.App/Controls/RhythmHitViz.cs+++ b/src/managed/Nota.App/Controls/RhythmHitViz.cs@@ -16,9 +16,9 @@ internal sealed class RhythmHitViz : Control{private double _decay = 0.5, _tune = 0.4, _punch = 0.5, _flash;- private static readonly IBrush EnvBrush = new SolidColorBrush(Color.Parse("#5A4C2E"));- private static readonly Color Osc = Color.Parse("#F0C060");- private static readonly IPen ClickPen = new Pen(new SolidColorBrush(Color.Parse("#7FC9C6")) { Opacity = 0.5 }, 1);+ private static readonly IBrush EnvBrush = NotaPalette.AccentTint;+ private static Color Osc => NotaPalette.AccentBright.Color;+ private static readonly IPen ClickPen = new Pen(NotaPalette.Wash(NotaPalette.TealBright, 0x80), 1);public void Set(double decay, double tune, double punch, double flash){diff --git a/src/managed/Nota.App/Controls/RhythmWaveViz.cs b/src/managed/Nota.App/Controls/RhythmWaveViz.csindex 34e6d43b..c1f81715 100644--- a/src/managed/Nota.App/Controls/RhythmWaveViz.cs+++ b/src/managed/Nota.App/Controls/RhythmWaveViz.cs@@ -13,8 +13,8 @@ namespace Nota.App;internal sealed class RhythmWaveViz : Control{private float[] _peaks = System.Array.Empty<float>(); // per-column max |amp|, 0..1- private static readonly IBrush Fill = new SolidColorBrush(Color.Parse("#5B9E9C")) { Opacity = 0.85 };- private static readonly IPen Mid = new Pen(new SolidColorBrush(Color.Parse("#2C2923")), 1);+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Teal, 0xD9);+ private static readonly IPen Mid = new Pen(NotaPalette.BorderDefault, 1);public void SetSamples(float[] interleaved, int channels){diff --git a/src/managed/Nota.App/Controls/ShutterViz.cs b/src/managed/Nota.App/Controls/ShutterViz.csindex 2385a114..b8d95d87 100644--- a/src/managed/Nota.App/Controls/ShutterViz.cs+++ b/src/managed/Nota.App/Controls/ShutterViz.cs@@ -27,14 +27,14 @@ internal sealed class ShutterSignal : Controlprivate static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush BorderB = NotaPalette.BorderDefault;- private static readonly IBrush InFill = new SolidColorBrush(Color.FromArgb(0x8C, 0x3E, 0x4A, 0x3C));- private static readonly IPen InPen = new Pen(new SolidColorBrush(Color.FromArgb(0xA0, 0x52, 0x60, 0x50)), 1);+ private static readonly IBrush InFill = NotaPalette.Wash(NotaPalette.SignalInFill, 0x8C);+ private static readonly IPen InPen = new Pen(NotaPalette.Wash(NotaPalette.SignalIn, 0xA0), 1);private static readonly IPen GatePen = new Pen(NotaPalette.Accent, 1.8);- private static readonly IBrush GateFill = new SolidColorBrush(Color.FromArgb(0x12, 0xD8, 0xA0, 0x3D));- private static readonly IPen ThrPen = new Pen(new SolidColorBrush(Color.Parse("#C9884F")), 1) { DashStyle = new DashStyle(new double[] { 4, 3 }, 0) };- private static readonly IPen RetPen = new Pen(new SolidColorBrush(Color.FromArgb(0xB0, 0x6E, 0x6A, 0x5E)), 1) { DashStyle = new DashStyle(new double[] { 2, 4 }, 0) };- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush ThrC = new SolidColorBrush(Color.Parse("#C9884F"));+ private static readonly IBrush GateFill = NotaPalette.Wash(NotaPalette.Accent, 0x12);+ private static readonly IPen ThrPen = new Pen(NotaPalette.Threshold, 1) { DashStyle = new DashStyle(new double[] { 4, 3 }, 0) };+ private static readonly IPen RetPen = new Pen(NotaPalette.Wash(NotaPalette.TextTertiary, 0xB0), 1) { DashStyle = new DashStyle(new double[] { 2, 4 }, 0) };+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush ThrC = NotaPalette.Threshold;private static readonly IBrush AxisB = NotaPalette.TextTertiary;private static readonly Typeface Face = new(FontFamily.Default);@@ -114,7 +114,7 @@ internal sealed class ShutterSignal : Controlvoid Lbl(string s, double x, double y, IBrush b) => ctx.DrawText(new FormattedText(s, System.Globalization.CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 8, b), new Point(x, y));Lbl("SIGNAL", gx, 2, Muted);- Lbl("▩ input", gx + gw - 154, 2, new SolidColorBrush(Color.Parse("#52604F")));+ Lbl("▩ input", gx + gw - 154, 2, NotaPalette.SignalIn);Lbl("─ gate gain", gx + gw - 108, 2, NotaPalette.Accent);Lbl("┄ threshold", gx + gw - 48, 2, ThrC);Lbl($"THRESHOLD {_thrDb:0}", gx + 2, YDb(_thrDb, gy, gh) - 10, ThrC);@@ -130,11 +130,11 @@ internal sealed class ShutterDetectorEQ : Controlprivate const double FMin = 20, FMax = 20000;private static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IBrush BorderB = new SolidColorBrush(Color.Parse("#221F1A"));+ private static readonly IBrush BorderB = NotaPalette.GraphBorder;private static readonly IPen CurvePen = new Pen(NotaPalette.Teal, 1.4);- private static readonly IBrush CurveFill = new SolidColorBrush(Color.FromArgb(0x14, 0x5B, 0x9E, 0x9C));- private static readonly IBrush Handle = new SolidColorBrush(Color.Parse("#7FC9C6"));- private static readonly IBrush Axis = new SolidColorBrush(Color.Parse("#4A463D"));+ private static readonly IBrush CurveFill = NotaPalette.Wash(NotaPalette.Teal, 0x14);+ private static readonly IBrush Handle = NotaPalette.TealBright;+ private static readonly IBrush Axis = NotaPalette.TextDisabled;private static readonly Typeface Face = new(FontFamily.Default);private double _hp = 0.301, _lp = 0.548; // normalized DetHP / DetLP@@ -175,7 +175,7 @@ internal sealed class ShutterDetectorEQ : Controlif (w <= 0 || h <= 0) return;ctx.DrawRectangle(Bg, new Pen(BorderB, 1), new Rect(0, 0, w, h), 5, 5);double hpF = Exp(_hp, HpLo, HpHi), lpF = Exp(_lp, LpLo, LpHi);- ctx.DrawLine(new Pen(new SolidColorBrush(Color.Parse("#1E1C18")), 1), new Point(0, h * 0.75), new Point(w, h * 0.75));+ ctx.DrawLine(new Pen(NotaPalette.SurfaceCard, 1), new Point(0, h * 0.75), new Point(w, h * 0.75));// band-pass magnitude (1-pole HP × 1-pole LP), log-x.int n = (int)Math.Clamp(w, 24, 150);@@ -211,10 +211,10 @@ internal sealed class ShutterDetectorEQ : Control// Tiny attack/hold/release trapezoid glyph.internal sealed class AHRGlyph : Control{- private static readonly IBrush Bg = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush BorderB = new SolidColorBrush(Color.Parse("#221F1A"));+ private static readonly IBrush Bg = NotaPalette.BgSunken;+ private static readonly IBrush BorderB = NotaPalette.GraphBorder;private static readonly IPen Line = new Pen(NotaPalette.Accent, 1.6) { LineJoin = PenLineJoin.Round };- private static readonly IPen Dash = new Pen(new SolidColorBrush(Color.Parse("#3A362D")), 1) { DashStyle = new DashStyle(new double[] { 2, 2 }, 0) };+ private static readonly IPen Dash = new Pen(NotaPalette.BorderStrong, 1) { DashStyle = new DashStyle(new double[] { 2, 2 }, 0) };public override void Render(DrawingContext ctx){diff --git a/src/managed/Nota.App/Controls/StereoMeter.cs b/src/managed/Nota.App/Controls/StereoMeter.csindex 232b3fb1..a0b7f951 100644--- a/src/managed/Nota.App/Controls/StereoMeter.cs+++ b/src/managed/Nota.App/Controls/StereoMeter.cs@@ -14,9 +14,9 @@ namespace Nota.App;internal sealed class StereoMeter : Control{- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Green = new SolidColorBrush(Color.Parse("#58B368"));- private static readonly IBrush Peak = new SolidColorBrush(Color.Parse("#D9C34C"));+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Green = NotaPalette.Success;+ private static readonly IBrush Peak = NotaPalette.Warning;private float _l, _r, _pkL, _pkR;private static float Norm(float peak) => peak > 1e-4f ? (float)Math.Clamp((20 * Math.Log10(peak) + 60) / 60.0, 0, 1) : 0f;diff --git a/src/managed/Nota.App/Controls/StrataWave.cs b/src/managed/Nota.App/Controls/StrataWave.csindex c7e337e7..c25ed4c1 100644--- a/src/managed/Nota.App/Controls/StrataWave.cs+++ b/src/managed/Nota.App/Controls/StrataWave.cs@@ -17,7 +17,7 @@ namespace Nota.App;internal sealed class StrataWave : Control{private float[] _env = Array.Empty<float>();- private Color _color = Color.Parse("#C99C55");+ private Color _color = NotaPalette.InkColor("#C99C55");private bool _muted, _recording;private float _progress = 1f; // 0..1 of the loop that has been recorded (rec layer)@@ -31,9 +31,9 @@ internal sealed class StrataWave : Control{double w = Bounds.Width, h = Bounds.Height; if (w <= 0 || h <= 0 || _env.Length == 0) return;int n = _env.Length; double bw = w / n, mid = h / 2;- var full = _muted ? new SolidColorBrush(Color.Parse("#3A362D"))- : new SolidColorBrush(_recording ? Color.Parse("#D95F4C") : Color.FromArgb(0xCC, _color.R, _color.G, _color.B));- var future = new SolidColorBrush(Color.Parse("#221F1A"));+ var full = _muted ? NotaPalette.BorderStrong+ : new SolidColorBrush(_recording ? NotaPalette.Danger.Color : Color.FromArgb(0xCC, _color.R, _color.G, _color.B));+ var future = NotaPalette.GraphBorder;double cut = _recording ? _progress * n : n;for (int i = 0; i < n; i++){diff --git a/src/managed/Nota.App/Controls/SynthViz.cs b/src/managed/Nota.App/Controls/SynthViz.csindex 7066afd5..79be8449 100644--- a/src/managed/Nota.App/Controls/SynthViz.cs+++ b/src/managed/Nota.App/Controls/SynthViz.cs@@ -22,16 +22,16 @@ internal sealed class SynthViz : Controlprivate static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly Color TealColor = Color.Parse("#5B9E9C");- private static readonly Color BrassColor = Color.Parse("#D8A03D");+ private static Color TealColor => NotaPalette.Teal.Color;+ private static Color BrassColor => NotaPalette.Accent.Color;private static readonly IBrush Teal = new SolidColorBrush(TealColor);private static readonly IBrush TealFill = new SolidColorBrush(TealColor, 0.10);private static readonly IBrush Brass = new SolidColorBrush(BrassColor);private static readonly IBrush BrassFill = new SolidColorBrush(BrassColor, 0.09);- private static readonly IBrush Handle = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush DimMono = new SolidColorBrush(Color.Parse("#4A463D"));- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0xFF, 0x1E, 0x1C, 0x18));- private static readonly IBrush GridDash = new SolidColorBrush(Color.FromArgb(0xFF, 0x26, 0x23, 0x1E));+ private static readonly IBrush Handle = NotaPalette.AccentBright;+ private static readonly IBrush DimMono = NotaPalette.TextDisabled;+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.SurfaceCard, 0xFF);+ private static readonly IBrush GridDash = NotaPalette.Wash(NotaPalette.SurfaceRaised, 0xFF);private static readonly Typeface Face = new(FontFamily.Default);private const double Pad = 8;@@ -137,7 +137,7 @@ internal sealed class SynthViz : Controlctx.DrawLine(pen, new Point(cx, bumpY), new Point(x1, bot));// Cutoff handle + guide line.- ctx.DrawLine(new Pen(new SolidColorBrush(Color.Parse("#F0C060"), 0.22), 1), new Point(cx, top - 6), new Point(cx, bot));+ ctx.DrawLine(new Pen(new SolidColorBrush(NotaPalette.AccentBright.Color, 0.22), 1), new Point(cx, top - 6), new Point(cx, bot));ctx.DrawEllipse(Handle, new Pen(Sunken, 2), new Point(cx, bumpY), 5.5, 5.5);// Labels: title, cutoff/Q readout, evenly-spaced Hz axis captions.diff --git a/src/managed/Nota.App/Controls/VelocityCurveViz.cs b/src/managed/Nota.App/Controls/VelocityCurveViz.csindex a178c86f..060a6c84 100644--- a/src/managed/Nota.App/Controls/VelocityCurveViz.cs+++ b/src/managed/Nota.App/Controls/VelocityCurveViz.cs@@ -15,12 +15,12 @@ namespace Nota.App;internal sealed class VelocityCurveViz : Control{- private static readonly IBrush GridB = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Ident = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Brass = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"), 0.5);- private static readonly IBrush Bright = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#100F0D"));+ private static readonly IBrush GridB = NotaPalette.SurfaceCard;+ private static readonly IBrush Ident = NotaPalette.SurfaceRaised;+ private static readonly IBrush Brass = NotaPalette.Accent;+ private static readonly IBrush Teal = NotaPalette.Wash(NotaPalette.Teal, 0x80);+ private static readonly IBrush Bright = NotaPalette.AccentBright;+ private static readonly IBrush Ink = NotaPalette.BgSunken;private Func<double, double>? _f;private readonly List<(double x, double y)> _dots = new();@@ -68,7 +68,7 @@ internal sealed class VelocityCurveViz : Controlif (_last is { } l && (l.x > 0 || l.y > 0)){var p = P(l.x, l.y);- ctx.DrawEllipse(new SolidColorBrush(Color.Parse("#F0C060"), 0.28), null, p, 7, 7);+ ctx.DrawEllipse(new SolidColorBrush(NotaPalette.AccentBright.Color, 0.28), null, p, 7, 7);ctx.DrawEllipse(Bright, new Pen(Ink, 2), p, 4.5, 4.5);}}diff --git a/src/managed/Nota.App/Controls/VintageViz.cs b/src/managed/Nota.App/Controls/VintageViz.csindex ad74ee33..ca44afff 100644--- a/src/managed/Nota.App/Controls/VintageViz.cs+++ b/src/managed/Nota.App/Controls/VintageViz.cs@@ -20,7 +20,7 @@ internal sealed class VintageViz : Controlprivate static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private static readonly string[] ModeNames = { "VINYL", "CASSETTE", "REEL", "VHS", "TUBE", "ANALOG" };// Mirrors Vintage.h kMode: shape, driveMul, bias, bandHz.@@ -93,7 +93,7 @@ internal sealed class VintageViz : Control// Grain speckle: dots scattered across the panel, count ∝ Noise+Crackle.int dots = (int)(_grain * 120);- var dotBrush = new SolidColorBrush(Color.FromArgb(0x90, 0xF0, 0xC0, 0x60));+ var dotBrush = NotaPalette.Wash(NotaPalette.AccentBright, 0x90);for (int i = 0; i < dots; i++){double dx = x0 + Rand() * (x1 - x0);@@ -105,8 +105,8 @@ internal sealed class VintageViz : Control// Bandwidth bar along the bottom: filled portion = retained highs (narrows with Wear).double frac = Math.Clamp((BandHz[_mode] * (1.0 - 0.55 * _wear)) / 20000.0, 0.05, 1.0);double by = bot + 6, bh = 3;- ctx.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D)), null, new Rect(x0, by, x1 - x0, bh), 1.5, 1.5);- ctx.DrawRectangle(new SolidColorBrush(Color.FromArgb(0xB0, 0x5A, 0xC8, 0xB0)), null, new Rect(x0, by, (x1 - x0) * frac, bh), 1.5, 1.5);+ ctx.DrawRectangle(NotaPalette.Wash(NotaPalette.BorderStrong, 0x40), null, new Rect(x0, by, x1 - x0, bh), 1.5, 1.5);+ ctx.DrawRectangle(NotaPalette.Wash(NotaPalette.Ink("#5AC8B0"), 0xB0), null, new Rect(x0, by, (x1 - x0) * frac, bh), 1.5, 1.5);ctx.DrawText(new FormattedText("DRIVE", CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 8, TextTertiary), new Point(x0, pad - 2));var t2 = new FormattedText(ModeNames[_mode], CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Face, 8, AccentBright);diff --git a/src/managed/Nota.App/Controls/VoltEnv.cs b/src/managed/Nota.App/Controls/VoltEnv.csindex 2ee2a4e2..be3b0046 100644--- a/src/managed/Nota.App/Controls/VoltEnv.cs+++ b/src/managed/Nota.App/Controls/VoltEnv.cs@@ -21,7 +21,7 @@ namespace Nota.App;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush AccentBright = NotaPalette.AccentBright;private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;- private static readonly IBrush GridB = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush GridB = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private readonly IAudioEngine _e;private readonly int _t;diff --git a/src/managed/Nota.App/Controls/VoltFilter.cs b/src/managed/Nota.App/Controls/VoltFilter.csindex 642e62fc..01edfc7e 100644--- a/src/managed/Nota.App/Controls/VoltFilter.cs+++ b/src/managed/Nota.App/Controls/VoltFilter.cs@@ -20,7 +20,7 @@ namespace Nota.App;private static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush AccentBright = NotaPalette.AccentBright;- private static readonly IBrush GridB = new SolidColorBrush(Color.FromArgb(0x50, 0x3A, 0x36, 0x2D));+ private static readonly IBrush GridB = NotaPalette.Wash(NotaPalette.BorderStrong, 0x50);private static readonly Typeface Face = new(FontFamily.Default);private readonly IAudioEngine _e;private readonly int _t;@@ -57,7 +57,7 @@ namespace Nota.App;void G1((int i, string id) p) { if (p.i < 0) return; if (begin) _e.BeginAutomationWrite(_t, AutomationTarget.PluginParam, -1, -1, p.id); else _e.EndAutomationWrite(_t, AutomationTarget.PluginParam, -1, -1, p.id); }G1(_freq); G1(_reso);}- private static readonly IBrush FillB = new SolidColorBrush(Color.FromArgb(0x18, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush FillB = NotaPalette.Wash(NotaPalette.Accent, 0x18);private static readonly IBrush AxisB = NotaPalette.TextDisabled;private static readonly IBrush HandleB = NotaPalette.AccentBright;@@ -125,7 +125,7 @@ namespace Nota.App;for (int i = 1; i < pts.Count; i++) ctx.DrawLine(pen, pts[i - 1], pts[i]);// Cutoff marker line + draggable handle at the curve's cutoff point.- ctx.DrawLine(new Pen(new SolidColorBrush(Color.FromArgb(0x40, 0xF0, 0xC0, 0x60)), 1), new Point(cx, top), new Point(cx, bot));+ ctx.DrawLine(new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x40), 1), new Point(cx, top), new Point(cx, bot));double hy = _type == 3 ? bot : Math.Max(top + 2, top + (bot - top) * 0.34 - res * ((bot - top) * 0.34) * 0.92);ctx.DrawEllipse(HandleB, new Pen(Sunken, 2), new Point(cx, hy), 4.5, 4.5);diff --git a/src/managed/Nota.App/Controls/VoltMatrix.cs b/src/managed/Nota.App/Controls/VoltMatrix.csindex a82c629c..5d009cce 100644--- a/src/managed/Nota.App/Controls/VoltMatrix.cs+++ b/src/managed/Nota.App/Controls/VoltMatrix.cs@@ -21,13 +21,13 @@ internal sealed class VoltMatrix : Control{private static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush BorderDef = NotaPalette.BorderDefault;- private static readonly IBrush GridB = new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D));+ private static readonly IBrush GridB = NotaPalette.Wash(NotaPalette.BorderStrong, 0x40);private static readonly IBrush Teal = NotaPalette.Teal;- private static readonly IBrush TealFill = new SolidColorBrush(Color.FromArgb(0x80, 0x5B, 0x9E, 0x9C));- private static readonly IBrush AmberFill = new SolidColorBrush(Color.FromArgb(0x80, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush TealFill = NotaPalette.Wash(NotaPalette.Teal, 0x80);+ private static readonly IBrush AmberFill = NotaPalette.Wash(NotaPalette.Accent, 0x80);private static readonly IBrush TxtC = NotaPalette.TextPrimary;private static readonly IBrush MutedC = NotaPalette.TextTertiary;- private static readonly IBrush CellBg = new SolidColorBrush(Color.Parse("#100F0D"));+ private static readonly IBrush CellBg = NotaPalette.BgSunken;private static readonly Typeface Face = new(FontFamily.Default);private readonly IAudioEngine _e;diff --git a/src/managed/Nota.App/DetailWindow.cs b/src/managed/Nota.App/DetailWindow.csindex 2e959e2b..0b755ce0 100644--- a/src/managed/Nota.App/DetailWindow.cs+++ b/src/managed/Nota.App/DetailWindow.cs@@ -40,7 +40,7 @@ internal sealed class DetailWindow : NotaWindowMinWidth = 520;MinHeight = 400;WindowStartupLocation = WindowStartupLocation.CenterOwner;- Background = Avalonia.Application.Current?.FindResource("Brush.BgApp") is IBrush bg ? bg : Brushes.Black;+ Background = NotaPalette.BgApp;ClipHost = new ContentControl { HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Stretch };ChainHost = new ContentControl { HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Stretch };diff --git a/src/managed/Nota.App/DeviceCardKit.cs b/src/managed/Nota.App/DeviceCardKit.csindex 30d34bdd..19f1c5fa 100644--- a/src/managed/Nota.App/DeviceCardKit.cs+++ b/src/managed/Nota.App/DeviceCardKit.cs@@ -35,7 +35,7 @@ internal static class DeviceCardKitinternal static readonly IBrush AccentBright = NotaPalette.AccentBright;internal static readonly IBrush OnAccent = NotaPalette.TextOnAccent;internal static readonly IBrush Teal = NotaPalette.Teal; // modulation accent- internal static readonly IBrush AccentSubtleB = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ internal static readonly IBrush AccentSubtleB = NotaPalette.AccentSubtle;internal static string Pct(float v) => $"{(int)Math.Round(v * 100)}%";diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AmpDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AmpDeviceBody.csindex a5750630..06bfe4c7 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/AmpDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/AmpDeviceBody.cs@@ -30,18 +30,18 @@ internal sealed class AmpDeviceBody : IDeviceBodyprivate static readonly string[] Cabs = { "Match", "1×12", "2×12", "4×12", "1×15" };private static readonly string[] Mics = { "Dyn", "Cond", "Rib" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Rail = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Card = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush Rail = NotaPalette.SurfaceInset;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Card = NotaPalette.SurfaceRaised;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);public double Width => 700;public bool FullBleed => true;@@ -216,7 +216,7 @@ internal sealed class AmpDeviceBody : IDeviceBodyvar body = new DockPanel { LastChildFill = true };DockPanel.SetDock(leftPanel, Dock.Left); DockPanel.SetDock(rightRail, Dock.Right);body.Children.Add(leftPanel); body.Children.Add(rightRail); body.Children.Add(tonePanel);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(liveStrip, Dock.Top); root.Children.Add(liveStrip); root.Children.Add(body);Sync();diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.csindex 5515e191..0841faca 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs@@ -30,19 +30,19 @@ internal sealed class AutoFilterDeviceBody : IDeviceBodyprivate static readonly string[] DivNames = { "2/1", "1/1", "1/2", "1/4", "1/8", "1/16", "1/32", "1/64" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush FieldBorder = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));- private static readonly IBrush RowLit = new SolidColorBrush(Color.Parse("#26231E"));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush FieldBorder = NotaPalette.GraphBorder;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);+ private static readonly IBrush RowLit = NotaPalette.SurfaceRaised;public double Width => 700;public bool FullBleed => true;@@ -110,8 +110,8 @@ internal sealed class AutoFilterDeviceBody : IDeviceBody{var fill = new Border { Height = 3, Background = Amber, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var track2 = new Border { Height = 3, Background = Inset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center };- var center = bipolar ? new Border { Width = 1, Background = new SolidColorBrush(Color.Parse("#3A362D")), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) } : null;- var handle = new Border { Width = 8, Height = 10, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var center = bipolar ? new Border { Width = 1, Background = NotaPalette.BorderStrong, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) } : null;+ var handle = new Border { Width = 8, Height = 10, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Height = 11, MinWidth = 40 }; slot.Children.Add(track2); if (center != null) slot.Children.Add(center); slot.Children.Add(fill); slot.Children.Add(handle);var val = new TextBlock { Text = fmt(P(p)), FontSize = 9, Foreground = TxtC, VerticalAlignment = VerticalAlignment.Center }; val.BindResource(TextBlock.FontFamilyProperty, "Font.Mono"); if (vw > 0) { val.Width = vw; val.TextAlignment = TextAlignment.Right; }bool drag = false;@@ -371,7 +371,7 @@ internal sealed class AutoFilterDeviceBody : IDeviceBodyvar root = new DockPanel{LastChildFill = true,- Background = new SolidColorBrush(Color.Parse("#171613")),+ Background = NotaPalette.BgApp,Children = { live, body }};@@ -404,9 +404,9 @@ internal sealed class AutoFilterDeviceBody : IDeviceBody// Sidechain gain slider (dB, ±24, bipolar).var gVal = new TextBlock { Text = $"{engine.DeviceSidechainGain(track, di):0.0}", FontSize = 9, Foreground = TxtC, VerticalAlignment = VerticalAlignment.Center, TextAlignment = TextAlignment.Right, Width = 28 };gVal.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");- var gFill = new Border { Height = 3, Background = new SolidColorBrush(Color.Parse("#3A362D")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var gFill = new Border { Height = 3, Background = NotaPalette.BorderStrong, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var gTrack = new Border { Height = 3, Background = Inset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center };- var gHandle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var gHandle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var gSlot = new Panel { Height = 10, MinWidth = 34, Children = { gTrack, gFill, gHandle } };void GUpd() { double db = engine.DeviceSidechainGain(track, di); double v = Math.Clamp((db + 24) / 48.0, 0, 1); double W = gSlot.Bounds.Width; gHandle.Margin = new Thickness(Math.Clamp(v * W - 4, 0, Math.Max(0, W - 8)), 0, 0, 0); gFill.Width = v * W; gVal.Text = $"{db:0.0}"; }bool gd = false;diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.csindex 5bf57200..e4262ac5 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs@@ -27,24 +27,24 @@ internal sealed class AutoGainDeviceBody : IDeviceBody// scope layout — must match AutoGain.h.private const int S_InLufs = 0, S_OutLufs = 1, S_InMom = 2, S_Target = 3, S_Applied = 4, S_TruePeak = 5, S_Corr = 6, S_ScLufs = 7, kScope = 9;- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealBright = new SolidColorBrush(Color.Parse("#7FC9C6"));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush LabelC = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Dim = new SolidColorBrush(Color.Parse("#3A362D"));- private static readonly IBrush Green = new SolidColorBrush(Color.Parse("#58B368"));- private static readonly IBrush Yellow = new SolidColorBrush(Color.Parse("#D9C34C"));- private static readonly IBrush Red = new SolidColorBrush(Color.Parse("#C55A47"));- private static readonly IBrush HandleC = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TealBright = NotaPalette.TealBright;+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush LabelC = NotaPalette.TextSecondary;+ private static readonly IBrush Dim = NotaPalette.BorderStrong;+ private static readonly IBrush Green = NotaPalette.Success;+ private static readonly IBrush Yellow = NotaPalette.Warning;+ private static readonly IBrush Red = NotaPalette.DangerDeep;+ private static readonly IBrush HandleC = NotaPalette.TextSecondary;public double Width => 700;public bool FullBleed => true;@@ -143,7 +143,7 @@ internal sealed class AutoGainDeviceBody : IDeviceBodytargetGroup.Opacity = engine.DeviceSidechainSource(track, di) >= 0 ? 0.4 : 1.0;var match = new Border { Background = Amber, CornerRadius = new CornerRadius(4), Padding = new Thickness(12, 3), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center,- Child = new TextBlock { Text = "MATCH", FontSize = 10, FontWeight = FontWeight.SemiBold, Foreground = new SolidColorBrush(Color.Parse("#171613")) } };+ Child = new TextBlock { Text = "MATCH", FontSize = 10, FontWeight = FontWeight.SemiBold, Foreground = NotaPalette.TextOnAccent } };match.PointerPressed += (_, e) => { e.Handled = true; SetP(Auto, 0f); foreach (var a in readouts) a(); }; // freeze the current correctionvar live = new Border { Height = 34, Background = HdrBg, BorderBrush = Border2, BorderThickness = new Thickness(0, 0, 0, 1),@@ -175,14 +175,14 @@ internal sealed class AutoGainDeviceBody : IDeviceBodyvar numCol = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Spacing = 1, Children = {applied, new TextBlock { Text = "dB applied", FontSize = 9, Foreground = MutedC }.WithMono(),new Border { Height = 8 },- new TextBlock { Text = "boost +12", FontSize = 8, Foreground = new SolidColorBrush(Color.Parse("#4A463D")) }.WithMono(),- new TextBlock { Text = "0 dB", FontSize = 8, Foreground = new SolidColorBrush(Color.Parse("#4A463D")) }.WithMono(),- new TextBlock { Text = "cut −12", FontSize = 8, Foreground = new SolidColorBrush(Color.Parse("#4A463D")) }.WithMono() } };+ new TextBlock { Text = "boost +12", FontSize = 8, Foreground = NotaPalette.TextDisabled }.WithMono(),+ new TextBlock { Text = "0 dB", FontSize = 8, Foreground = NotaPalette.TextDisabled }.WithMono(),+ new TextBlock { Text = "cut −12", FontSize = 8, Foreground = NotaPalette.TextDisabled }.WithMono() } };correction.Children.Add(new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), ColumnSpacing = 9, Children = { barSlot, WithCol(numCol, 1) } });var corrPanel = new Border { Width = 206, Child = correction };// ================= middle graph + stats =================- var stats = new TextBlock { FontSize = 8, Foreground = new SolidColorBrush(Color.Parse("#4A463D")), HorizontalAlignment = HorizontalAlignment.Center }.WithMono();+ var stats = new TextBlock { FontSize = 8, Foreground = NotaPalette.TextDisabled, HorizontalAlignment = HorizontalAlignment.Center }.WithMono();var mid = new DockPanel { LastChildFill = true, Margin = new Thickness(0, 7, 8, 7) };mid.AddDock(new Border { Height = 12, Child = stats, [DockPanel.DockProperty] = Dock.Bottom }, Dock.Bottom);mid.Children.Add(new Border { Child = hist });@@ -205,7 +205,7 @@ internal sealed class AutoGainDeviceBody : IDeviceBodyvar rail = new Border { Width = 184, Background = RailBg, BorderBrush = Border2, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 7),Child = new StackPanel { Spacing = 5, Children = {Cap("METERS"), inRow, outRow, tpRow, corRow,- new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")), Margin = new Thickness(0, 1) },+ new Border { Height = 1, Background = NotaPalette.SurfaceRaised, Margin = new Thickness(0, 1) },new Border { BorderBrush = TealC, BorderThickness = new Thickness(2, 0, 0, 0), Padding = new Thickness(7, 0, 0, 0), Child =new StackPanel { Spacing = 5, Children = {Cap("RESPONSE", TealC),@@ -218,7 +218,7 @@ internal sealed class AutoGainDeviceBody : IDeviceBodyDockPanel.SetDock(corrPanel, Dock.Left); DockPanel.SetDock(rail, Dock.Right);var body = new DockPanel { LastChildFill = true, Children = { corrPanel, rail, mid } };DockPanel.SetDock(live, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };// ---- live refresh from scope ----float MeterFrac(float lufs) => (float)Math.Clamp((lufs + 40) / 40.0, 0, 1); // −40..0diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.csindex 97d92fde..2b06e24c 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs@@ -28,21 +28,21 @@ internal sealed class AutoShiftDeviceBody : IDeviceBodyprivate static readonly string[] Scales = { "Chromatic", "Major", "Minor", "Penta Maj", "Penta Min" };private static readonly int[] Masks = { 0x0FFF, 0x0AB5, 0x05AD, 0x0295, 0x04A9 };- private static readonly IBrush Hdr = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Rail = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Bd2 = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealB = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedB = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Red = new SolidColorBrush(Color.Parse("#D95F4C"));- private static readonly IBrush Hue = new SolidColorBrush(Color.Parse("#3A362D"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));+ private static readonly IBrush Hdr = NotaPalette.SurfaceCard;+ private static readonly IBrush Rail = NotaPalette.SurfaceInset;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Bd2 = NotaPalette.GraphBorder;+ private static readonly IBrush CardBg = NotaPalette.SurfaceRaised;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealB = NotaPalette.Teal;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush MutedB = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Red = NotaPalette.Danger;+ private static readonly IBrush Hue = NotaPalette.BorderStrong;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;public double Width => 700;public bool FullBleed => true;@@ -84,7 +84,7 @@ internal sealed class AutoShiftDeviceBody : IDeviceBody// bipolar cents meter (fixed 96×8)var mCenter = new Border { Width = 1, Background = Hue, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch };- var mBand = new Border { Background = new SolidColorBrush(Color.FromArgb(0x59, 0xD9, 0x5F, 0x4C)), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Stretch };+ var mBand = new Border { Background = NotaPalette.Wash(NotaPalette.Danger, 0x59), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Stretch };var mMark = new Border { Width = 2, Background = Red, CornerRadius = new CornerRadius(1), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) };var centsMeter = new Panel { Width = 96, Height = 8, Children = { new Border { Background = Inset, CornerRadius = new CornerRadius(4) }, mCenter, mBand, mMark } };void SetMeter(double cents)@@ -186,7 +186,7 @@ internal sealed class AutoShiftDeviceBody : IDeviceBody}Control PillToggle(string label, int p, IBrush accent){- var knob = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = Ink, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1.5, 0) };+ var knob = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = NotaPalette.BgApp, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1.5, 0) };var pill = new Border { Width = 18, Height = 10, CornerRadius = new CornerRadius(5), Background = CardBg, BorderBrush = Hue, BorderThickness = new Thickness(1), Child = knob };var lbl = new TextBlock { Text = label, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = MutedB, VerticalAlignment = VerticalAlignment.Center };void Sync() { bool on = P(p) >= 0.5f; pill.Background = on ? accent : CardBg; pill.BorderBrush = on ? Brushes.Transparent : Hue; knob.Background = on ? Ink : MutedB; knob.HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left; lbl.Foreground = on ? accent : MutedB; }@@ -227,7 +227,7 @@ internal sealed class AutoShiftDeviceBody : IDeviceBody{var col = new StackPanel { Spacing = 2 };var cells = new Border[Scales.Length]; var texts = new TextBlock[Scales.Length];- void Sync() { int cur = ScaleOf(); for (int i = 0; i < Scales.Length; i++) { bool on = i == cur; cells[i].Background = on ? new SolidColorBrush(Color.FromArgb(0x30, 0xD8, 0xA0, 0x3D)) : Inset; texts[i].Foreground = on ? AmberLit : Sub; texts[i].FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal; } }+ void Sync() { int cur = ScaleOf(); for (int i = 0; i < Scales.Length; i++) { bool on = i == cur; cells[i].Background = on ? NotaPalette.Wash(NotaPalette.Accent, 0x30) : Inset; texts[i].Foreground = on ? AmberLit : Sub; texts[i].FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal; } }for (int i = 0; i < Scales.Length; i++){int iv = i;diff --git a/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.csindex 8788e90b..29e9f1a1 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs@@ -30,19 +30,19 @@ internal sealed class BeatRepeatDeviceBody : IDeviceBodyprivate static readonly string[] GridLbl = { "1/4", "1/8", "1/16", "1/32", "1/8T", "1/16T" };private static readonly string[] ModeLbl = { "Mix", "Insert", "Gate" };- private static readonly IBrush Hdr = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Rail = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealB = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedB = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Hue = new SolidColorBrush(Color.Parse("#3A362D"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));+ private static readonly IBrush Hdr = NotaPalette.SurfaceCard;+ private static readonly IBrush Rail = NotaPalette.SurfaceInset;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush CardBg = NotaPalette.SurfaceRaised;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealB = NotaPalette.Teal;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush MutedB = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Hue = NotaPalette.BorderStrong;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;public double Width => 700;public bool FullBleed => true;@@ -133,7 +133,7 @@ internal sealed class BeatRepeatDeviceBody : IDeviceBody}Control PillToggle(string label, int p, IBrush accent, out Action sync){- var knob = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = Ink, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1.5, 0) };+ var knob = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = NotaPalette.BgApp, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1.5, 0) };var pill = new Border { Width = 18, Height = 10, CornerRadius = new CornerRadius(5), Background = CardBg, BorderBrush = Hue, BorderThickness = new Thickness(1), Child = knob };var lbl = new TextBlock { Text = label, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = MutedB, VerticalAlignment = VerticalAlignment.Center };void Sync() { bool on = P(p) >= 0.5f; pill.Background = on ? accent : CardBg; pill.BorderBrush = on ? Brushes.Transparent : Hue; knob.Background = on ? Ink : MutedB; knob.HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left; lbl.Foreground = on ? accent : MutedB; }@@ -188,7 +188,7 @@ internal sealed class BeatRepeatDeviceBody : IDeviceBody// ============ LIVE strip ============var modeSeg = Seg(ModeLbl, () => Idx(Mode, 3), i => SetP(Mode, i / 2f));MidiLearn.Bind(modeSeg, MidiTarget.DeviceParam(track, di, Mode), engine.DeviceParamName(track, di, Mode));- var repeatBtn = TagBtn("Repeat ⏎", Amber, new SolidColorBrush(Color.FromArgb(0x24, 0xD8, 0xA0, 0x3D)), AmberLit, held => SetP(Latch, held ? 1f : 0f));+ var repeatBtn = TagBtn("Repeat ⏎", Amber, NotaPalette.Wash(NotaPalette.Accent, 0x24), AmberLit, held => SetP(Latch, held ? 1f : 0f));var latchBtn = PillToggle("Latch", Latch, Amber, out _);var liveLeft = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, VerticalAlignment = VerticalAlignment.Center, Children = {modeSeg, MiniSlider("CHANCE", Chance, PctF, 66), MiniSlider("GATE", Gate, StepF, 56) } };diff --git a/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.csindex 57094044..afbebe72 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs@@ -64,7 +64,7 @@ internal sealed class CeilingDeviceBody : IDeviceBodydouble ValOf(double n) { double x = lmn + Math.Clamp(n, 0, 1) * lspan; return log ? Math.Exp(x) : x; }var trk = new Border { Width = tw, Height = 3, Background = Sunken, CornerRadius = new CornerRadius(2) };var fill = new Border { Height = 3, Background = accent, CornerRadius = new CornerRadius(2) };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2) };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2) };var canvas = new Canvas { Width = tw, Height = 9, Background = Brushes.Transparent, VerticalAlignment = VerticalAlignment.Center };Canvas.SetTop(trk, 3); Canvas.SetTop(fill, 3); Canvas.SetTop(handle, 0);canvas.Children.Add(trk); canvas.Children.Add(fill); canvas.Children.Add(handle);@@ -103,7 +103,7 @@ internal sealed class CeilingDeviceBody : IDeviceBodygrNum.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");var grFill = new Border { Height = 8, Background = Teal, CornerRadius = new CornerRadius(4), HorizontalAlignment = HorizontalAlignment.Left };var grBar = new Border { Width = 96, Height = 8, Background = Sunken, CornerRadius = new CornerRadius(4), ClipToBounds = true, VerticalAlignment = VerticalAlignment.Center, Child = grFill };- var live = new Border { Height = 34, Background = new SolidColorBrush(Color.Parse("#1E1C18")), BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),+ var live = new Border { Height = 34, Background = NotaPalette.SurfaceCard, BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),Child = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(9, 0), Children = {Lbl("GR", 8, TextTertiary), grNum, grBar,HSlider(Ceil, "CEILING", DbT, false, Brass, 58), HSlider(Gain, "GAIN", Db1, false, Brass, 52), HSlider(Release, "RELEASE", Ms, true, Brass, 52),@@ -167,8 +167,8 @@ internal sealed class CeilingDeviceBody : IDeviceBodyvar bottomRow = new DockPanel { LastChildFill = false, Children = { scCombo } };DockPanel.SetDock(resetBtn, Dock.Right); bottomRow.Children.Add(resetBtn);- IBrush Div() => new SolidColorBrush(Color.Parse("#26231E"));- var rail = new Border { Width = 224, Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 7),+ IBrush Div() => NotaPalette.SurfaceRaised;+ var rail = new Border { Width = 224, Background = NotaPalette.SurfaceInset, BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 7),Child = new StackPanel { Spacing = 5, Children = {charStack,new Border { Height = 1, Background = Div() },@@ -190,21 +190,21 @@ internal sealed class CeilingDeviceBody : IDeviceBodymeters.Push(inDb, outDb, grDb);levelPlot.Tick(); grLane.Tick();- grNum.Text = $"{-grDb:0.0}"; grNum.Foreground = grDb > 3.0f ? new SolidColorBrush(Color.Parse("#D9C34C")) : Teal;- grFill.Width = Math.Clamp(grDb / 6.0, 0, 1) * 96; grFill.Background = grDb > 3.0f ? new SolidColorBrush(Color.Parse("#D9C34C")) : Teal;+ grNum.Text = $"{-grDb:0.0}"; grNum.Foreground = grDb > 3.0f ? NotaPalette.Warning : Teal;+ grFill.Width = Math.Clamp(grDb / 6.0, 0, 1) * 96; grFill.Background = grDb > 3.0f ? NotaPalette.Warning : Teal;if (inDb > peakInHold) peakInHold = inDb;if (outDb > peakOutHold) peakOutHold = outDb;if (grDb > maxGrHold) maxGrHold = grDb;if (tpDb > truePeakHold) truePeakHold = tpDb;- vPeakIn.Text = MDb(peakInHold); vPeakIn.Foreground = peakInHold > 0 ? new SolidColorBrush(Color.Parse("#D95F4C")) : TextPrimary;+ vPeakIn.Text = MDb(peakInHold); vPeakIn.Foreground = peakInHold > 0 ? NotaPalette.Danger : TextPrimary;vPeakOut.Text = MDb(peakOutHold);- vMaxGr.Text = maxGrHold > 0.05f ? $"−{maxGrHold:0.0}" : "0.0"; vMaxGr.Foreground = maxGrHold > 3 ? new SolidColorBrush(Color.Parse("#D9C34C")) : TextPrimary;+ vMaxGr.Text = maxGrHold > 0.05f ? $"−{maxGrHold:0.0}" : "0.0"; vMaxGr.Foreground = maxGrHold > 3 ? NotaPalette.Warning : TextPrimary;vLufsS.Text = lufsS <= -119 ? "—" : $"{lufsS:0.0}";vLufsI.Text = lufsI <= -119 ? "—" : $"{lufsI:0.0}";float ceil = P(Ceil);vTruePeak.Text = MDb(truePeakHold);- vTruePeak.Foreground = truePeakHold <= ceil + 0.05f ? Success : new SolidColorBrush(Color.Parse("#D95F4C"));+ vTruePeak.Foreground = truePeakHold <= ceil + 0.05f ? Success : NotaPalette.Danger;foreach (var a in readouts) a();}@@ -212,6 +212,6 @@ internal sealed class CeilingDeviceBody : IDeviceBodyRefresh();DockPanel.SetDock(live, Dock.Top);- return new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ return new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };}}diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.csindex 182ce5b5..46e00e05 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs@@ -51,10 +51,10 @@ internal sealed class ChamberDeviceBody : IDeviceBody("Stairwell", "SPACE", "3.2"), ("Forest Clearing", "OUTDOOR", "2.0"), ("Gated Room", "FX", "0.7"), ("Metal Tank", "FX", "3.4"),};- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;private static readonly IBrush Panel = NotaPalette.BgApp;private static readonly IBrush Border2 = NotaPalette.BorderDefault;- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;private static readonly IBrush Inset = NotaPalette.BgSunken;private static readonly IBrush TabBg = NotaPalette.SurfaceCard;private static readonly IBrush Amber = NotaPalette.Accent;diff --git a/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.csindex 8fdb2709..e7a283b9 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs@@ -86,7 +86,7 @@ internal sealed class CompressorDeviceBody : IDeviceBodydouble ValOf(double n) { double x = lmn + Math.Clamp(n, 0, 1) * lspan; return log ? Math.Exp(x) : x; }var trk = new Border { Width = tw, Height = 3, Background = Sunken, CornerRadius = new CornerRadius(2) };var fill = new Border { Height = 3, Background = accent, CornerRadius = new CornerRadius(2) };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2) };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2) };var canvas = new Canvas { Width = tw, Height = 9, Background = Brushes.Transparent, VerticalAlignment = VerticalAlignment.Center };Canvas.SetTop(trk, 3); Canvas.SetTop(fill, 3); Canvas.SetTop(handle, 0);canvas.Children.Add(trk); canvas.Children.Add(fill); canvas.Children.Add(handle);@@ -115,7 +115,7 @@ internal sealed class CompressorDeviceBody : IDeviceBodystring Hz(double v) => v >= 1000 ? $"{v / 1000:0.0}k" : $"{v:0}";// ---- top strip: character models + threshold/ratio/mix sliders ----- var live = new Border { Height = 34, Background = new SolidColorBrush(Color.Parse("#1E1C18")), BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),+ var live = new Border { Height = 34, Background = NotaPalette.SurfaceCard, BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),Child = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 12, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(9, 0), Children = {Chips(Character, Chars),HSlider(Threshold, "THRESH", DbT, false, Brass, 60), HSlider(Ratio, "RATIO", RatioF, true, Brass, 52), HSlider(Mix, "MIX", Pct, false, Brass, 52) } } };@@ -160,7 +160,7 @@ internal sealed class CompressorDeviceBody : IDeviceBodyvar timingCol = new StackPanel { Spacing = 6, VerticalAlignment = VerticalAlignment.Center, Children = { timing, Sidechain() } };// ---- output rail ----- var outRail = new Border { Width = 104, Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(7, 8),+ var outRail = new Border { Width = 104, Background = NotaPalette.SurfaceInset, BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(7, 8),Child = new StackPanel { Spacing = 8, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, Children = {Lbl("OUTPUT", 8, TextPrimary), Toggle(AutoGain, "Auto gain"),Cell("Makeup", Makeup, Db1, null, 40), Cell("Range", Range, v => v >= 47.5 ? "off" : $"−{v:0}", null, 36) } } };@@ -179,6 +179,6 @@ internal sealed class CompressorDeviceBody : IDeviceBodyforeach (var a in readouts) a();DockPanel.SetDock(live, Dock.Top);- return new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ return new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };}}diff --git a/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.csindex fd94f5fa..e3b1bec0 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs@@ -32,23 +32,23 @@ internal sealed class CrushDeviceBody : IDeviceBody// NoiseFloor, PostFilter, DryWet, AntiAlias, Output, Drive.private static readonly float[] Defaults = { 0.55f, 0.35f, 0f, 0.15f, 0f, 0f, 0.85f, 1f, 0f, 0.5f, 0.333f };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush FieldBorder = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));- private static readonly IBrush RowLit = new SolidColorBrush(Color.Parse("#26231E"));- internal static readonly IBrush GridLine = new SolidColorBrush(Color.Parse("#1E1C18"));- internal static readonly IBrush GridCenter = new SolidColorBrush(Color.Parse("#2C2923"));- internal static readonly IBrush SrcLine = new SolidColorBrush(Color.Parse("#4A463D"));- internal static readonly IBrush NyqLine = new SolidColorBrush(Color.FromArgb(0x73, 0xF0, 0xC0, 0x60));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush FieldBorder = NotaPalette.GraphBorder;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);+ private static readonly IBrush RowLit = NotaPalette.SurfaceRaised;+ internal static readonly IBrush GridLine = NotaPalette.SurfaceCard;+ internal static readonly IBrush GridCenter = NotaPalette.BorderDefault;+ internal static readonly IBrush SrcLine = NotaPalette.TextDisabled;+ internal static readonly IBrush NyqLine = NotaPalette.Wash(NotaPalette.AccentBright, 0x73);public double Width => 700;public bool FullBleed => true;@@ -89,8 +89,8 @@ internal sealed class CrushDeviceBody : IDeviceBody{var fill = new Border { Height = 3, Background = Amber, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var track2 = new Border { Height = 3, Background = Inset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center };- var center = bipolar ? new Border { Width = 1, Background = new SolidColorBrush(Color.Parse("#3A362D")), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) } : null;- var handle = new Border { Width = 8, Height = 10, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var center = bipolar ? new Border { Width = 1, Background = NotaPalette.BorderStrong, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) } : null;+ var handle = new Border { Width = 8, Height = 10, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Height = 11, MinWidth = 40 }; slot.Children.Add(track2); if (center != null) slot.Children.Add(center); slot.Children.Add(fill); slot.Children.Add(handle);var val = new TextBlock { Text = fmt(P(p)), FontSize = 9, Foreground = TxtC, VerticalAlignment = VerticalAlignment.Center }; val.BindResource(TextBlock.FontFamilyProperty, "Font.Mono"); if (vw > 0) { val.Width = vw; val.TextAlignment = TextAlignment.Right; }bool drag = false;@@ -113,7 +113,7 @@ internal sealed class CrushDeviceBody : IDeviceBodyvar c = color ?? Amber;var fill = new Border { Height = 3, Background = c, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var track2 = new Border { Height = 3, Background = Inset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Height = 10, MinWidth = 40, Children = { track2, fill, handle } };var val = new TextBlock { Text = fmt(P(p)), FontSize = 9, Foreground = TxtC, VerticalAlignment = VerticalAlignment.Center, Width = 48, TextAlignment = TextAlignment.Right };val.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");@@ -182,7 +182,7 @@ internal sealed class CrushDeviceBody : IDeviceBodynew StackPanel { [DockPanel.DockProperty] = Dock.Right, VerticalAlignment = VerticalAlignment.Center, Children = { AaToggle() } } } } };// ================= quantiser panel =================- var Dim = new SolidColorBrush(Color.Parse("#4A463D"));+ var Dim = NotaPalette.TextDisabled;static TextBlock Tiny(string t, IBrush c) => new() { Text = t, FontSize = 8, Foreground = c, VerticalAlignment = VerticalAlignment.Center };TextBlock TinyMono(string t, IBrush c) { var b = Tiny(t, c); b.BindResource(TextBlock.FontFamilyProperty, "Font.Mono"); return b; }@@ -241,7 +241,7 @@ internal sealed class CrushDeviceBody : IDeviceBodyDockPanel.SetDock(rightRail, Dock.Right);var body = new DockPanel { LastChildFill = true, Children = { rightRail, leftCol } };DockPanel.SetDock(live, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };void RefreshAll() { foreach (var a in readouts) a(); }SyncQuant(); SyncSpec();@@ -296,8 +296,8 @@ internal sealed class CrushQuantiserViz : Control// Source waveform (thin grey line) + crushed output (brass steps)var srcPen = new Pen(CrushDeviceBody.SrcLine, 1);- var crushPen = new Pen(new SolidColorBrush(Color.Parse("#D8A03D")), 1.5);- var crushFill = new SolidColorBrush(Color.FromArgb(0x4D, 0xD8, 0xA0, 0x3D));+ var crushPen = new Pen(NotaPalette.Accent, 1.5);+ var crushFill = NotaPalette.Wash(NotaPalette.Accent, 0x4D);double scale = levels - 1.0;double invScale = 1.0 / scale;int holdMax = Math.Max(1, (int)(44100.0 / (500.0 * Math.Pow(44100.0 * 0.48 / 500.0, _rate))));@@ -373,8 +373,8 @@ internal sealed class CrushSpectrumViz : Controldc.DrawLine(nyqPen, new Point(nyqX, 0), new Point(nyqX, h));// Spectrum bars: signal (brass) + aliased images (teal)- var sigBrush = new SolidColorBrush(Color.Parse("#D8A03D"));- var aliBrush = new SolidColorBrush(Color.Parse("#5B9E9C"));+ var sigBrush = NotaPalette.Accent;+ var aliBrush = NotaPalette.Teal;int bars = 26;double barW = w / bars;for (int i = 0; i < bars; i++)diff --git a/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.csindex 77ebf035..02a1515c 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs@@ -74,7 +74,7 @@ internal sealed class DelayDeviceBody : IDeviceBody{var bg = new Border { Width = w, Height = 3, Background = Sunken, CornerRadius = new CornerRadius(2) };var fill = new Border { Height = 3, Background = Brass, CornerRadius = new CornerRadius(2) };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2) };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2) };var canvas = new Canvas { Width = w, Height = 9, Background = Brushes.Transparent, VerticalAlignment = VerticalAlignment.Center };Canvas.SetTop(bg, 3); Canvas.SetTop(fill, 3); Canvas.SetTop(handle, 0);canvas.Children.Add(bg); canvas.Children.Add(fill); canvas.Children.Add(handle);@@ -146,12 +146,12 @@ internal sealed class DelayDeviceBody : IDeviceBodyvar wowBand = Band("WOW", Row(Cell("Rate", WowRate, RateF, Teal), Cell("Depth", WowDepth, Pct, Teal)));var bands = new StackPanel { Width = 288, Spacing = 6, VerticalAlignment = VerticalAlignment.Center, Children = { timePanel, wowBand } };- var rail = new Border { Width = 96, Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(6, 8),+ var rail = new Border { Width = 96, Background = NotaPalette.SurfaceInset, BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(6, 8),Child = new StackPanel { Spacing = 10, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, Children = {Cell("Dry/Wet", DryWet, Pct, Teal, 40), Cell("Out", Output, DbF, null, 38) } } };DockPanel.SetDock(rail, Dock.Right);- var live = new Border { Height = 34, Background = new SolidColorBrush(Color.Parse("#1E1C18")), BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),+ var live = new Border { Height = 34, Background = NotaPalette.SurfaceCard, BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),Child = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 12, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(9, 0), Children = {Slider(Feedback, "FEEDBACK", Pct, 64), Slider(Spread, "SPREAD", SpreadF, 52), Toggle(Freeze, "Freeze"),new TextBlock { Text = "TAPS", FontSize = 8, FontWeight = FontWeight.Bold, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center }, tapsLbl,diff --git a/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.csindex aa783e6d..b443b3e6 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs@@ -183,7 +183,7 @@ internal sealed class DynamicEqDeviceBody : IDeviceBodyvar type = new TextBlock { FontSize = 9 };var hz = new TextBlock { FontSize = 9 }; hz.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");var dyn = new TextBlock { FontSize = 9 }; dyn.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");- var grBar = new Border { Height = 6, CornerRadius = new CornerRadius(3), Background = new SolidColorBrush(Color.Parse("#2C2923")), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var grBar = new Border { Height = 6, CornerRadius = new CornerRadius(3), Background = NotaPalette.BorderDefault, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var grFill = new Border { Height = 6, CornerRadius = new CornerRadius(3), Background = Teal, HorizontalAlignment = HorizontalAlignment.Left };var grWrap = new Grid { Margin = new Thickness(0, 0, 4, 0) }; grWrap.Children.Add(grBar); grWrap.Children.Add(grFill);@@ -202,7 +202,7 @@ internal sealed class DynamicEqDeviceBody : IDeviceBodydouble gr = Math.Min(1, Math.Abs(curve.Gr(bb)) / 12);grFill.Width = Math.Max(0, gr * 60);grBar.Width = 60;- rowBorders[bb].Background = bb == Cur() ? new SolidColorBrush(Color.FromArgb(0x20, 0xD8, 0xA0, 0x3D)) : Brushes.Transparent;+ rowBorders[bb].Background = bb == Cur() ? NotaPalette.Wash(NotaPalette.Accent, 0x20) : Brushes.Transparent;}ctx.AddDeviceRefresher(SyncRow);@@ -247,7 +247,7 @@ internal sealed class GrHistoryView : Controlprivate readonly float[] _buf = new float[DynamicEqCurve.HistLen];private static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IPen Mid = new Pen(NotaPalette.BorderStrong, 1);- private static readonly IBrush DuckFill = new SolidColorBrush(Color.FromArgb(0x40, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush DuckFill = NotaPalette.Wash(NotaPalette.Teal, 0x40);private static readonly IPen DuckPen = new Pen(NotaPalette.Teal, 1.2);private static readonly IPen LiftPen = new Pen(NotaPalette.Accent, 1.2);diff --git a/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.csindex 854679db..1d4b9d4a 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs@@ -27,26 +27,26 @@ internal sealed class Eq3DeviceBody : IDeviceBodyprivate const int Low = 0, Mid = 1, High = 2, LowKill = 3, MidKill = 4, HighKill = 5,FreqLo = 6, FreqHi = 7, Slope = 8, Gain = 9;- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush FieldBorder = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush LabelC = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush KillC = new SolidColorBrush(Color.Parse("#D95F4C"));- private static readonly IBrush KillSubtle = new SolidColorBrush(Color.FromArgb(0x2E, 0xD9, 0x5F, 0x4C));- private static readonly IBrush DetentC = new SolidColorBrush(Color.Parse("#3A362D"));- private static readonly IBrush HandleC = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush FieldBorder = NotaPalette.GraphBorder;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush LabelC = NotaPalette.TextSecondary;+ private static readonly IBrush KillC = NotaPalette.Danger;+ private static readonly IBrush KillSubtle = NotaPalette.Wash(NotaPalette.Danger, 0x2E);+ private static readonly IBrush DetentC = NotaPalette.BorderStrong;+ private static readonly IBrush HandleC = NotaPalette.TextSecondary;private static readonly (string name, string span, IBrush hue)[] Bands ={- ("LOW", "20 – 250 Hz", new SolidColorBrush(Color.Parse("#C4756A"))),- ("MID", "250 Hz – 2.5 k", new SolidColorBrush(Color.Parse("#C99C55"))),- ("HIGH", "2.5 – 20 kHz", new SolidColorBrush(Color.Parse("#6D8FB5"))),+ ("LOW", "20 – 250 Hz", NotaPalette.Ink("#C4756A")),+ ("MID", "250 Hz – 2.5 k", NotaPalette.Ink("#C99C55")),+ ("HIGH", "2.5 – 20 kHz", NotaPalette.Ink("#6D8FB5")),};public double Width => 700;@@ -81,7 +81,7 @@ internal sealed class Eq3DeviceBody : IDeviceBody{var trackBar = new Border { Width = 4, Background = Inset, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch };var detent = new Border { Height = 1, Background = DetentC, HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 22, Height = 9, Background = new SolidColorBrush(Color.Parse("#2E2B24")), BorderBrush = new SolidColorBrush(Color.Parse("#4A463D")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(3), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Top,+ var handle = new Border { Width = 22, Height = 9, Background = NotaPalette.SurfaceHover, BorderBrush = NotaPalette.TextDisabled, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(3), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Top,Child = new Border { Height = 2, Background = hue, CornerRadius = new CornerRadius(1), Margin = new Thickness(3, 2.5, 3, 0), VerticalAlignment = VerticalAlignment.Top } };var slot = new Panel { Width = 26, Children = { trackBar, detent, handle } };bool drag = false;@@ -184,7 +184,7 @@ internal sealed class Eq3DeviceBody : IDeviceBodyDockPanel.SetDock(stripsPanel, Dock.Left);var body = new DockPanel { LastChildFill = true, Children = { stripsPanel, graph } };DockPanel.SetDock(strip, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { strip, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { strip, body } };void RefreshAll() { foreach (var a in readouts) a(); }SyncCurve();diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.csindex 8643eedb..e952d878 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs@@ -29,20 +29,20 @@ internal sealed class ForgeDeviceBody : IDeviceBodyprivate static readonly string[] OsNames = { "Off", "2×", "4×", "8×" };private static readonly string[] DivNames = { "2/1", "1/1", "1/2", "1/4", "1/8", "1/16", "1/32", "1/64" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush LabelC = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Dim = new SolidColorBrush(Color.Parse("#3A362D"));- private static readonly IBrush HandleC = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush LabelC = NotaPalette.TextSecondary;+ private static readonly IBrush Dim = NotaPalette.BorderStrong;+ private static readonly IBrush HandleC = NotaPalette.TextSecondary;public double Width => 700;public bool FullBleed => true;@@ -236,8 +236,8 @@ internal sealed class ForgeDeviceBody : IDeviceBodyvar quality = new StackPanel { Spacing = 4, Children = {Cap("QUALITY", MutedC),new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center, Children = { Cap("OVERSAMPLE", MutedC), OsChips() } } } };- var divider1 = new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")) };- var divider2 = new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")) };+ var divider1 = new Border { Height = 1, Background = NotaPalette.SurfaceRaised };+ var divider2 = new Border { Height = 1, Background = NotaPalette.SurfaceRaised };var rail = new Border { Width = 176, Background = RailBg, BorderBrush = Border2, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 7),Child = new StackPanel { Spacing = 5, Children = { shape, divider1, mod, divider2, quality } } };@@ -245,7 +245,7 @@ internal sealed class ForgeDeviceBody : IDeviceBodyDockPanel.SetDock(stagesPanel, Dock.Left); DockPanel.SetDock(rail, Dock.Right);var body = new DockPanel { LastChildFill = true, Children = { stagesPanel, rail, mid } };DockPanel.SetDock(live, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };void RefreshAll() { foreach (var a in readouts) a(); }SyncViz();diff --git a/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.csindex 345e0ba2..e8c45f74 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs@@ -36,7 +36,7 @@ internal sealed class PrismDeviceBody : IDeviceBodyS_ScActive = 15, S_ClipDb = 16, kScope = 20;private const int TraceLen = 256;- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;private static readonly IBrush Panel = NotaPalette.BgApp;private static readonly IBrush Border2 = NotaPalette.BorderDefault;private static readonly IBrush BorderIn = PrismInk.InnerBorder;@@ -45,7 +45,7 @@ internal sealed class PrismDeviceBody : IDeviceBodyprivate static readonly IBrush Amber = NotaPalette.Accent;private static readonly IBrush AmberLit = NotaPalette.AccentBright;private static readonly IBrush AmberSubtle = NotaPalette.AccentSubtle;- private static readonly IBrush RowSel = new SolidColorBrush(Color.FromArgb(0x10, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush RowSel = NotaPalette.Wash(NotaPalette.Accent, 0x10);private static readonly IBrush TxtC = NotaPalette.TextPrimary;private static readonly IBrush Txt2 = NotaPalette.TextSecondary;private static readonly IBrush MutedC = NotaPalette.TextTertiary;diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.csindex c774a240..f9905be9 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs@@ -43,9 +43,9 @@ internal sealed class ReverbDeviceBody : IDeviceBodyprivate const double PreDelayMaxMs = 200;// ── Device-local palette ─────────────────────────────────────────────────- private static readonly IBrush LiveStripBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush SliderHandleBg = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush LiveStripBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush SliderHandleBg = NotaPalette.TextSecondary;public double Width => 700;public bool FullBleed => true;diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.csindex 29b36c97..5dcbd112 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs@@ -26,23 +26,23 @@ internal sealed class ShutterDeviceBody : IDeviceBodyLookahead = 6, Flip = 7, DetHP = 8, DetLP = 9, Listen = 10;private const int S_InDb = 0, S_GateGain = 1, S_GrDb = 2, S_DetDb = 3, S_Open = 4, kScope = 5;- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush LabelC = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Dim = new SolidColorBrush(Color.Parse("#3A362D"));- private static readonly IBrush Green = new SolidColorBrush(Color.Parse("#58B368"));- private static readonly IBrush Red = new SolidColorBrush(Color.Parse("#C55A47"));- private static readonly IBrush ThrC = new SolidColorBrush(Color.Parse("#C9884F"));- private static readonly IBrush HandleC = new SolidColorBrush(Color.Parse("#A39D8F"));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush LabelC = NotaPalette.TextSecondary;+ private static readonly IBrush Dim = NotaPalette.BorderStrong;+ private static readonly IBrush Green = NotaPalette.Success;+ private static readonly IBrush Red = NotaPalette.DangerDeep;+ private static readonly IBrush ThrC = NotaPalette.Threshold;+ private static readonly IBrush HandleC = NotaPalette.TextSecondary;public double Width => 700;public bool FullBleed => true;@@ -136,7 +136,7 @@ internal sealed class ShutterDeviceBody : IDeviceBodyvar env = new StackPanel { Spacing = 5, Margin = new Thickness(9, 7) };env.Children.Add(new Grid { Height = 10, ColumnDefinitions = new ColumnDefinitions("Auto,*"), Children = { Cap("ENVELOPE"), WithCol(new TextBlock { Text = "attack · hold · release", FontSize = 8, Foreground = MutedC, HorizontalAlignment = HorizontalAlignment.Right }, 1) } });env.Children.Add(envTop);- env.Children.Add(new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")), Margin = new Thickness(0, 1) });+ env.Children.Add(new Border { Height = 1, Background = NotaPalette.SurfaceRaised, Margin = new Thickness(0, 1) });env.Children.Add(new Grid { Height = 12, ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 6, Children = { Cap("ATTACK", MutedC, 52), WithCol(HRow(Attack, "", AttF, 0, 0), 1), WithCol(new TextBlock { Text = AttF(P(Attack)), FontSize = 9, Foreground = TxtC, Width = 46, TextAlignment = TextAlignment.Right }.WithMono().Track(readouts, t => t.Text = AttF(P(Attack))), 2) } });env.Children.Add(new Grid { Height = 12, ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 6, Children = { Cap("HOLD", MutedC, 52), WithCol(HRow(Hold, "", HoldF, 0, 0), 1), WithCol(new TextBlock { Text = HoldF(P(Hold)), FontSize = 9, Foreground = TxtC, Width = 46, TextAlignment = TextAlignment.Right }.WithMono().Track(readouts, t => t.Text = HoldF(P(Hold))), 2) } });env.Children.Add(new Grid { Height = 12, ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 6, Children = { Cap("RELEASE", MutedC, 52), WithCol(HRow(Release, "", RelF, 0, 0), 1), WithCol(new TextBlock { Text = RelF(P(Release)), FontSize = 9, Foreground = TxtC, Width = 46, TextAlignment = TextAlignment.Right }.WithMono().Track(readouts, t => t.Text = RelF(P(Release))), 2) } });@@ -196,7 +196,7 @@ internal sealed class ShutterDeviceBody : IDeviceBodylistenChip.PointerPressed += (_, e) => { e.Handled = true; SetP(Listen, P(Listen) >= 0.5f ? 0f : 1f); ListenSync(); };readouts.Add(ListenSync);- var scEqBox = new Border { Background = Inset, BorderBrush = new SolidColorBrush(Color.Parse("#221F1A")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(5), Padding = new Thickness(4), Child =+ var scEqBox = new Border { Background = Inset, BorderBrush = NotaPalette.GraphBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(5), Padding = new Thickness(4), Child =new DockPanel { LastChildFill = true, Children = {new Grid { Height = 11, [DockPanel.DockProperty] = Dock.Top, ColumnDefinitions = new ColumnDefinitions("*,Auto"), Children = { Cap("SC EQ", MutedC), WithCol(listenChip, 1) } },detEq } } };@@ -210,14 +210,14 @@ internal sealed class ShutterDeviceBody : IDeviceBodyvar rail = new Border { Width = 176, Background = RailBg, BorderBrush = Border2, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 7), Child =new DockPanel { LastChildFill = true, Children = {new StackPanel { [DockPanel.DockProperty] = Dock.Top, Spacing = 5, Children = { Cap("METERS"), inRow, grRow, ledRow,- new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")), Margin = new Thickness(0, 2) } } },+ new Border { Height = 1, Background = NotaPalette.SurfaceRaised, Margin = new Thickness(0, 2) } } },detector } } };// ================= assemble =================DockPanel.SetDock(envPanel, Dock.Left); DockPanel.SetDock(rail, Dock.Right);var body = new DockPanel { LastChildFill = true, Children = { envPanel, rail, mid } };DockPanel.SetDock(live, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };// ---- live refresh from scope ----readouts.Add(() =>@@ -250,10 +250,10 @@ internal sealed class ShutterDeviceBody : IDeviceBody// Small teal toggle with a state getter/setter, registered to the refresher list.private static Control MakeToggle(Func<bool> get, Action<bool> set, string label, List<Action> readouts){- var knob = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = new SolidColorBrush(Color.Parse("#171613")), VerticalAlignment = VerticalAlignment.Center };+ var knob = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = NotaPalette.BgApp, VerticalAlignment = VerticalAlignment.Center };var sw = new Border { Width = 18, Height = 10, CornerRadius = new CornerRadius(5), Cursor = new Cursor(StandardCursorType.Hand), Padding = new Thickness(1.5, 0), Child = knob };- var tb = new TextBlock { Text = label, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = new SolidColorBrush(Color.Parse("#5B9E9C")), VerticalAlignment = VerticalAlignment.Center };- void Sync() { bool on = get(); sw.Background = on ? new SolidColorBrush(Color.Parse("#5B9E9C")) : new SolidColorBrush(Color.Parse("#3A362D")); knob.HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left; }+ var tb = new TextBlock { Text = label, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = NotaPalette.Teal, VerticalAlignment = VerticalAlignment.Center };+ void Sync() { bool on = get(); sw.Background = on ? NotaPalette.Teal : NotaPalette.BorderStrong; knob.HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left; }sw.PointerPressed += (_, e) => { e.Handled = true; set(!get()); Sync(); };readouts.Add(Sync);return new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, VerticalAlignment = VerticalAlignment.Center, Children = { sw, tb } };diff --git a/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.csindex 3e6c5ebd..101cee2f 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs@@ -29,10 +29,12 @@ internal sealed class StrataDeviceBody : IDeviceBodyprivate const int C_Record = 0, C_Overdub = 1, C_Play = 2, C_Stop = 3, C_Undo = 4, C_Clear = 5, A_LayerMute = 6, A_LayerGain = 7;private const int M_Empty = 0, M_Rec = 1, M_Play = 2, M_Over = 3, M_Stop = 4;private const int MaxLayers = 8;- private static readonly Color[] Palette =+ // Per-layer identity hues, resolved through NotaPalette.Ink at draw time so they+ // follow the theme (a snapshot here would freeze the loop bands in one variant).+ private static readonly string[] Palette ={- Color.Parse("#C99C55"), Color.Parse("#9BA65D"), Color.Parse("#6FA383"), Color.Parse("#C4756A"),- Color.Parse("#6E93C4"), Color.Parse("#B07FC0"), Color.Parse("#C0A24E"), Color.Parse("#7FB0A0"),+ "#C99C55", "#9BA65D", "#6FA383", "#C4756A",+ "#6E93C4", "#B07FC0", "#C0A24E", "#7FB0A0",};public double Width => 700;@@ -65,7 +67,7 @@ internal sealed class StrataDeviceBody : IDeviceBody// active mode's button lights in its colour.var actNames = new[] { "Record", "Overdub", "Play", "Stop" };var actCmds = new[] { C_Record, C_Overdub, C_Play, C_Stop };- var actColors = new[] { Color.Parse("#D95F4C"), Color.Parse("#D8A03D"), Color.Parse("#58B368"), Color.Parse("#A39D8F") };+ var actColors = new[] { NotaPalette.Danger.Color, NotaPalette.Accent.Color, NotaPalette.Success.Color, NotaPalette.TextSecondary.Color };var actBtn = new Border[4]; var actSub = new TextBlock[4]; var actName = new TextBlock[4];var actRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 3, VerticalAlignment = VerticalAlignment.Center };for (int i = 0; i < 4; i++)@@ -79,7 +81,7 @@ internal sealed class StrataDeviceBody : IDeviceBodyactRow.Children.Add(actBtn[i]);}DockPanel.SetDock(actRow, Dock.Right);- var live = new Border { Height = 34, Background = new SolidColorBrush(Color.Parse("#1E1C18")), BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),+ var live = new Border { Height = 34, Background = NotaPalette.SurfaceCard, BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1),Child = new DockPanel { LastChildFill = false, Margin = new Thickness(9, 0), VerticalAlignment = VerticalAlignment.Center, Children = {actRow,new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, VerticalAlignment = VerticalAlignment.Center, Children = { barNum, tickRow, ofBars } } } } };@@ -133,7 +135,7 @@ internal sealed class StrataDeviceBody : IDeviceBodydouble tw = 84;var trk = new Border { Width = tw, Height = 3, Background = Sunken, CornerRadius = new CornerRadius(2) };var fill = new Border { Height = 3, Background = accent, CornerRadius = new CornerRadius(2) };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2) };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2) };var canvas = new Canvas { Width = tw, Height = 9, Background = Brushes.Transparent, VerticalAlignment = VerticalAlignment.Center };Canvas.SetTop(trk, 3); Canvas.SetTop(fill, 3); Canvas.SetTop(handle, 0);canvas.Children.Add(trk); canvas.Children.Add(fill); canvas.Children.Add(handle);@@ -168,7 +170,7 @@ internal sealed class StrataDeviceBody : IDeviceBody{var dot = new Border { Width = 18, Height = 10, CornerRadius = new CornerRadius(5), Background = Sunken, Child = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = TextTertiary, HorizontalAlignment = HorizontalAlignment.Left, Margin = new Thickness(2, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center } };var txt = new TextBlock { Text = label, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };- void Hi() { bool on = P(p) > 0.5f; var inner = (Border)dot.Child!; dot.Background = on ? tint : Sunken; inner.Background = on ? (IBrush)new SolidColorBrush(Color.Parse("#171613")) : TextTertiary; inner.HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left; inner.Margin = on ? new Thickness(0, 0, 2, 0) : new Thickness(2, 0, 0, 0); txt.Foreground = on ? tint : TextTertiary; }+ void Hi() { bool on = P(p) > 0.5f; var inner = (Border)dot.Child!; dot.Background = on ? tint : Sunken; inner.Background = on ? (IBrush)NotaPalette.BgApp : TextTertiary; inner.HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left; inner.Margin = on ? new Thickness(0, 0, 2, 0) : new Thickness(2, 0, 0, 0); txt.Foreground = on ? tint : TextTertiary; }var b = new Border { Cursor = new Cursor(StandardCursorType.Hand), Child = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, Children = { dot, txt } } };b.PointerPressed += (_, _) => { SetR(p, P(p) > 0.5f ? 0f : 1f); Hi(); };MidiLearn.Bind(b, MidiTarget.DeviceParam(track, di, p), label);@@ -185,20 +187,20 @@ internal sealed class StrataDeviceBody : IDeviceBodyvar undo = ActionBtn("Undo", TextSecondary, () => Act(C_Undo));var export = ActionBtn("Export", TextSecondary, () => ctx.NotifyChanged());- var clear = ActionBtn("Clear", new SolidColorBrush(Color.Parse("#D95F4C")), () => Act(C_Clear));+ var clear = ActionBtn("Clear", NotaPalette.Danger, () => Act(C_Clear));var bottomActions = new Grid { ColumnDefinitions = new ColumnDefinitions("*,*,*"), ColumnSpacing = 4, Margin = new Thickness(0, 4, 0, 0) };Grid.SetColumn(undo, 0); Grid.SetColumn(export, 1); Grid.SetColumn(clear, 2);bottomActions.Children.Add(undo); bottomActions.Children.Add(export); bottomActions.Children.Add(clear);var qRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, Children = { new TextBlock { Text = "QUANTIZE", FontSize = 8, FontWeight = FontWeight.Bold, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center }, Seg(Quantize, new[] { "Off", "Bar", "1/4" }) } };- var rail = new Border { Width = 174, Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 6),+ var rail = new Border { Width = 174, Background = NotaPalette.SurfaceInset, BorderBrush = BorderDef, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(8, 6),Child = new StackPanel { Spacing = 5, Children = {Lbl("LOOP", 8, TextTertiary),HSlider(Feedback, "FEEDBACK", PctF, false, Teal),HSlider(InputGain, "INPUT GAIN", DbF, false, Brass),HSlider(Speed, "SPEED", SpeedF, true, Brass),qRow,- new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")) },+ new Border { Height = 1, Background = NotaPalette.SurfaceRaised },Toggle(CountIn, "COUNT-IN 1 BAR", Teal),Toggle(SetTempo, "SET TEMPO FROM LOOP", Teal),Toggle(Reverse, "REVERSE", Brass),@@ -249,15 +251,15 @@ internal sealed class StrataDeviceBody : IDeviceBodyint st = (int)scope[6 + k * 3]; float gainDb = scope[7 + k * 3]; bool muted = scope[8 + k * 3] > 0.5f;bool rec = recL == k;stateTxts[k].Text = rec ? "REC" : muted ? "MUTED" : "PLAY";- stateTxts[k].Foreground = rec ? new SolidColorBrush(Color.Parse("#D95F4C")) : muted ? TextTertiary : Success;+ stateTxts[k].Foreground = rec ? NotaPalette.Danger : muted ? TextTertiary : Success;dbTxts[k].Text = $"{gainDb:+0.0;-0.0;0.0}";var mtxt = (TextBlock)muteBtns[k].Child!;- muteBtns[k].Background = muted ? new SolidColorBrush(Color.Parse("#3A2320")) : Sunken;- muteBtns[k].BorderBrush = muted ? new SolidColorBrush(Color.Parse("#D95F4C")) : BorderDef;- mtxt.Foreground = muted ? new SolidColorBrush(Color.Parse("#D95F4C")) : TextTertiary;- var col = Palette[k % Palette.Length];- layerRows[k].Background = rec ? new SolidColorBrush(Color.FromArgb(0x1A, 0xD9, 0x5F, 0x4C)) : muted ? new SolidColorBrush(Color.Parse("#1B1916")) : new SolidColorBrush(Color.FromArgb(0x0D, 0xD8, 0xA0, 0x3D));- layerRows[k].BorderBrush = rec ? new SolidColorBrush(Color.Parse("#D95F4C")) : muted ? BorderDef : new SolidColorBrush(Color.FromArgb(0x73, col.R, col.G, col.B));+ muteBtns[k].Background = muted ? NotaPalette.MuteTint : Sunken;+ muteBtns[k].BorderBrush = muted ? NotaPalette.Danger : BorderDef;+ mtxt.Foreground = muted ? NotaPalette.Danger : TextTertiary;+ var col = NotaPalette.InkColor(Palette[k % Palette.Length]);+ layerRows[k].Background = rec ? NotaPalette.Wash(NotaPalette.Danger, 0x1A) : muted ? NotaPalette.SurfaceInset : NotaPalette.Wash(NotaPalette.Accent, 0x0D);+ layerRows[k].BorderBrush = rec ? NotaPalette.Danger : muted ? BorderDef : new SolidColorBrush(Color.FromArgb(0x73, col.R, col.G, col.B));int wn = engine.DeviceLayerWave(track, di, k, waveBuf, waveBuf.Length);var env = new float[Math.Max(1, wn)];for (int i = 0; i < wn; i++) env[i] = Math.Clamp(waveBuf[i], 0f, 1f);@@ -269,6 +271,6 @@ internal sealed class StrataDeviceBody : IDeviceBodyRefresh();DockPanel.SetDock(live, Dock.Top);- return new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ return new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };}}diff --git a/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.csindex 96befa84..44cd3587 100644--- a/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs+++ b/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs@@ -57,7 +57,7 @@ internal sealed class UtilityDeviceBody : IDeviceBodydouble Val(double n) => Math.Exp(lmn + Math.Clamp(n, 0, 1) * lspan);var trk = new Border { Width = tw, Height = 3, Background = Sunken, CornerRadius = new CornerRadius(2) };var fill = new Border { Height = 3, Background = Brass, CornerRadius = new CornerRadius(2) };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2) };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2) };var canvas = new Canvas { Width = tw, Height = 9, Background = Brushes.Transparent, VerticalAlignment = VerticalAlignment.Center };Canvas.SetTop(trk, 3); Canvas.SetTop(fill, 3); Canvas.SetTop(handle, 0);canvas.Children.Add(trk); canvas.Children.Add(fill); canvas.Children.Add(handle);@@ -172,7 +172,7 @@ internal sealed class UtilityDeviceBody : IDeviceBodyreturn rootBody;}- private static IBrush Div() => new SolidColorBrush(Color.Parse("#26231E"));+ private static IBrush Div() => NotaPalette.SurfaceRaised;// A titled bordered island panel (fixed width). headerless/custom lets the// stereo-field island supply its own dock layout that fills the height.@@ -215,9 +215,9 @@ internal sealed class UtilityDeviceBody : IDeviceBodyprivate sealed class Goniometer : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IBrush Grid = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Diag = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Dot = new SolidColorBrush(Color.FromArgb(0xCC, 0x7F, 0xCC, 0xE1));+ private static readonly IBrush Grid = NotaPalette.SurfaceCard;+ private static readonly IBrush Diag = NotaPalette.SurfaceRaised;+ private static readonly IBrush Dot = NotaPalette.Wash(NotaPalette.Marker, 0xCC);private float[]? _p; private int _n;public void Set(float[] p, int n) { _p = p; _n = n; InvalidateVisual(); }@@ -255,8 +255,8 @@ internal sealed class UtilityDeviceBody : IDeviceBodyprivate sealed class CorrMeter : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IBrush Risk = new SolidColorBrush(Color.FromArgb(0x33, 0xD9, 0x5F, 0x4C));- private static readonly IBrush Tick = new SolidColorBrush(Color.Parse("#3A362D"));+ private static readonly IBrush Risk = NotaPalette.Wash(NotaPalette.Danger, 0x33);+ private static readonly IBrush Tick = NotaPalette.BorderStrong;private float _c = 1;public void Set(float c) { _c = Math.Clamp(c, -1, 1); InvalidateVisual(); }public override void Render(DrawingContext ctx)diff --git a/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.csindex fd447a16..4c5636c1 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs@@ -22,17 +22,17 @@ namespace Nota.App;internal sealed class AuroraInstrumentCard : IInstrumentCard{- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush CardBg = NotaPalette.BgApp;+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);private static readonly string[] Banks = { "Analog", "Pulse", "Formant", "Chroma" };private static readonly string[] WarpModes = { "Off", "Sync", "Bend", "PWM", "Fold" };@@ -114,7 +114,7 @@ internal sealed class AuroraInstrumentCard : IInstrumentCardint pi = I(id);var bg = new Border { Width = w, Height = 3, Background = Inset, CornerRadius = new CornerRadius(2) };var fill = new Border { Height = 3, Background = Amber, CornerRadius = new CornerRadius(2) };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2) };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2) };var canvas = new Canvas { Width = w, Height = 9, Background = Brushes.Transparent, VerticalAlignment = VerticalAlignment.Center };Canvas.SetTop(bg, 3); Canvas.SetTop(fill, 3); Canvas.SetTop(handle, 0);canvas.Children.Add(bg); canvas.Children.Add(fill); canvas.Children.Add(handle);@@ -321,7 +321,7 @@ internal sealed class AuroraInstrumentCard : IInstrumentCardstring[] tabs = { "Osc", "Filter", "Env", "LFO", "Mod", "FX" };bool[] tealTab = { false, false, false, true, true, false };int tabSel = 0; var tabBtns = new Border[tabs.Length];- void HiTabs() { for (int i = 0; i < tabs.Length; i++) { bool on = i == tabSel; tabBtns[i].Background = on ? new SolidColorBrush(Color.Parse("#26231E")) : Brushes.Transparent; tabBtns[i].BorderBrush = on ? (tealTab[i] ? TealC : Amber) : Brushes.Transparent; ((TextBlock)tabBtns[i].Child!).Foreground = on ? TxtC : MutedC; } }+ void HiTabs() { for (int i = 0; i < tabs.Length; i++) { bool on = i == tabSel; tabBtns[i].Background = on ? NotaPalette.SurfaceRaised : Brushes.Transparent; tabBtns[i].BorderBrush = on ? (tealTab[i] ? TealC : Amber) : Brushes.Transparent; ((TextBlock)tabBtns[i].Child!).Foreground = on ? TxtC : MutedC; } }var railCol = new StackPanel { Spacing = 2 };for (int i = 0; i < tabs.Length; i++){diff --git a/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.csindex d211e780..b3b40665 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs@@ -24,20 +24,20 @@ namespace Nota.App;internal sealed class BassInstrumentCard : IInstrumentCard{// Mockup palette (matches the Nota Bass Mockup.html and VoltInstrumentCard).- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealLit = new SolidColorBrush(Color.Parse("#7FC9C6"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Handle = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush ArrowC = new SolidColorBrush(Color.Parse("#3E3A31"));+ private static readonly IBrush CardBg = NotaPalette.BgApp;+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TealLit = NotaPalette.TealBright;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush Handle = NotaPalette.TextSecondary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush ArrowC = NotaPalette.BorderStrong;public bool BodyOnly => true;public string Subtitle => "BASS SYNTH";diff --git a/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.csindex 4dda7dd1..47228095 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs@@ -28,10 +28,10 @@ namespace Nota.App;internal sealed class ConsortInstrumentCard : IInstrumentCard{- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;private static readonly IBrush Panel = NotaPalette.BgApp;private static readonly IBrush Border2 = NotaPalette.BorderDefault;- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;private static readonly IBrush Inset = NotaPalette.BgSunken;private static readonly IBrush TabBg = NotaPalette.SurfaceCard;private static readonly IBrush Amber = NotaPalette.Accent;@@ -264,7 +264,7 @@ internal sealed class ConsortInstrumentCard : IInstrumentCard{int pi = I(id);var grad = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),- GradientStops = { new GradientStop(Color.Parse("#26231E"), 0), new GradientStop(Color.Parse("#100F0D"), 0.5), new GradientStop(Color.Parse("#26231E"), 1) } };+ GradientStops = { new GradientStop(NotaPalette.SurfaceRaised.Color, 0), new GradientStop(NotaPalette.BgSunken.Color, 0.5), new GradientStop(NotaPalette.SurfaceRaised.Color, 1) } };var bar = new Border { Width = 16, Background = grad, BorderBrush = Border2, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), VerticalAlignment = VerticalAlignment.Stretch };var mark = new Border { Height = 2, Width = 12, Background = lit, CornerRadius = new CornerRadius(1) };var lay = new Canvas { Width = 16 };diff --git a/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.csindex 1db0568f..5b116935 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs@@ -30,13 +30,13 @@ internal sealed class FluxInstrumentCard : IInstrumentCardpublic string Subtitle => "VECTOR";public double CardWidth => 900;- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush ReactBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush TealB = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealBright = new SolidColorBrush(Color.Parse("#7FC9C6"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush ReactBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush TealB = NotaPalette.Teal;+ private static readonly IBrush TealBright = NotaPalette.TealBright;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;private static readonly string[] Targets = { "Filter", "Pitch", "Space", "Vector" };private static readonly string[] RateNames = { "1/1", "1/2", "1/4", "1/8", "1/8T", "1/16" };@@ -114,13 +114,13 @@ internal sealed class FluxInstrumentCard : IInstrumentCardvar scopeDock = new DockPanel { LastChildFill = true };DockPanel.SetDock(scopeHead, Dock.Top); scopeDock.Children.Add(scopeHead);scopeDock.Children.Add(new Border { Margin = new Thickness(0, 3, 0, 0), Child = scope });- var scopeBox = new Border { Background = Inset, BorderBrush = new SolidColorBrush(Color.Parse("#221F1A")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Padding = new Thickness(6, 4), Child = scopeDock };+ var scopeBox = new Border { Background = Inset, BorderBrush = NotaPalette.GraphBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Padding = new Thickness(6, 4), Child = scopeDock };// LISTEN knob + TARGET segmented.var listen = InstrumentControls.InstKnob(ctx, idx, "listen", "LISTEN", DoRefresh, v => $"{v * 100:0} %", 40, 56, TealB);var targetChips = new Border[4];var targetRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };- void SyncTarget() { int cur = TargetIdx(); for (int i = 0; i < 4; i++) { bool on = i == cur; targetChips[i].Background = on ? new SolidColorBrush(Color.FromArgb(0x28, 0x5B, 0x9E, 0x9C)) : Brushes.Transparent; targetChips[i].BorderBrush = on ? TealB : Brushes.Transparent; ((TextBlock)targetChips[i].Child!).Foreground = on ? TealBright : Muted; } }+ void SyncTarget() { int cur = TargetIdx(); for (int i = 0; i < 4; i++) { bool on = i == cur; targetChips[i].Background = on ? NotaPalette.Wash(NotaPalette.Teal, 0x28) : Brushes.Transparent; targetChips[i].BorderBrush = on ? TealB : Brushes.Transparent; ((TextBlock)targetChips[i].Child!).Foreground = on ? TealBright : Muted; } }for (int i = 0; i < 4; i++){int iv = i;@@ -176,7 +176,7 @@ internal sealed class FluxInstrumentCard : IInstrumentCardmacroHead.Children.Add(mh);var macroDock = new DockPanel { LastChildFill = true };DockPanel.SetDock(macroHead, Dock.Top); macroDock.Children.Add(macroHead);- var macroFoot = Mono("resonance · attack/release · unison — adaptive", new SolidColorBrush(Color.Parse("#4A463D")), 8);+ var macroFoot = Mono("resonance · attack/release · unison — adaptive", NotaPalette.TextDisabled, 8);macroFoot.HorizontalAlignment = HorizontalAlignment.Center;DockPanel.SetDock(macroFoot, Dock.Bottom); macroDock.Children.Add(macroFoot);macroDock.Children.Add(macroRow);@@ -196,7 +196,7 @@ internal sealed class FluxInstrumentCard : IInstrumentCard}// ---- assemble body --------------------------------------------------- var body = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,Auto,*"), Background = Ink };+ var body = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,Auto,*"), Background = NotaPalette.BgApp };Grid.SetColumn(vecCol, 0); Grid.SetColumn(reactCol, 1); Grid.SetColumn(macroCol, 2);body.Children.Add(vecCol); body.Children.Add(reactCol); body.Children.Add(macroCol);diff --git a/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.csindex 92979637..8812534b 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs@@ -22,18 +22,18 @@ namespace Nota.App;internal sealed class GrainInstrumentCard : IInstrumentCard{// Exact mockup palette.- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Handle = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush CardBg = NotaPalette.BgApp;+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush Handle = NotaPalette.TextSecondary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);private static readonly Typeface Mono = new("Geist Mono");public bool BodyOnly => true;@@ -172,7 +172,7 @@ internal sealed class GrainInstrumentCard : IInstrumentCard}int tabSel = 0; var tabBtns = new Border[tabs.Length];- void HiTabs() { for (int i = 0; i < tabs.Length; i++) { bool on = i == tabSel; tabBtns[i].Background = on ? new SolidColorBrush(Color.Parse("#26231E")) : Brushes.Transparent; tabBtns[i].BorderBrush = on ? (tealTab[i] ? TealC : Amber) : Brushes.Transparent; ((TextBlock)tabBtns[i].Child!).Foreground = on ? TxtC : MutedC; } }+ void HiTabs() { for (int i = 0; i < tabs.Length; i++) { bool on = i == tabSel; tabBtns[i].Background = on ? NotaPalette.SurfaceRaised : Brushes.Transparent; tabBtns[i].BorderBrush = on ? (tealTab[i] ? TealC : Amber) : Brushes.Transparent; ((TextBlock)tabBtns[i].Child!).Foreground = on ? TxtC : MutedC; } }var railCol = new StackPanel { Spacing = 2 };for (int i = 0; i < tabs.Length; i++){diff --git a/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.csindex 9c477ac8..a5abbad5 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs@@ -24,21 +24,21 @@ namespace Nota.App;internal sealed class MonolithInstrumentCard : IInstrumentCard{- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Panel = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush TabBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush RedC = new SolidColorBrush(Color.Parse("#D95F4C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Handle = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush CardBg = NotaPalette.BgApp;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Panel = NotaPalette.BgApp;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush TabBg = NotaPalette.SurfaceCard;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush RedC = NotaPalette.Danger;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush Handle = NotaPalette.TextSecondary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);private static readonly string[] Feet = { "LO", "32′", "16′", "8′", "4′", "2′" };@@ -86,7 +86,7 @@ internal sealed class MonolithInstrumentCard : IInstrumentCardvar dot = new Border { Width = 7, Height = 7, CornerRadius = new CornerRadius(4) };var host = new Canvas { Width = 18, Height = 10 }; Canvas.SetTop(dot, 1.5); host.Children.Add(dot); knob.Child = host;var txt = new TextBlock { Text = label, FontSize = 8, Foreground = MutedC, VerticalAlignment = VerticalAlignment.Center };- void Hi() { bool on = G(id) > 0.5f; knob.Background = on ? Amber : new SolidColorBrush(Color.Parse("#26231E")); dot.Background = on ? CardBg : MutedC; Canvas.SetLeft(dot, on ? 9 : 1.5); txt.Foreground = on ? TxtC : MutedC; }+ void Hi() { bool on = G(id) > 0.5f; knob.Background = on ? Amber : NotaPalette.SurfaceRaised; dot.Background = on ? CardBg : MutedC; Canvas.SetLeft(dot, on ? 9 : 1.5); txt.Foreground = on ? TxtC : MutedC; }var wrap = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, VerticalAlignment = VerticalAlignment.Center, Cursor = new Cursor(StandardCursorType.Hand), Children = { knob, txt } };wrap.PointerPressed += (_, _) => { SetP(id, G(id) > 0.5f ? 0f : 1f); Hi(); Refresh(); };readouts.Add(Hi); Hi();@@ -156,7 +156,7 @@ internal sealed class MonolithInstrumentCard : IInstrumentCard{int pi = I(id); var lit = col ?? Amber;var grad = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),- GradientStops = { new GradientStop(Color.Parse("#26231E"), 0), new GradientStop(Color.Parse("#100F0D"), 0.5), new GradientStop(Color.Parse("#26231E"), 1) } };+ GradientStops = { new GradientStop(NotaPalette.SurfaceRaised.Color, 0), new GradientStop(NotaPalette.BgSunken.Color, 0.5), new GradientStop(NotaPalette.SurfaceRaised.Color, 1) } };var trackBar = new Border { Width = 16, Background = grad, BorderBrush = Border2, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), VerticalAlignment = VerticalAlignment.Stretch };var mark = new Border { Height = 2, Background = lit, CornerRadius = new CornerRadius(1), Margin = new Thickness(2, 0) };var lay = new Canvas { Width = 16, VerticalAlignment = VerticalAlignment.Stretch };@@ -254,7 +254,7 @@ internal sealed class MonolithInstrumentCard : IInstrumentCard{var hdr = new Grid { ColumnDefinitions = new ColumnDefinitions("14,50,54,*,40"), Height = 12, Margin = new Thickness(4, 0) };string[] h = { "#", "RANGE", "FREQ", "WAVEFORM", "MOD" };- for (int i = 0; i < 5; i++) { var t = new TextBlock { Text = h[i], FontSize = 7, FontWeight = FontWeight.Bold, Foreground = new SolidColorBrush(Color.Parse("#4A463D")), HorizontalAlignment = i == 0 ? HorizontalAlignment.Left : (i == 4 ? HorizontalAlignment.Right : HorizontalAlignment.Center) }; Grid.SetColumn(t, i); hdr.Children.Add(t); }+ for (int i = 0; i < 5; i++) { var t = new TextBlock { Text = h[i], FontSize = 7, FontWeight = FontWeight.Bold, Foreground = NotaPalette.TextDisabled, HorizontalAlignment = i == 0 ? HorizontalAlignment.Left : (i == 4 ? HorizontalAlignment.Right : HorizontalAlignment.Center) }; Grid.SetColumn(t, i); hdr.Children.Add(t); }var table = new DockPanel { LastChildFill = true };DockPanel.SetDock(hdr, Dock.Top);table.Children.Add(hdr);diff --git a/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.csindex 2318a813..e20b271f 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs@@ -37,10 +37,10 @@ internal sealed class OperatorInstrumentCard : IInstrumentCardprivate static readonly string[] OpId = { "a", "b", "c", "d" };private static readonly IBrush[] OpColor = { NotaPalette.Accent, NotaPalette.Accent, NotaPalette.Teal, NotaPalette.Teal };- private static readonly IBrush Strip = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Rail = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));+ private static readonly IBrush Strip = NotaPalette.SurfaceCard;+ private static readonly IBrush Rail = NotaPalette.SurfaceInset;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;public Control Build(DeviceCardContext ctx){@@ -210,7 +210,7 @@ internal sealed class OperatorInstrumentCard : IInstrumentCardvar inner = new DockPanel { LastChildFill = true };DockPanel.SetDock(accentBar, Dock.Left); inner.Children.Add(accentBar);inner.Children.Add(new Border { Padding = new Thickness(6, 0), Child = g });- return new Border { Background = Ink, BorderBrush = BorderDef, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), ClipToBounds = true, Height = 34, Child = inner };+ return new Border { Background = NotaPalette.BgApp, BorderBrush = BorderDef, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), ClipToBounds = true, Height = 34, Child = inner };}var opsHeader = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), Height = 11 };@@ -360,7 +360,7 @@ internal sealed class OperatorInstrumentCard : IInstrumentCardvar bodyRow = new DockPanel { LastChildFill = true };DockPanel.SetDock(rail, Dock.Left); bodyRow.Children.Add(rail); bodyRow.Children.Add(mainHost);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(stripHost, Dock.Top); root.Children.Add(stripHost); root.Children.Add(bodyRow);ctx.SetInstLiveViz(Refresh);diff --git a/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.csindex ead601f5..05db4b01 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs@@ -37,17 +37,17 @@ internal sealed class PendulumInstrumentCard : IInstrumentCardprivate static readonly string[] ModeNames = { "Off", "Major", "Minor", "Dorian", "Mixo", "Penta" };private static readonly string[] RootNames = { "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush RowLit = new SolidColorBrush(Color.Parse("#26231E"));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush RowLit = NotaPalette.SurfaceRaised;private static double Exp(double v, double lo, double hi) => lo * Math.Pow(hi / lo, Math.Clamp(v, 0, 1));@@ -114,7 +114,7 @@ internal sealed class PendulumInstrumentCard : IInstrumentCard{var accent = teal ? TealC : Amber;var accentLit = teal ? TealC : AmberLit;- var fillOn = teal ? new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C)) : AmberSubtle;+ var fillOn = teal ? NotaPalette.Wash(NotaPalette.Teal, 0x24) : AmberSubtle;var b = new Border { CornerRadius = new CornerRadius(4), BorderThickness = new Thickness(1), Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = label, FontSize = 9, FontWeight = FontWeight.SemiBold } };void Hi() { bool on = G(id) > 0.5f; b.Background = on ? fillOn : Brushes.Transparent; b.BorderBrush = on ? accent : Border2; ((TextBlock)b.Child!).Foreground = on ? accentLit : MutedC; }b.PointerPressed += (_, _) => { SetId(id, G(id) > 0.5f ? 0 : 1); Refresh(); };@@ -175,9 +175,9 @@ internal sealed class PendulumInstrumentCard : IInstrumentCard{const double TW = 84;var basec = new Border { Height = 5, Background = Inset, CornerRadius = new CornerRadius(3), VerticalAlignment = VerticalAlignment.Center };- var center = new Border { Width = 1, Background = new SolidColorBrush(Color.Parse("#3A362D")), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(4, 1) };+ var center = new Border { Width = 1, Background = NotaPalette.BorderStrong, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(4, 1) };var fill = new Border { Height = 5, Background = Amber, CornerRadius = new CornerRadius(3), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 8, Height = 11, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var handle = new Border { Width = 8, Height = 11, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Width = TW, Height = 11, Children = { basec, center, fill, handle } };var val = new TextBlock { Text = "", FontSize = 9, Foreground = TxtC, VerticalAlignment = VerticalAlignment.Center };val.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");@@ -230,7 +230,7 @@ internal sealed class PendulumInstrumentCard : IInstrumentCardvar ballsNum = new TextBlock { Text = "3", FontSize = 9, Foreground = TxtC, [DockPanel.DockProperty] = Dock.Right };ballsNum.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");void StepBalls(int d) { int c = Math.Clamp(2 + (int)Math.Round(G("balls") * 4) + d, 2, MaxBalls); SetId("balls", (c - 2) / 4.0); Refresh(); }- Border StepBtn(string t, int d) { var b = new Border { CornerRadius = new CornerRadius(3), BorderThickness = new Thickness(1), BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), Background = RowLit, Cursor = new Cursor(StandardCursorType.Hand), Child = new TextBlock { Text = t, FontSize = 9, Foreground = TextSecondary, HorizontalAlignment = HorizontalAlignment.Center } }; b.PointerPressed += (_, _) => StepBalls(d); return b; }+ Border StepBtn(string t, int d) { var b = new Border { CornerRadius = new CornerRadius(3), BorderThickness = new Thickness(1), BorderBrush = NotaPalette.BorderStrong, Background = RowLit, Cursor = new Cursor(StandardCursorType.Hand), Child = new TextBlock { Text = t, FontSize = 9, Foreground = TextSecondary, HorizontalAlignment = HorizontalAlignment.Center } }; b.PointerPressed += (_, _) => StepBalls(d); return b; }var stepGrid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,*"), ColumnSpacing = 3 };var sm = StepBtn("−", -1); var sp = StepBtn("+", +1); Grid.SetColumn(sp, 1); stepGrid.Children.Add(sm); stepGrid.Children.Add(sp);var ballsBox = new StackPanel { Spacing = 3, Children = {@@ -249,7 +249,7 @@ internal sealed class PendulumInstrumentCard : IInstrumentCard{TextBlock Mn(double w, IBrush c) { var t = new TextBlock { FontSize = 9, Foreground = c, Width = w, VerticalAlignment = VerticalAlignment.Center }; t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono"); return t; }rDot(i, out var dot); rowDot[i] = dot;- rDiv[i] = Mn(30, TxtC); rRate[i] = Mn(30, new SolidColorBrush(Color.Parse("#A39D8F"))); rPhase[i] = Mn(30, MutedC);+ rDiv[i] = Mn(30, TxtC); rRate[i] = Mn(30, NotaPalette.TextSecondary); rPhase[i] = Mn(30, MutedC);rDir[i] = new TextBlock { FontSize = 9, Foreground = MutedC, VerticalAlignment = VerticalAlignment.Center };rNote[i] = new TextBlock { FontSize = 9, Foreground = TxtC, HorizontalAlignment = HorizontalAlignment.Right, VerticalAlignment = VerticalAlignment.Center, [DockPanel.DockProperty] = Dock.Right };rNote[i].BindResource(TextBlock.FontFamilyProperty, "Font.Mono");@@ -349,7 +349,7 @@ internal sealed class PendulumInstrumentCard : IInstrumentCardDockPanel.SetDock(tabRail, Dock.Left);var body = new DockPanel { LastChildFill = true, Children = { tabRail, bodyContent } };DockPanel.SetDock(live, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };SelectTab(0);ctx.SetInstLiveViz(Refresh);diff --git a/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.csindex 287b8698..16508020 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs@@ -27,10 +27,10 @@ namespace Nota.App;internal sealed class PentadInstrumentCard : IInstrumentCard{- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;private static readonly IBrush Panel = NotaPalette.BgApp;private static readonly IBrush Border2 = NotaPalette.BorderDefault;- private static readonly IBrush BorderIn = new SolidColorBrush(Color.Parse("#221F1A"));+ private static readonly IBrush BorderIn = NotaPalette.GraphBorder;private static readonly IBrush Inset = NotaPalette.BgSunken;private static readonly IBrush TabBg = NotaPalette.SurfaceCard;private static readonly IBrush Amber = NotaPalette.Accent;@@ -236,7 +236,7 @@ internal sealed class PentadInstrumentCard : IInstrumentCard{int pi = I(id);var grad = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),- GradientStops = { new GradientStop(Color.Parse("#26231E"), 0), new GradientStop(Color.Parse("#100F0D"), 0.5), new GradientStop(Color.Parse("#26231E"), 1) } };+ GradientStops = { new GradientStop(NotaPalette.SurfaceRaised.Color, 0), new GradientStop(NotaPalette.BgSunken.Color, 0.5), new GradientStop(NotaPalette.SurfaceRaised.Color, 1) } };var bar = new Border { Width = 16, Background = grad, BorderBrush = Border2, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), VerticalAlignment = VerticalAlignment.Stretch };var mark = new Border { Height = 2, Width = 12, Background = lit, CornerRadius = new CornerRadius(1) };var lay = new Canvas { Width = 16 };diff --git a/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.csindex 49ae561d..79b7d079 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs@@ -64,7 +64,7 @@ internal sealed class PhysicalInstrumentCard : IInstrumentCard}return col;}- Control Arrow() => new TextBlock { Text = "▸", FontSize = 12, Foreground = new SolidColorBrush(Color.Parse("#3E3A31")), VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1, 0) };+ Control Arrow() => new TextBlock { Text = "▸", FontSize = 12, Foreground = NotaPalette.BorderStrong, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1, 0) };Control Cap(string t, IBrush? c = null) => new TextBlock { Text = t, FontSize = 9, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };Control Head(string title, params Control[] extras){diff --git a/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.csindex 3863a596..c29440c9 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs@@ -40,20 +40,21 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardprivate static readonly string[] Names = { "Kick", "Snare", "Clap", "Rim", "Closed Hat", "Open Hat", "Tom", "Perc" };private static readonly string[] Engines = { "Analog", "Noise", "Clap", "Rim", "Metal", "Metal", "Analog", "Ring" };+ // Kit-voice identity hues — one dot per voice, themed through NotaPalette.Ink.private static readonly string[] Dots = { "#C4756A", "#D8A03D", "#7FC9C6", "#B58AC4", "#7E8A6A", "#8FB56A", "#6D8FB5", "#5B9E9C" };- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush Panel = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush SeqBg = new SolidColorBrush(Color.Parse("#131210"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush StepOff = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush StepOn = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), GradientStops = { new GradientStop(Color.Parse("#D8A03D"), 0), new GradientStop(Color.Parse("#B8842E"), 1) } };- private static readonly IBrush StepAcc = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), GradientStops = { new GradientStop(Color.Parse("#F4CE7A"), 0), new GradientStop(Color.Parse("#E0A840"), 1) } };- private static readonly IBrush TealB = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealBright = new SolidColorBrush(Color.Parse("#7FC9C6"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush VelFill = new LinearGradientBrush { StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), GradientStops = { new GradientStop(Color.Parse("#A7B58A"), 0), new GradientStop(Color.Parse("#7E8A6A"), 1) } };+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush Panel = NotaPalette.SurfaceInset;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush SeqBg = NotaPalette.SurfaceDeep;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush StepOff = NotaPalette.BgSunken;+ private static readonly IBrush StepOn = NotaPalette.VGradient((NotaPalette.Accent, 0), (NotaPalette.AccentDeep, 1));+ private static readonly IBrush StepAcc = NotaPalette.VGradient((NotaPalette.AccentGlow, 0), (NotaPalette.Accent, 1));+ private static readonly IBrush TealB = NotaPalette.Teal;+ private static readonly IBrush TealBright = NotaPalette.TealBright;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush VelFill = NotaPalette.VGradient((NotaPalette.Ink("#A7B58A"), 0), (NotaPalette.Ink("#7E8A6A"), 1));public Control Build(DeviceCardContext ctx){@@ -86,21 +87,21 @@ internal sealed class RhythmInstrumentCard : IInstrumentCard{int vv = v; bool selRow = v == sel;bool isSmp = engine.RhythmVoiceSource(track, v) == 1;- var dot = new Ellipse { Width = 7, Height = 7, Fill = new SolidColorBrush(Color.Parse(Dots[v])), VerticalAlignment = VerticalAlignment.Center };+ var dot = new Ellipse { Width = 7, Height = 7, Fill = NotaPalette.Ink(Dots[v]), VerticalAlignment = VerticalAlignment.Center };kitDots[v] = dot;- var nm = new TextBlock { Text = Names[v], FontSize = 10, Foreground = selRow ? new SolidColorBrush(Color.Parse("#F0C060")) : new SolidColorBrush(Color.Parse("#C8C2B4")), VerticalAlignment = VerticalAlignment.Center };+ var nm = new TextBlock { Text = Names[v], FontSize = 10, Foreground = selRow ? NotaPalette.AccentBright : NotaPalette.TextStrong, VerticalAlignment = VerticalAlignment.Center };var tag = new TextBlock { Text = isSmp ? "SMP" : "SYN", FontSize = 7, FontWeight = FontWeight.Bold, Foreground = isSmp ? TealB : selRow ? Brass : Muted, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Right };var row = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), Height = 15, Margin = new Thickness(6, 0) };Grid.SetColumn(dot, 0); Grid.SetColumn(nm, 1); Grid.SetColumn(tag, 2);nm.Margin = new Thickness(6, 0, 0, 0);- var rowBox = new Border { CornerRadius = new CornerRadius(4), Cursor = new Cursor(StandardCursorType.Hand), Child = row, Background = selRow ? new SolidColorBrush(Color.FromArgb(0x24, 0xD8, 0xA0, 0x3D)) : Brushes.Transparent, BorderBrush = selRow ? new SolidColorBrush(Color.Parse("#5A4C2E")) : Brushes.Transparent, BorderThickness = new Thickness(1) };+ var rowBox = new Border { CornerRadius = new CornerRadius(4), Cursor = new Cursor(StandardCursorType.Hand), Child = row, Background = selRow ? NotaPalette.Wash(NotaPalette.Accent, 0x24) : Brushes.Transparent, BorderBrush = selRow ? NotaPalette.AccentTint : Brushes.Transparent, BorderThickness = new Thickness(1) };row.Children.Add(dot); row.Children.Add(nm); row.Children.Add(tag);rowBox.PointerPressed += (_, _) => { Act(A_SelectVoice, vv); ctx.RequestRebuild(); };// Drop an audio file (browser or Finder) onto a voice → load it as that voice's sample.ToolTip.SetTip(rowBox, "Drop a sample to load it into this voice");DragDrop.SetAllowDrop(rowBox, true);DragDrop.AddDragOverHandler(rowBox, (_, e) => { if (BrowserView.IsAcceptableDrag(e)) { e.DragEffects = DragDropEffects.Copy; rowBox.BorderBrush = TealB; ctx.HideDropGlow(); } });- DragDrop.AddDragLeaveHandler(rowBox, (_, _) => rowBox.BorderBrush = selRow ? new SolidColorBrush(Color.Parse("#5A4C2E")) : Brushes.Transparent);+ DragDrop.AddDragLeaveHandler(rowBox, (_, _) => rowBox.BorderBrush = selRow ? NotaPalette.AccentTint : Brushes.Transparent);DragDrop.AddDropHandler(rowBox, (_, e) =>{foreach (var it in BrowserView.DroppedItems(e))@@ -134,7 +135,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardvar srcSeg = new Border { Background = Inset, BorderBrush = Border2, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(5), Padding = new Thickness(1), HorizontalAlignment = HorizontalAlignment.Right };Border SrcChip(string text, bool on, IBrush onBg)=> new() { Background = on ? onBg : Brushes.Transparent, CornerRadius = new CornerRadius(4), Padding = new Thickness(9, 2), Cursor = new Cursor(StandardCursorType.Hand),- Child = new TextBlock { Text = text, FontSize = 9, FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal, Foreground = on ? new SolidColorBrush(Color.Parse("#171613")) : Muted } };+ Child = new TextBlock { Text = text, FontSize = 9, FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal, Foreground = on ? NotaPalette.BgApp : Muted } };var synthChip = SrcChip("Synth", !sampleMode, Brass);var sampleChip = SrcChip("Sample", sampleMode, TealB);synthChip.PointerPressed += (_, _) => { Act(A_SetSource, sel, 0f); ctx.RequestRebuild(); };@@ -152,7 +153,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardsampleChip.PointerPressed += (_, _) => { if (voiceSid != 0) { Act(A_SetSource, sel, 1f); ctx.RequestRebuild(); } else LoadSampleDialog(sampleChip); };ToolTip.SetTip(sampleChip, "Load a one-shot sample for this voice (or drop a file on the voice)");srcSeg.Child = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 1, Children = { synthChip, sampleChip } };- var engBox = new Border { Height = 17, Background = Inset, BorderBrush = Border2, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(6, 0), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = sampleMode ? "Sample" : Engines[sel], FontSize = 9, Foreground = new SolidColorBrush(Color.Parse("#C8C2B4")), VerticalAlignment = VerticalAlignment.Center } };+ var engBox = new Border { Height = 17, Background = Inset, BorderBrush = Border2, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(6, 0), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = sampleMode ? "Sample" : Engines[sel], FontSize = 9, Foreground = NotaPalette.TextStrong, VerticalAlignment = VerticalAlignment.Center } };var voiceHeadRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), ColumnSpacing = 8 };Grid.SetColumn(voiceHead, 0); Grid.SetColumn(srcSeg, 1); Grid.SetColumn(engBox, 2);voiceHeadRow.Children.Add(voiceHead); voiceHeadRow.Children.Add(srcSeg); voiceHeadRow.Children.Add(engBox);@@ -175,7 +176,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardvar hitDock = new DockPanel { LastChildFill = true };DockPanel.SetDock(hitHead, Dock.Top); hitDock.Children.Add(hitHead);hitDock.Children.Add(new Border { Margin = new Thickness(0, 2, 0, 0), Child = hitInner });- var hitBox = new Border { Width = 148, Background = Inset, BorderBrush = new SolidColorBrush(Color.Parse("#221F1A")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Padding = new Thickness(5, 4), Child = hitDock };+ var hitBox = new Border { Width = 148, Background = Inset, BorderBrush = NotaPalette.GraphBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Padding = new Thickness(5, 4), Child = hitDock };if (sampleMode) { hitBox.Cursor = new Cursor(StandardCursorType.Hand); hitBox.PointerPressed += (_, _) => LoadSampleDialog(hitBox); }// engine knobs of the selected voice.@@ -202,7 +203,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardperfKnobs.Children.Add(InstrumentControls.InstKnob(ctx, idx, "accent", "ACCENT", DoRefresh, 40, 52));var perfDock = new DockPanel { LastChildFill = true };var perfHead = Sec("PERFORM"); DockPanel.SetDock(perfHead, Dock.Top); perfDock.Children.Add(perfHead);- var perfFoot = Mono("shift+step = accent", new SolidColorBrush(Color.Parse("#4A463D")), 8); perfFoot.HorizontalAlignment = HorizontalAlignment.Center;+ var perfFoot = Mono("shift+step = accent", NotaPalette.TextDisabled, 8); perfFoot.HorizontalAlignment = HorizontalAlignment.Center;DockPanel.SetDock(perfFoot, Dock.Bottom); perfDock.Children.Add(perfFoot);perfDock.Children.Add(perfKnobs);var perfCol = new Border { Width = 170, Background = Panel, BorderBrush = Border2, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(10, 7), Child = perfDock };@@ -223,7 +224,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardvar b = stepBtns[s];bool on = onArr[s], acc = accArr[s];b.Background = acc && on ? StepAcc : on ? StepOn : StepOff;- b.BorderBrush = acc && on ? new SolidColorBrush(Color.Parse("#F0C060")) : on ? new SolidColorBrush(Color.Parse("#E0B455")) : Border2;+ b.BorderBrush = acc && on ? NotaPalette.AccentBright : on ? NotaPalette.AccentHover : Border2;b.BorderThickness = new Thickness(1);}void SyncVel(int s) => velFills[s].Height = VelH * (onArr[s] ? Math.Max(0.12f, velArr[s]) : 0);@@ -253,7 +254,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardvar fill = new Border { VerticalAlignment = VerticalAlignment.Bottom, Background = VelFill, CornerRadius = new CornerRadius(2) };velFills[s] = fill; SyncVel(s);- var vb = new Border { Background = new SolidColorBrush(Color.Parse("#0A0908")), CornerRadius = new CornerRadius(2), Child = fill, Cursor = new Cursor(StandardCursorType.SizeNorthSouth), ClipToBounds = true };+ var vb = new Border { Background = NotaPalette.SurfaceAbyss, CornerRadius = new CornerRadius(2), Child = fill, Cursor = new Cursor(StandardCursorType.SizeNorthSouth), ClipToBounds = true };void SetVelFromY(PointerEventArgs pe){double h = Math.Max(1, vb.Bounds.Height);@@ -280,7 +281,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardfor (int b = 0; b < 4; b++){int bb = b; bool cur = b == bank;- var chip = new Border { CornerRadius = new CornerRadius(3), Padding = new Thickness(6, 1), Cursor = new Cursor(StandardCursorType.Hand), Background = cur ? TealB : Brushes.Transparent, Child = new TextBlock { Text = ((char)('A' + b)).ToString(), FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = cur ? new SolidColorBrush(Color.Parse("#171613")) : Muted } };+ var chip = new Border { CornerRadius = new CornerRadius(3), Padding = new Thickness(6, 1), Cursor = new Cursor(StandardCursorType.Hand), Background = cur ? TealB : Brushes.Transparent, Child = new TextBlock { Text = ((char)('A' + b)).ToString(), FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = cur ? NotaPalette.BgApp : Muted } };chip.PointerPressed += (_, _) => { Act(A_SelectBank, bb); ctx.RequestRebuild(); };banks.Children.Add(chip);}@@ -293,7 +294,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCardvar seqCol = new Border { Height = 78, Background = SeqBg, BorderBrush = Border2, BorderThickness = new Thickness(0, 1, 0, 0), Padding = new Thickness(10, 6), Child = seqInner };// ---- assemble body --------------------------------------------------- var body = new DockPanel { LastChildFill = true, Background = Ink };+ var body = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(seqCol, Dock.Bottom); body.Children.Add(seqCol);body.Children.Add(upper);diff --git a/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.csindex 68ce79ca..c909436c 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs@@ -28,21 +28,21 @@ internal sealed class SamplerInstrumentCard : IInstrumentCardpublic string Subtitle => "BUILT-IN";public double CardWidth => 700;- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush FieldBorder = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush GreenC = new SolidColorBrush(Color.Parse("#58B368"));- private static readonly IBrush RedC = new SolidColorBrush(Color.Parse("#D95F4C"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));- private static readonly IBrush RowLit = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush FieldBorder = NotaPalette.GraphBorder;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush GreenC = NotaPalette.Success;+ private static readonly IBrush RedC = NotaPalette.Danger;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);+ private static readonly IBrush RowLit = NotaPalette.SurfaceRaised;+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);private static double Exp(double v, double lo, double hi) => lo * Math.Pow(hi / lo, Math.Clamp(v, 0, 1));@@ -72,7 +72,7 @@ internal sealed class SamplerInstrumentCard : IInstrumentCardnew TextBlock { Text = "↓", FontSize = 22, Foreground = MutedC, HorizontalAlignment = HorizontalAlignment.Center },new TextBlock { Text = "Drop a sample here", FontSize = 11, Foreground = TextSecondary, HorizontalAlignment = HorizontalAlignment.Center },new TextBlock { Text = "drag from the Files tab or the browser", FontSize = 9, Foreground = MutedC, HorizontalAlignment = HorizontalAlignment.Center } } };- return new Border { Background = new SolidColorBrush(Color.Parse("#171613")), Child = prompt };+ return new Border { Background = NotaPalette.BgApp, Child = prompt };}// Sample data: peaks for the waveform + raw mono for zero-crossing snapping.@@ -147,7 +147,7 @@ internal sealed class SamplerInstrumentCard : IInstrumentCardControl ActionBtn(string label, Action click){- var b = new Border { CornerRadius = new CornerRadius(4), BorderThickness = new Thickness(1), BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), Background = RowLit, Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = label, FontSize = 9, Foreground = new SolidColorBrush(Color.Parse("#A39D8F")) } };+ var b = new Border { CornerRadius = new CornerRadius(4), BorderThickness = new Thickness(1), BorderBrush = NotaPalette.BorderStrong, Background = RowLit, Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = label, FontSize = 9, Foreground = NotaPalette.TextSecondary } };b.PointerPressed += (_, _) => click();return b;}@@ -169,8 +169,8 @@ internal sealed class SamplerInstrumentCard : IInstrumentCardif (!idx.TryGetValue(id, out var pi)) return new Panel();var fill = new Border { Height = 3, Background = Amber, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var track2 = new Border { Height = 3, Background = Inset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center };- var center = bipolar ? new Border { Width = 1, Background = new SolidColorBrush(Color.Parse("#3A362D")), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) } : null;- var handle = new Border { Width = 8, Height = 10, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var center = bipolar ? new Border { Width = 1, Background = NotaPalette.BorderStrong, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Stretch, Margin = new Thickness(0, 1) } : null;+ var handle = new Border { Width = 8, Height = 10, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Height = 11, MinWidth = 46 }; slot.Children.Add(track2); if (center != null) slot.Children.Add(center); slot.Children.Add(fill); slot.Children.Add(handle);var val = MonoTx(fmt(G(id)), TxtC, 9); val.Width = vw; val.TextAlignment = TextAlignment.Right;bool drag = false;@@ -190,7 +190,7 @@ internal sealed class SamplerInstrumentCard : IInstrumentCardControl RootStepper(){var lbl = MonoTx(NoteName(rootv), TxtC, 10); lbl.Width = 26; lbl.TextAlignment = TextAlignment.Center;- Border Btn(string t, int d) { var b = new Border { Width = 16, Height = 16, CornerRadius = new CornerRadius(3), BorderThickness = new Thickness(1), BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), Background = RowLit, Cursor = new Cursor(StandardCursorType.Hand), Child = new TextBlock { Text = t, FontSize = 9, Foreground = new SolidColorBrush(Color.Parse("#A39D8F")), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center } }; b.PointerPressed += (_, _) => { rootv = Math.Clamp(rootv + d, 0, 127); acc.SetRoot(rootv); lbl.Text = NoteName(rootv); RefreshAll(); }; return b; }+ Border Btn(string t, int d) { var b = new Border { Width = 16, Height = 16, CornerRadius = new CornerRadius(3), BorderThickness = new Thickness(1), BorderBrush = NotaPalette.BorderStrong, Background = RowLit, Cursor = new Cursor(StandardCursorType.Hand), Child = new TextBlock { Text = t, FontSize = 9, Foreground = NotaPalette.TextSecondary, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center } }; b.PointerPressed += (_, _) => { rootv = Math.Clamp(rootv + d, 0, 127); acc.SetRoot(rootv); lbl.Text = NoteName(rootv); RefreshAll(); }; return b; }return new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4, VerticalAlignment = VerticalAlignment.Center, Children = { Btn("−", -1), lbl, Btn("+", +1) } };}@@ -293,7 +293,7 @@ internal sealed class SamplerInstrumentCard : IInstrumentCardDockPanel.SetDock(tabRail, Dock.Left);var body = new DockPanel { LastChildFill = true, Children = { tabRail, bodyContent } };DockPanel.SetDock(live, Dock.Top);- var root2 = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root2 = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };void RefreshAll() { foreach (var a in readouts) a(); }registerTick(() => { wave.SetPlayhead(acc.PlayPosition()); RefreshAll(); });@@ -355,8 +355,8 @@ internal sealed class SamplerInstrumentCard : IInstrumentCard// ---- amp-envelope schematic (ADSR from normalized param values) ----internal sealed class SamplerEnv : Control{- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TealFill = new SolidColorBrush(Color.FromArgb(0x1F, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush TealFill = NotaPalette.Wash(NotaPalette.Teal, 0x1F);private double _a, _d, _s = 1, _r;public void Set(double a, double d, double s, double r) { _a = a; _d = d; _s = s; _r = r; InvalidateVisual(); }public override void Render(DrawingContext ctx)@@ -379,9 +379,9 @@ internal sealed class SamplerEnv : Control// ---- filter magnitude response schematic ----internal sealed class SamplerFilter : Control{- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush Fill = new SolidColorBrush(Color.FromArgb(0x1C, 0xD8, 0xA0, 0x3D));- private static readonly IBrush Grid = new SolidColorBrush(Color.FromArgb(0x40, 0x3A, 0x36, 0x2D));+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush Fill = NotaPalette.Wash(NotaPalette.Accent, 0x1C);+ private static readonly IBrush Grid = NotaPalette.Wash(NotaPalette.BorderStrong, 0x40);private int _type; private double _cut = 1, _reso;public void Set(int type, double cut, double reso) { _type = type; _cut = cut; _reso = reso; InvalidateVisual(); }public override void Render(DrawingContext ctx)@@ -410,17 +410,17 @@ internal sealed class SamplerFilter : Controlctx.DrawGeometry(Fill, null, fill);var pen = new Pen(Amber, 1.5, lineJoin: PenLineJoin.Round);for (int i = 1; i < pts.Count; i++) ctx.DrawLine(pen, pts[i - 1], pts[i]);- if (_type > 0) ctx.DrawLine(new Pen(new SolidColorBrush(Color.FromArgb(0x66, 0xF0, 0xC0, 0x60)), 1) { DashStyle = DashStyle.Dash }, new Point(cx, 0), new Point(cx, h));+ if (_type > 0) ctx.DrawLine(new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0x66), 1) { DashStyle = DashStyle.Dash }, new Point(cx, 0), new Point(cx, h));}}// ---- mini keyboard marking the sampler's root (+ transposed pitch) ----internal sealed class SamplerKeys : Control{- private static readonly IBrush White = new SolidColorBrush(Color.Parse("#2A2721"));- private static readonly IBrush Black = new SolidColorBrush(Color.Parse("#151310"));- private static readonly IBrush RootB = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush TransB = new SolidColorBrush(Color.FromArgb(0x88, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush White = NotaPalette.MiniKeyWhite;+ private static readonly IBrush Black = NotaPalette.MiniKeyBlack;+ private static readonly IBrush RootB = NotaPalette.Accent;+ private static readonly IBrush TransB = NotaPalette.Wash(NotaPalette.Teal, 0x88);private int _root = 60; private double _transpose;public void Set(int root, double transpose) { _root = root; _transpose = transpose; InvalidateVisual(); }public override void Render(DrawingContext ctx)diff --git a/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.csindex 3881e503..e5a73c79 100644--- a/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs+++ b/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs@@ -25,18 +25,18 @@ namespace Nota.App;internal sealed class VoltInstrumentCard : IInstrumentCard{// Exact mockup palette (matches GrainInstrumentCard).- private static readonly IBrush CardBg = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Handle = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush CardBg = NotaPalette.BgApp;+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush Handle = NotaPalette.TextSecondary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);private static readonly string[] DestNames = { "Pitch", "Osc2", "Cutoff", "Reso", "Level", "Pan" };@@ -290,7 +290,7 @@ internal sealed class VoltInstrumentCard : IInstrumentCardvar tabCache = new Control?[tabs.Length];Control TabBody(int t) => tabCache[t] ??= t switch { 1 => FilterTab(), 2 => EnvTab(), 3 => LfoTab(), 4 => ModTab(), 5 => MacroTab(), _ => OscTab() };int tabSel = 0; var tabBtns = new Border[tabs.Length];- void HiTabs() { for (int i = 0; i < tabs.Length; i++) { bool on = i == tabSel; tabBtns[i].Background = on ? new SolidColorBrush(Color.Parse("#26231E")) : Brushes.Transparent; tabBtns[i].BorderBrush = on ? (tealTab[i] ? TealC : Amber) : Brushes.Transparent; ((TextBlock)tabBtns[i].Child!).Foreground = on ? TxtC : MutedC; } }+ void HiTabs() { for (int i = 0; i < tabs.Length; i++) { bool on = i == tabSel; tabBtns[i].Background = on ? NotaPalette.SurfaceRaised : Brushes.Transparent; tabBtns[i].BorderBrush = on ? (tealTab[i] ? TealC : Amber) : Brushes.Transparent; ((TextBlock)tabBtns[i].Child!).Foreground = on ? TxtC : MutedC; } }var railCol = new StackPanel { Spacing = 2 };for (int i = 0; i < tabs.Length; i++){diff --git a/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.csindex d951a7db..126efaca 100644--- a/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs+++ b/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs@@ -26,16 +26,16 @@ internal sealed class ArpMidiBody : IMidiDeviceBodyGOrder = 6, GSwing = 7, GHold = 8, GRetrig = 9, GTranspose = 10, GLoop = 11;internal const int LVel = 13, LLen = 29, LChance = 45, LRatchet = 61, LTransp = 77, LOn = 93, LCC = 109;- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Border2 = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush TealC = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush TxtC = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush MutedC = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Border2 = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush TealC = NotaPalette.Teal;+ private static readonly IBrush TxtC = NotaPalette.TextPrimary;+ private static readonly IBrush MutedC = NotaPalette.TextTertiary;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);private static readonly string[] RateNames = { "1/1", "1/2", "1/4", "1/8", "1/8T", "1/16", "1/16T", "1/32" };private static readonly string[] OrderNames = { "Up", "Down", "Up-Dn", "Converge", "As played", "Chord", "Random" };@@ -129,7 +129,7 @@ internal sealed class ArpMidiBody : IMidiDeviceBodyvar l = lanes[li]; laneSel = li;grid.SetLane(l.b, l.min, l.max, l.vel, l.isInt);laneName.Text = l.name.ToUpperInvariant();- for (int i = 0; i < lanes.Length; i++) { bool on = i == li; laneBtns[i].Background = on ? new SolidColorBrush(Color.Parse("#26231E")) : Brushes.Transparent; laneBtns[i].BorderBrush = on ? Amber : Brushes.Transparent; ((TextBlock)laneBtns[i].Child!).Foreground = on ? TxtC : MutedC; }+ for (int i = 0; i < lanes.Length; i++) { bool on = i == li; laneBtns[i].Background = on ? NotaPalette.SurfaceRaised : Brushes.Transparent; laneBtns[i].BorderBrush = on ? Amber : Brushes.Transparent; ((TextBlock)laneBtns[i].Child!).Foreground = on ? TxtC : MutedC; }}var railCol = new StackPanel { Spacing = 2 };for (int i = 0; i < lanes.Length; i++)@@ -192,7 +192,7 @@ internal sealed class ArpMidiBody : IMidiDeviceBodyDockPanel.SetDock(laneRail, Dock.Left); DockPanel.SetDock(rightRail, Dock.Right);var body = new DockPanel { LastChildFill = true, Children = { laneRail, rightRail, stepArea } };DockPanel.SetDock(live, Dock.Top);- var root = new DockPanel { LastChildFill = true, Background = new SolidColorBrush(Color.Parse("#171613")), Children = { live, body } };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp, Children = { live, body } };SelectLane(0);// Live playhead + step readout.diff --git a/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.csindex 39e53830..22177d51 100644--- a/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs+++ b/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs@@ -33,19 +33,19 @@ internal sealed class ChordMidiBody : IMidiDeviceBody("Sus4", new[] { 5, 7 }), ("5th", new[] { 7, 12 }),};- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Green = new SolidColorBrush(Color.Parse("#58B368"));- private static readonly IBrush Card = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Green = NotaPalette.Success;+ private static readonly IBrush Card = NotaPalette.SurfaceRaised;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x24);public double Width => 700;public bool FullBleed => true;@@ -169,7 +169,7 @@ internal sealed class ChordMidiBody : IMidiDeviceBodyvar g = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,Auto,*,Auto"), ColumnSpacing = 7, VerticalAlignment = VerticalAlignment.Center };var cells = new Control[] { dot, lbl, semi, vel };for (int c = 0; c < cells.Length; c++) { Grid.SetColumn(cells[c], c); g.Children.Add(cells[c]); }- return new Border { Background = Ink, BorderBrush = Bd, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(7, 0), Height = 26, Child = g };+ return new Border { Background = NotaPalette.BgApp, BorderBrush = Bd, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(7, 0), Height = 26, Child = g };}var shiftHead = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), Height = 11 };var sh1 = Cap("semitones · velocity"); sh1.HorizontalAlignment = HorizontalAlignment.Right; Grid.SetColumn(sh1, 1);@@ -212,7 +212,7 @@ internal sealed class ChordMidiBody : IMidiDeviceBodyvar body = new DockPanel { LastChildFill = true };DockPanel.SetDock(shiftPanel, Dock.Left); body.Children.Add(shiftPanel); body.Children.Add(resPanel);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(liveStrip, Dock.Top); root.Children.Add(liveStrip); root.Children.Add(body);Refresh();diff --git a/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.csindex 901ed2be..5037855b 100644--- a/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs+++ b/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs@@ -27,19 +27,19 @@ internal sealed class LengthMidiBody : IMidiDeviceBodyprivate static readonly string[] RateLbl = { "1/16", "1/8", "1/8D", "1/4" };private static readonly string[] Modes = { "Sync", "ms", "Gate %" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Card = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Card = NotaPalette.SurfaceRaised;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);public double Width => 700;public bool FullBleed => true;@@ -199,7 +199,7 @@ internal sealed class LengthMidiBody : IMidiDeviceBodyvar body = new DockPanel { LastChildFill = true };DockPanel.SetDock(modRail, Dock.Right); body.Children.Add(modRail); body.Children.Add(gateHost);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(liveStrip, Dock.Top); root.Children.Add(liveStrip); root.Children.Add(body);BuildLen();diff --git a/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.csindex 6ca6eb79..d6eb92ce 100644--- a/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs+++ b/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs@@ -25,20 +25,20 @@ internal sealed class RandomMidiBody : IMidiDeviceBodyprivate static readonly string[] Dists = { "Gauss", "Even", "Walk" };private static readonly string[] Rates = { "Per note", "Per bar" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Red = new SolidColorBrush(Color.Parse("#D0603F"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Card = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush TealSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush Red = NotaPalette.Ink("#D0603F");+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Card = NotaPalette.SurfaceRaised;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush TealSubtle = NotaPalette.Wash(NotaPalette.Teal, 0x24);public double Width => 700;public bool FullBleed => true;@@ -161,9 +161,9 @@ internal sealed class RandomMidiBody : IMidiDeviceBodyreadouts.Add(() => distViz.Set(Gi(PDist)));var distAxis = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") };var da1 = Mono("centre", Muted, 8); da1.HorizontalAlignment = HorizontalAlignment.Center;- var da2 = Mono("+max", new SolidColorBrush(Color.Parse("#4A463D")), 8); da2.HorizontalAlignment = HorizontalAlignment.Right;+ var da2 = Mono("+max", NotaPalette.TextDisabled, 8); da2.HorizontalAlignment = HorizontalAlignment.Right;Grid.SetColumn(da1, 1); Grid.SetColumn(da2, 2);- distAxis.Children.Add(Mono("−max", new SolidColorBrush(Color.Parse("#4A463D")), 8)); distAxis.Children.Add(da1); distAxis.Children.Add(da2);+ distAxis.Children.Add(Mono("−max", NotaPalette.TextDisabled, 8)); distAxis.Children.Add(da1); distAxis.Children.Add(da2);var rateRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, VerticalAlignment = VerticalAlignment.Center, Children = { Cap("RATE"), Seg(PRate, Rates, null, 8, 8) } };var railStack = new StackPanel { Spacing = 5, Children ={@@ -175,7 +175,7 @@ internal sealed class RandomMidiBody : IMidiDeviceBodyvar body = new DockPanel { LastChildFill = true };DockPanel.SetDock(rail, Dock.Right); body.Children.Add(rail); body.Children.Add(varyPanel);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(liveStrip, Dock.Top); root.Children.Add(liveStrip); root.Children.Add(body);Refresh();diff --git a/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.csindex dc54aec7..52a4900f 100644--- a/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs+++ b/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs@@ -31,19 +31,19 @@ internal sealed class ScaleMidiBody : IMidiDeviceBodyprivate static readonly int[] PresetMasks = { 2741, 1453, 2477, 1709, 1451, 2773, 1717, 661, 1193, 4095 };private static readonly string[] Folds = { "Nearest", "Down", "Up" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Green = new SolidColorBrush(Color.Parse("#58B368"));- private static readonly IBrush Card = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Green = NotaPalette.Success;+ private static readonly IBrush Card = NotaPalette.SurfaceRaised;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);public double Width => 700;public bool FullBleed => true;@@ -215,7 +215,7 @@ internal sealed class ScaleMidiBody : IMidiDeviceBodyvar body = new DockPanel { LastChildFill = true, Margin = new Thickness(9, 7) };DockPanel.SetDock(rail, Dock.Right); body.Children.Add(rail); body.Children.Add(mapDock);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(liveStrip, Dock.Top); root.Children.Add(liveStrip); root.Children.Add(body);ctx.AddDeviceRefresher(Refresh); // live IN→OUT + Follow-Key / Learn feedbackdiff --git a/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.csindex 4a97c57a..81d4683d 100644--- a/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs+++ b/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs@@ -24,19 +24,19 @@ internal sealed class VelocityMidiBody : IMidiDeviceBodyprivate static readonly string[] Modes = { "Curve", "Compand", "Fixed" };private static readonly string[] Dirs = { "Both", "Up", "Down" };- private static readonly IBrush HdrBg = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush RailBg = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush Bd = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush Inset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush Amber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush AmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush AmberDim = new SolidColorBrush(Color.FromArgb(0x73, 0xD8, 0xA0, 0x3D));- private static readonly IBrush Teal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush Txt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush Muted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush Sub = new SolidColorBrush(Color.Parse("#A39D8F"));- private static readonly IBrush Ink = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush AmberSubtle = new SolidColorBrush(Color.FromArgb(0x28, 0xD8, 0xA0, 0x3D));+ private static readonly IBrush HdrBg = NotaPalette.SurfaceCard;+ private static readonly IBrush RailBg = NotaPalette.SurfaceInset;+ private static readonly IBrush Bd = NotaPalette.BorderDefault;+ private static readonly IBrush Inset = NotaPalette.BgSunken;+ private static readonly IBrush Amber = NotaPalette.Accent;+ private static readonly IBrush AmberLit = NotaPalette.AccentBright;+ private static readonly IBrush AmberDim = NotaPalette.Wash(NotaPalette.Accent, 0x73);+ private static readonly IBrush Teal = NotaPalette.Teal;+ private static readonly IBrush Txt = NotaPalette.TextPrimary;+ private static readonly IBrush Muted = NotaPalette.TextTertiary;+ private static readonly IBrush Sub = NotaPalette.TextSecondary;+ private static readonly IBrush Ink = NotaPalette.TextOnAccent;+ private static readonly IBrush AmberSubtle = NotaPalette.Wash(NotaPalette.Accent, 0x28);public double Width => 700;public bool FullBleed => true;@@ -118,14 +118,14 @@ internal sealed class VelocityMidiBody : IMidiDeviceBodyvar transHead = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), Height = 11 };Grid.SetColumn(readout, 1); transHead.Children.Add(Cap("TRANSFER")); transHead.Children.Add(readout);var axis = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), Height = 10 };- var ax1 = Mono("64", new SolidColorBrush(Color.Parse("#4A463D")), 8); ax1.HorizontalAlignment = HorizontalAlignment.Center;- var ax2 = Mono("out 127", new SolidColorBrush(Color.Parse("#4A463D")), 8); ax2.HorizontalAlignment = HorizontalAlignment.Right;+ var ax1 = Mono("64", NotaPalette.TextDisabled, 8); ax1.HorizontalAlignment = HorizontalAlignment.Center;+ var ax2 = Mono("out 127", NotaPalette.TextDisabled, 8); ax2.HorizontalAlignment = HorizontalAlignment.Right;Grid.SetColumn(ax1, 1); Grid.SetColumn(ax2, 2);- axis.Children.Add(Mono("in 1", new SolidColorBrush(Color.Parse("#4A463D")), 8)); axis.Children.Add(ax1); axis.Children.Add(ax2);+ axis.Children.Add(Mono("in 1", NotaPalette.TextDisabled, 8)); axis.Children.Add(ax1); axis.Children.Add(ax2);var transDock = new DockPanel { LastChildFill = true };DockPanel.SetDock(transHead, Dock.Top); DockPanel.SetDock(axis, Dock.Bottom);transDock.Children.Add(transHead); transDock.Children.Add(axis); transDock.Children.Add(viz);- var transPanel = new Border { Background = Inset, BorderBrush = new SolidColorBrush(Color.Parse("#221F1A")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Padding = new Thickness(8, 4), Margin = new Thickness(8, 7), Child = transDock };+ var transPanel = new Border { Background = Inset, BorderBrush = NotaPalette.GraphBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Padding = new Thickness(8, 4), Margin = new Thickness(8, 7), Child = transDock };readouts.Add(() =>{@@ -145,7 +145,7 @@ internal sealed class VelocityMidiBody : IMidiDeviceBodyvar rangeVals = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") };var loT = Mono("", Txt); var hiT = Mono("", Txt); hiT.HorizontalAlignment = HorizontalAlignment.Right;Grid.SetColumn(hiT, 2); rangeVals.Children.Add(loT); rangeVals.Children.Add(hiT);- var rangeFill = new Border { Background = new SolidColorBrush(Color.FromArgb(0x73, 0xD8, 0xA0, 0x3D)), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Stretch };+ var rangeFill = new Border { Background = NotaPalette.Wash(NotaPalette.Accent, 0x73), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Stretch };var rangeBar = new Panel { Height = 8, Background = Inset, Cursor = new Cursor(StandardCursorType.Hand) };rangeBar.Children.Add(rangeFill);var rangeClip = new Border { Height = 8, CornerRadius = new CornerRadius(4), ClipToBounds = true, Child = rangeBar };@@ -189,7 +189,7 @@ internal sealed class VelocityMidiBody : IMidiDeviceBodyvar rail = new StackPanel { Spacing = 5, Children ={Cap("OUT RANGE"), rangeClip, rangeVals,- new Border { Height = 1, Background = new SolidColorBrush(Color.Parse("#26231E")), Margin = new Thickness(0, 1) },+ new Border { Height = 1, Background = NotaPalette.SurfaceRaised, Margin = new Thickness(0, 1) },rndToggle, dirRow,} };var railDock = new DockPanel { LastChildFill = false, VerticalAlignment = VerticalAlignment.Stretch };@@ -199,7 +199,7 @@ internal sealed class VelocityMidiBody : IMidiDeviceBodyvar body = new DockPanel { LastChildFill = true };DockPanel.SetDock(railBorder, Dock.Right); body.Children.Add(railBorder); body.Children.Add(transPanel);- var root = new DockPanel { LastChildFill = true, Background = Ink };+ var root = new DockPanel { LastChildFill = true, Background = NotaPalette.BgApp };DockPanel.SetDock(liveStrip, Dock.Top); root.Children.Add(liveStrip); root.Children.Add(body);BuildStrip();diff --git a/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs b/src/managed/Nota.App/DeviceCards/Rack/RackCardView.csindex 563bbbf6..feaa41e3 100644--- a/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs+++ b/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs@@ -27,7 +27,7 @@ internal sealed class RackCardView(DeviceCardContext ctx){private static readonly string[] RackDeviceNames = { "Nota EQ-3", "Nota EQ-8", "Nota Dynamic EQ-8", "Nota Compressor", "Nota Prism", "Nota Reverb", "Nota Chamber", "Nota Delay", "Nota Utility", "Nota Level", "Nota Ceiling", "Nota Shutter", "Nota Valve", "Nota Auto Filter", "Nota Vintage", "Nota Forge", "Nota Crush", "Nota Orbit", "Nota Auto Shift", "Nota Beat Repeat", "Nota Strata" };private static readonly int[] RackDeviceKinds = { 16, 0, 13, 1, 21, 2, 20, 3, 4, 18, 14, 19, 6, 7, 8, 17, 12, 9, 10, 11, 15 };- private static readonly IBrush RowSel = new SolidColorBrush(Color.FromArgb(0x22, 0xD8, 0xA0, 0x3D)); // selected chain wash+ private static readonly IBrush RowSel = NotaPalette.Wash(NotaPalette.Accent, 0x22); // selected chain washprivate readonly DeviceCardContext _ctx = ctx;private IAudioEngine E => _ctx.Engine;@@ -35,18 +35,18 @@ internal sealed class RackCardView(DeviceCardContext ctx)private int Sel { get => _ctx.SelectedChain; set => _ctx.SelectedChain = value; }// ---- Instrument Rack (mockup 2p) shared bits ----- private static readonly IBrush IrHdr = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush IrRail = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush IrInset = new SolidColorBrush(Color.Parse("#100F0D"));- private static readonly IBrush IrBorder = new SolidColorBrush(Color.Parse("#2C2923"));- private static readonly IBrush IrField = new SolidColorBrush(Color.Parse("#221F1A"));- private static readonly IBrush IrCard = new SolidColorBrush(Color.Parse("#26231E"));- private static readonly IBrush IrAmber = new SolidColorBrush(Color.Parse("#D8A03D"));- private static readonly IBrush IrAmberLit = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush IrTeal = new SolidColorBrush(Color.Parse("#5B9E9C"));- private static readonly IBrush IrTxt = new SolidColorBrush(Color.Parse("#E9E4D8"));- private static readonly IBrush IrMuted = new SolidColorBrush(Color.Parse("#6E6A5E"));- private static readonly IBrush IrRed = new SolidColorBrush(Color.Parse("#D95F4C"));+ private static readonly IBrush IrHdr = NotaPalette.SurfaceCard;+ private static readonly IBrush IrRail = NotaPalette.SurfaceInset;+ private static readonly IBrush IrInset = NotaPalette.BgSunken;+ private static readonly IBrush IrBorder = NotaPalette.BorderDefault;+ private static readonly IBrush IrField = NotaPalette.GraphBorder;+ private static readonly IBrush IrCard = NotaPalette.SurfaceRaised;+ private static readonly IBrush IrAmber = NotaPalette.Accent;+ private static readonly IBrush IrAmberLit = NotaPalette.AccentBright;+ private static readonly IBrush IrTeal = NotaPalette.Teal;+ private static readonly IBrush IrTxt = NotaPalette.TextPrimary;+ private static readonly IBrush IrMuted = NotaPalette.TextTertiary;+ private static readonly IBrush IrRed = NotaPalette.Danger;private static bool _macroMapMode; // Instrument Rack: second (Macro-map) viewprivate static int _splitAxis; // 0 = Key zone, 1 = Velocityprivate static bool _drumMixer; // Drum Rack: false = Pads view, true = Mixer view@@ -61,7 +61,9 @@ internal sealed class RackCardView(DeviceCardContext ctx)// "work once" then stop routing). Structural edits from clicks go through this.private void DeferRebuild() => Avalonia.Threading.Dispatcher.UIThread.Post(_ctx.RequestRebuild);- private static IBrush ChainHue(int c) => new SolidColorBrush(NotaPalette.TrackColors[((c % 8) + 8) % 8]);+ // The palette slot itself, not a copy of its colour: these brushes are handed to+ // Borders that outlive a theme change, and a snapshot would freeze the chain hues.+ private static IBrush ChainHue(int c) => NotaPalette.TrackBrushes[((c % 8) + 8) % 8];private static TextBlock IrMono(string t, IBrush c, double fs = 8) { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Mono"); return tb; }private static TextBlock IrCap(string t, IBrush? c = null) => new() { Text = t, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = c ?? IrMuted, VerticalAlignment = VerticalAlignment.Center };@@ -76,7 +78,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)_irTick.Clear();Control content = _macroMapMode ? InstrumentRackMacroMap(a) : InstrumentRackMain(a);if (_irTick.Count > 0) _ctx.AddDeviceRefresher(() => { for (int i = 0; i < _irTick.Count; i++) _irTick[i](); });- return new Border { Width = 700, Height = 260, Background = new SolidColorBrush(Color.Parse("#171613")), BorderBrush = IrBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), ClipToBounds = true, Child = content };+ return new Border { Width = 700, Height = 260, Background = NotaPalette.BgApp, BorderBrush = IrBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), ClipToBounds = true, Child = content };}private Control InstrumentRackMain(IRackAccess a)@@ -133,8 +135,8 @@ internal sealed class RackCardView(DeviceCardContext ctx)for (int m = 0; m < a.MappingCount(); m++) if (a.TryGetMapping(m, out var mm) && mm.Macro == i) { mapped = true; break; }var name = new TextBlock { Text = a.MacroName(i), FontSize = 8, Foreground = mapped ? IrTxt : IrMuted, TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center };var val = IrMono("0", IrMuted, 8); val.TextAlignment = TextAlignment.Right;- var fill = new Border { Height = 3, Background = mapped ? IrAmber : new SolidColorBrush(Color.Parse("#4A463D")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 6, Height = 8, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var fill = new Border { Height = 3, Background = mapped ? IrAmber : NotaPalette.TextDisabled, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var handle = new Border { Width = 6, Height = 8, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Height = 10, Children = { new Border { Height = 3, Background = IrInset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center }, fill, handle } };void Vis(double v) { double W = slot.Bounds.Width; fill.Width = v * W; handle.Margin = new Thickness(Math.Clamp(v * W - 3, 0, Math.Max(0, W - 6)), 0, 0, 0); }bool drag = false;@@ -167,7 +169,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var rows = new StackPanel { Spacing = 4 };int chains = a.ChainCount();for (int c = 0; c < chains; c++) rows.Children.Add(IrChainRow(a, c));- var addBtn = new Border { BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3),+ var addBtn = new Border { BorderBrush = NotaPalette.BorderStrong, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3),Cursor = new Cursor(StandardCursorType.Hand), Child = new TextBlock { Text = "+ Add chain", FontSize = 9, Foreground = IrMuted, HorizontalAlignment = HorizontalAlignment.Center } };addBtn.PointerPressed += (_, _) => ShowAddChainMenu(a, addBtn);rows.Children.Add(addBtn);@@ -189,10 +191,10 @@ internal sealed class RackCardView(DeviceCardContext ctx)var nameTb = new TextBlock { Text = name, FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = sel ? IrAmberLit : IrTxt, TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center };var head = new DockPanel { LastChildFill = true, Children = { WithRight(ChainDelBtn(a, c)), WithRight(IrMono($"{devs} dev", IrMuted)), nameTb } };- var zone = IrMono($"{NoteName(kLo)}–{NoteName(kHi)}", new SolidColorBrush(Color.Parse("#A39D8F")));+ var zone = IrMono($"{NoteName(kLo)}–{NoteName(kHi)}", NotaPalette.TextSecondary);var vel = IrMono($"{vLo}–{vHi}", IrMuted);double db = a.ChainGain(c) <= 0.001 ? -60 : 20 * Math.Log10(a.ChainGain(c));- var dbT = IrMono(db <= -59 ? "−∞" : $"{db:+0.0;−0.0;0.0}", new SolidColorBrush(Color.Parse("#A39D8F")));+ var dbT = IrMono(db <= -59 ? "−∞" : $"{db:+0.0;−0.0;0.0}", NotaPalette.TextSecondary);var meterFill = new Border { Background = Success, HorizontalAlignment = HorizontalAlignment.Left, CornerRadius = new CornerRadius(1) };var meter = new Border { Width = 20, Height = 3, Background = IrInset, CornerRadius = new CornerRadius(1), Child = meterFill, VerticalAlignment = VerticalAlignment.Center };_irTick.Add(() => meterFill.Width = 20 * Math.Clamp(E.RackChainMeter(T, c), 0, 1));@@ -255,7 +257,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)Border MiniBtn(string label, Action act){var b = new Border { BorderThickness = new Thickness(1), BorderBrush = IrBorder, Background = IrInset, CornerRadius = new CornerRadius(3), Padding = new Thickness(6, 2), Cursor = new Cursor(StandardCursorType.Hand),- Child = new TextBlock { Text = label, FontSize = 8, Foreground = new SolidColorBrush(Color.Parse("#A39D8F")), HorizontalAlignment = HorizontalAlignment.Center } };+ Child = new TextBlock { Text = label, FontSize = 8, Foreground = NotaPalette.TextSecondary, HorizontalAlignment = HorizontalAlignment.Center } };b.PointerPressed += (_, e) => { e.Handled = true; act(); };return b;}@@ -309,7 +311,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)return slot;}- private static readonly IBrush DashIdle = new SolidColorBrush(Color.Parse("#3A362D"));+ private static readonly IBrush DashIdle = NotaPalette.BorderStrong;private Control IrAddDeviceSlot(IRackAccess a, int sc){@@ -320,8 +322,8 @@ internal sealed class RackCardView(DeviceCardContext ctx)Children = { dash, new StackPanel { VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center, Spacing = 2, Children = { plus, lbl } } } };void Idle() { dash.Stroke = DashIdle; dash.Fill = null; plus.Foreground = IrMuted; lbl.Foreground = IrMuted; }- void Hover() { dash.Stroke = new SolidColorBrush(Color.Parse("#6E6A5E")); plus.Foreground = IrTxt; lbl.Foreground = new SolidColorBrush(Color.Parse("#A39D8F")); }- void Drop() { dash.Stroke = IrTeal; dash.Fill = new SolidColorBrush(Color.FromArgb(0x22, 0x5B, 0x9E, 0x9C)); plus.Foreground = IrTeal; lbl.Foreground = IrTeal; }+ void Hover() { dash.Stroke = NotaPalette.TextTertiary; plus.Foreground = IrTxt; lbl.Foreground = NotaPalette.TextSecondary; }+ void Drop() { dash.Stroke = IrTeal; dash.Fill = NotaPalette.Wash(NotaPalette.Teal, 0x22); plus.Foreground = IrTeal; lbl.Foreground = IrTeal; }box.PointerEntered += (_, _) => Hover();box.PointerExited += (_, _) => Idle();@@ -402,7 +404,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)_irTick.Add(() => { if (!gd) GUpd(); });var glideRow = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 4, Children = { IrCap("GLIDE"), WithCol(gSlot, 1), WithCol(glideVal, 2) } };- var mapBtn = new Border { BorderBrush = IrTeal, BorderThickness = new Thickness(1), Background = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C)), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3), Cursor = new Cursor(StandardCursorType.Hand),+ var mapBtn = new Border { BorderBrush = IrTeal, BorderThickness = new Thickness(1), Background = NotaPalette.Wash(NotaPalette.Teal, 0x24), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3), Cursor = new Cursor(StandardCursorType.Hand),Child = new TextBlock { Text = "MACRO MAP", FontSize = 8, FontWeight = FontWeight.Bold, Foreground = IrTeal, HorizontalAlignment = HorizontalAlignment.Center, TextAlignment = TextAlignment.Center } };mapBtn.PointerPressed += (_, _) => { _macroMapMode = true; _ctx.RequestRebuild(); };@@ -443,7 +445,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)_ => { }, () => 0, _ => { }, tickReg, () => { }, () => { }, _ => { }, () => { });var body = _irFactory.Resolve(ik, true).Build(ctx);tickReg(() => { viz?.Invoke(); foreach (var f in faders) { if (f.k.Dragging) continue; float v = proxy.PluginParamGet(T, -1, f.i); if (Math.Abs(v - f.k.Value) > 1e-3) { f.k.Value = v; f.v.Text = (f.fmt ?? Pct)(v); } } });- return new Border { Width = 700, Height = 234, Background = new SolidColorBrush(Color.Parse("#171613")), ClipToBounds = true, Child = body };+ return new Border { Width = 700, Height = 234, Background = NotaPalette.BgApp, ClipToBounds = true, Child = body };}// Sampler pop-out that also accepts a dropped sample file (browser or Finder) → load it@@ -458,7 +460,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)void Rebuild(){ticks.Clear();- var wrap = new Border { Width = 700, Height = 234, Background = new SolidColorBrush(Color.Parse("#171613")), ClipToBounds = true, Child = SamplerInstrumentCard.BuildEditor(E, acc, ticks.Add) };+ var wrap = new Border { Width = 700, Height = 234, Background = NotaPalette.BgApp, ClipToBounds = true, Child = SamplerInstrumentCard.BuildEditor(E, acc, ticks.Add) };DragDrop.SetAllowDrop(wrap, true);DragDrop.AddDragOverHandler(wrap, (_, e) => { if (!BrowserView.IsAcceptableDrag(e)) { e.DragEffects = DragDropEffects.None; return; } e.DragEffects = DragDropEffects.Copy; e.Handled = true; });DragDrop.AddDropHandler(wrap, (_, e) => { foreach (var it in BrowserView.DroppedItems(e)) if (it.Kind == Nota.Presentation.BrowserItemKind.Sample) { acc.LoadSample(it.Path); Rebuild(); break; } e.Handled = true; });@@ -491,7 +493,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var pp = (RackChainDeviceEngineProxy)(object)proxy; pp.Inner = E; pp.Access = a; pp.Chain = sc; pp.Dev = d;var ctx = new DeviceCardContext(proxy, T, tickReg, () => { }, (_, _, _, _) => { }, _ => { }, _ => { }, () => sc, _ => { }, tickReg, () => { }, () => { }, _ => { }, () => { });var body = _irDeviceFactory.Resolve(kind).Build(ctx, a.AutomationDeviceIndex);- return new Border { Width = 700, Height = 234, Background = new SolidColorBrush(Color.Parse("#171613")), ClipToBounds = true, Child = body };+ return new Border { Width = 700, Height = 234, Background = NotaPalette.BgApp, ClipToBounds = true, Child = body };}private void OpenChainDeviceParams(IRackAccess a, int sc, int d, Control anchor){@@ -519,7 +521,7 @@ internal sealed class RackCardView(DeviceCardContext ctx){int iv = i; bool on = i == sel;var c = new Border { CornerRadius = new CornerRadius(2), Padding = new Thickness(6, 1), Cursor = new Cursor(StandardCursorType.Hand), Background = on ? IrAmber : Brushes.Transparent,- Child = new TextBlock { Text = names[i], FontSize = 8, FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal, Foreground = on ? new SolidColorBrush(Color.Parse("#171613")) : IrMuted } };+ Child = new TextBlock { Text = names[i], FontSize = 8, FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal, Foreground = on ? NotaPalette.BgApp : IrMuted } };c.PointerPressed += (_, _) => onSel(iv);row.Children.Add(c);}@@ -528,16 +530,16 @@ internal sealed class RackCardView(DeviceCardContext ctx)private Border IrMsBtn(string t, bool on, IBrush accent, Action onClick){- var b = new Border { MinWidth = 13, Height = 12, CornerRadius = new CornerRadius(2), BorderThickness = new Thickness(1), BorderBrush = on ? accent : new SolidColorBrush(Color.Parse("#3A362D")), Background = on ? accent : IrCard, Cursor = new Cursor(StandardCursorType.Hand),- Child = new TextBlock { Text = t, FontSize = 7, FontWeight = FontWeight.Bold, Foreground = on ? new SolidColorBrush(Color.Parse("#171613")) : new SolidColorBrush(Color.Parse("#A39D8F")), HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, Padding = new Thickness(3, 0) } };+ var b = new Border { MinWidth = 13, Height = 12, CornerRadius = new CornerRadius(2), BorderThickness = new Thickness(1), BorderBrush = on ? accent : NotaPalette.BorderStrong, Background = on ? accent : IrCard, Cursor = new Cursor(StandardCursorType.Hand),+ Child = new TextBlock { Text = t, FontSize = 7, FontWeight = FontWeight.Bold, Foreground = on ? NotaPalette.BgApp : NotaPalette.TextSecondary, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, Padding = new Thickness(3, 0) } };b.PointerPressed += (_, e) => { e.Handled = true; onClick(); };return b;}private Border IrRailBtn(string t, Action onClick){- var b = new Border { BorderThickness = new Thickness(1), BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), Background = IrCard, CornerRadius = new CornerRadius(3), Padding = new Thickness(0, 2), Cursor = new Cursor(StandardCursorType.Hand),- Child = new TextBlock { Text = t, FontSize = 9, Foreground = new SolidColorBrush(Color.Parse("#A39D8F")), HorizontalAlignment = HorizontalAlignment.Center } };+ var b = new Border { BorderThickness = new Thickness(1), BorderBrush = NotaPalette.BorderStrong, Background = IrCard, CornerRadius = new CornerRadius(3), Padding = new Thickness(0, 2), Cursor = new Cursor(StandardCursorType.Hand),+ Child = new TextBlock { Text = t, FontSize = 9, Foreground = NotaPalette.TextSecondary, HorizontalAlignment = HorizontalAlignment.Center } };b.PointerPressed += (_, _) => onClick();return b;}@@ -555,7 +557,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)done.PointerPressed += (_, _) => { if (onDone != null) onDone(); else { _macroMapMode = false; _ctx.RequestRebuild(); } };var strip = new Border { Height = 34, Background = IrHdr, BorderBrush = IrBorder, BorderThickness = new Thickness(0, 0, 0, 1), Padding = new Thickness(9, 0), Child =new DockPanel { LastChildFill = false, Children = { done, new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center, Children = {- IrCap("MAPPING", IrTeal), new TextBlock { Text = a.MacroName(_mapMacro), FontSize = 9, Foreground = new SolidColorBrush(Color.Parse("#A39D8F")), VerticalAlignment = VerticalAlignment.Center },+ IrCap("MAPPING", IrTeal), new TextBlock { Text = a.MacroName(_mapMacro), FontSize = 9, Foreground = NotaPalette.TextSecondary, VerticalAlignment = VerticalAlignment.Center },new TextBlock { Text = "→ click any control to add · drag its range below", FontSize = 8, Foreground = IrMuted, VerticalAlignment = VerticalAlignment.Center } } } } } };// Macros list (left).@@ -587,11 +589,11 @@ internal sealed class RackCardView(DeviceCardContext ctx)if (!a.TryGetMapping(m, out var mm) || mm.Macro != _mapMacro) continue;targetStack.Children.Add(IrMappingRow(a, m, mm));}- targetStack.Children.Add(new Border { BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 4),+ targetStack.Children.Add(new Border { BorderBrush = NotaPalette.BorderStrong, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 4),Child = new TextBlock { Text = "click a control in any device to map it here", FontSize = 9, Foreground = IrMuted, HorizontalAlignment = HorizontalAlignment.Center } });var curveSeg = IrSeg(new[] { "Linear", "Exp", "Log", "S" }, CommonCurve(a, _mapMacro), i => { for (int m = 0; m < a.MappingCount(); m++) if (a.TryGetMapping(m, out var mm) && mm.Macro == _mapMacro) a.SetMappingCurve(m, i); _ctx.RequestRebuild(); });- var unmap = new Border { BorderBrush = new SolidColorBrush(Color.FromArgb(0x80, 0xD9, 0x5F, 0x4C)), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(3), Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), [DockPanel.DockProperty] = Dock.Right,+ var unmap = new Border { BorderBrush = NotaPalette.Wash(NotaPalette.Danger, 0x80), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(3), Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), [DockPanel.DockProperty] = Dock.Right,Child = new TextBlock { Text = "Unmap all", FontSize = 9, Foreground = IrRed } };unmap.PointerPressed += (_, _) => { for (int m = a.MappingCount() - 1; m >= 0; m--) if (a.TryGetMapping(m, out var mm) && mm.Macro == _mapMacro) a.RemoveMapping(m); _ctx.RequestRebuild(); };var bottom = new DockPanel { LastChildFill = false, [DockPanel.DockProperty] = Dock.Bottom, Children = { unmap, new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center, Children = { IrCap("CURVE"), curveSeg } } } };@@ -623,9 +625,9 @@ internal sealed class RackCardView(DeviceCardContext ctx)double span = Math.Max(1e-6, pMax - pMin);double fLo = Math.Clamp((mm.RangeMin - pMin) / span, 0, 1), fHi = Math.Clamp((mm.RangeMax - pMin) / span, 0, 1);var name = new TextBlock { Text = $"{dev} · {pn}", FontSize = 9, Foreground = IrTxt, Width = 122, TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center };- var band = new Border { Height = 6, Background = new SolidColorBrush(Color.FromArgb(0x73, 0x5B, 0x9E, 0x9C)), CornerRadius = new CornerRadius(3), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };- var track = new Panel { Height = 6, MinWidth = 60, Children = { new Border { Height = 6, Background = new SolidColorBrush(Color.Parse("#171613")), CornerRadius = new CornerRadius(3), VerticalAlignment = VerticalAlignment.Center }, band } };- var vals = IrMono($"{mm.RangeMin * 100:0}%–{mm.RangeMax * 100:0}%", new SolidColorBrush(Color.Parse("#A39D8F")));+ var band = new Border { Height = 6, Background = NotaPalette.Wash(NotaPalette.Teal, 0x73), CornerRadius = new CornerRadius(3), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var track = new Panel { Height = 6, MinWidth = 60, Children = { new Border { Height = 6, Background = NotaPalette.BgApp, CornerRadius = new CornerRadius(3), VerticalAlignment = VerticalAlignment.Center }, band } };+ var vals = IrMono($"{mm.RangeMin * 100:0}%–{mm.RangeMax * 100:0}%", NotaPalette.TextSecondary);void Upd() { double w = track.Bounds.Width; band.Margin = new Thickness(fLo * w, 0, 0, 0); band.Width = Math.Max(2, (fHi - fLo) * w); }int drag = 0; // 1 = min, 2 = maxvoid Apply(double x) { double f = Math.Clamp(x / Math.Max(1, track.Bounds.Width), 0, 1); if (drag == 1) fLo = Math.Min(f, fHi); else fHi = Math.Max(f, fLo); Upd(); }@@ -685,7 +687,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)IrCap("CHAINS"), WithRight(new TextBlock { Text = sub, FontSize = 8, Foreground = IrMuted, VerticalAlignment = VerticalAlignment.Center }) } };var rows = new StackPanel { Spacing = 4 };for (int c = 0; c < chains; c++) rows.Children.Add(AeChainRow(a, di, c));- var add = new Border { BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3), Cursor = new Cursor(StandardCursorType.Hand),+ var add = new Border { BorderBrush = NotaPalette.BorderStrong, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3), Cursor = new Cursor(StandardCursorType.Hand),Child = new TextBlock { Text = "+ Add chain", FontSize = 9, Foreground = IrMuted, HorizontalAlignment = HorizontalAlignment.Center } };add.PointerPressed += (_, _) => { int c = a.AddChain(-1); if (c >= 0) Sel = c; _ctx.RequestRebuild(); };rows.Children.Add(add);@@ -703,7 +705,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var nameTb = new TextBlock { Text = name, FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = sel ? IrAmberLit : IrTxt, TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center };var head = new DockPanel { LastChildFill = true, Children = { WithRight(ChainDelBtn(a, c)), WithRight(IrMono($"{devs} dev", IrMuted)), nameTb } };double db = a.ChainGain(c) <= 0.001 ? -60 : 20 * Math.Log10(a.ChainGain(c));- var dbT = IrMono(db <= -59 ? "−∞" : $"{db:+0.0;−0.0;0.0}", new SolidColorBrush(Color.Parse("#A39D8F")));+ var dbT = IrMono(db <= -59 ? "−∞" : $"{db:+0.0;−0.0;0.0}", NotaPalette.TextSecondary);var meterFill = new Border { Background = Success, HorizontalAlignment = HorizontalAlignment.Left, CornerRadius = new CornerRadius(1) };var meter = new Border { Height = 3, Background = IrInset, CornerRadius = new CornerRadius(1), Child = meterFill, VerticalAlignment = VerticalAlignment.Center };_irTick.Add(() => meterFill.Width = meter.Bounds.Width * Math.Clamp(a.ChainMeter(c), 0, 1));@@ -847,7 +849,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)MidiLearn.Bind(gSlot, MidiTarget.RackVolume(T, di), "Rack Volume");var gainRow = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 4, VerticalAlignment = VerticalAlignment.Center, Children = { IrCap("GAIN"), WithCol(gSlot, 1), WithCol(gainVal, 2) } };- var macroMap = new Border { BorderBrush = IrTeal, BorderThickness = new Thickness(1), Background = new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C)), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3), Cursor = new Cursor(StandardCursorType.Hand),+ var macroMap = new Border { BorderBrush = IrTeal, BorderThickness = new Thickness(1), Background = NotaPalette.Wash(NotaPalette.Teal, 0x24), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 3), Cursor = new Cursor(StandardCursorType.Hand),Child = new TextBlock { Text = "MACRO MAP", FontSize = 8, FontWeight = FontWeight.Bold, Foreground = IrTeal, HorizontalAlignment = HorizontalAlignment.Center, TextAlignment = TextAlignment.Center } };macroMap.PointerPressed += (_, _) => { _aeMacroMap = true; DeferRebuild(); };var pdc = AeRailToggle(E.RackDevPdc(T, di) ? "PDC ON" : "PDC OFF", E.RackDevPdc(T, di), () => { E.RackDevSetPdc(T, di, !E.RackDevPdc(T, di)); DeferRebuild(); });@@ -874,7 +876,7 @@ internal sealed class RackCardView(DeviceCardContext ctx){int iv = i; bool on = i == mode;var cell = new Border { Background = on ? IrAmber : Brushes.Transparent, CornerRadius = new CornerRadius(2), Cursor = new Cursor(StandardCursorType.Hand),- Child = new TextBlock { Text = names[i], FontSize = 8, FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal, Foreground = on ? new SolidColorBrush(Color.Parse("#171613")) : IrMuted, HorizontalAlignment = HorizontalAlignment.Center, TextAlignment = TextAlignment.Center, Padding = new Thickness(0, 1) } };+ Child = new TextBlock { Text = names[i], FontSize = 8, FontWeight = on ? FontWeight.SemiBold : FontWeight.Normal, Foreground = on ? NotaPalette.BgApp : IrMuted, HorizontalAlignment = HorizontalAlignment.Center, TextAlignment = TextAlignment.Center, Padding = new Thickness(0, 1) } };cell.PointerPressed += (_, _) => { E.RackDevSetMode(T, di, iv); DeferRebuild(); };Grid.SetColumn(cell, i); g.Children.Add(cell);}@@ -884,8 +886,8 @@ internal sealed class RackCardView(DeviceCardContext ctx)// A pill toggle (PDC): label on the left, switch on the right, fits the rail width.private Control AeRailToggle(string text, bool on, Action onClick){- var dot = new Border { Width = 18, Height = 10, CornerRadius = new CornerRadius(5), Background = on ? IrTeal : IrCard, BorderBrush = on ? Brushes.Transparent : new SolidColorBrush(Color.Parse("#3A362D")), BorderThickness = new Thickness(1), VerticalAlignment = VerticalAlignment.Center, [DockPanel.DockProperty] = Dock.Right,- Child = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = on ? new SolidColorBrush(Color.Parse("#171613")) : IrMuted, HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1.5, 0) } };+ var dot = new Border { Width = 18, Height = 10, CornerRadius = new CornerRadius(5), Background = on ? IrTeal : IrCard, BorderBrush = on ? Brushes.Transparent : NotaPalette.BorderStrong, BorderThickness = new Thickness(1), VerticalAlignment = VerticalAlignment.Center, [DockPanel.DockProperty] = Dock.Right,+ Child = new Border { Width = 6, Height = 6, CornerRadius = new CornerRadius(3), Background = on ? NotaPalette.BgApp : IrMuted, HorizontalAlignment = on ? HorizontalAlignment.Right : HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(1.5, 0) } };var b = new Border { Cursor = new Cursor(StandardCursorType.Hand), Background = Brushes.Transparent, Child = new DockPanel { LastChildFill = true, Children = { dot,new TextBlock { Text = text, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = on ? IrTeal : IrMuted, VerticalAlignment = VerticalAlignment.Center } } } };b.PointerPressed += (_, _) => onClick();@@ -899,7 +901,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var cols = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5 };int chains = a.ChainCount();for (int c = 0; c < chains; c++) cols.Children.Add(AeSeriesColumn(a, di, c));- var addCol = new Border { Width = 40, BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Cursor = new Cursor(StandardCursorType.Hand),+ var addCol = new Border { Width = 40, BorderBrush = NotaPalette.BorderStrong, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(6), Cursor = new Cursor(StandardCursorType.Hand),Child = new TextBlock { Text = "+", FontSize = 14, Foreground = IrMuted, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center } };addCol.PointerPressed += (_, _) => { int nc = a.AddChain(-1); if (nc >= 0) Sel = nc; DeferRebuild(); };cols.Children.Add(addCol);@@ -912,12 +914,12 @@ internal sealed class RackCardView(DeviceCardContext ctx){double db = a.ChainGain(c) <= 0.001 ? -60 : 20 * Math.Log10(a.ChainGain(c));var head = new DockPanel { LastChildFill = true, Children = {- WithRight(IrMono(db <= -59 ? "−∞" : $"{db:+0.0;−0.0;0.0}", new SolidColorBrush(Color.Parse("#A39D8F")))),+ WithRight(IrMono(db <= -59 ? "−∞" : $"{db:+0.0;−0.0;0.0}", NotaPalette.TextSecondary)),new TextBlock { Text = $"Chain {c + 1}", FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = IrTxt, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis } } };var stack = new StackPanel { Spacing = 4, Children = { head } };int dc = a.ChainDeviceCount(c);for (int d = 0; d < dc; d++) stack.Children.Add(AeSeriesDeviceRow(a, c, d));- var addDev = new Border { BorderBrush = new SolidColorBrush(Color.Parse("#3A362D")), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 2), Cursor = new Cursor(StandardCursorType.Hand), [DockPanel.DockProperty] = Dock.Bottom,+ var addDev = new Border { BorderBrush = NotaPalette.BorderStrong, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(4), Padding = new Thickness(0, 2), Cursor = new Cursor(StandardCursorType.Hand), [DockPanel.DockProperty] = Dock.Bottom,Child = new TextBlock { Text = "+ device", FontSize = 8, Foreground = IrMuted, HorizontalAlignment = HorizontalAlignment.Center } };addDev.PointerPressed += (_, _) => ShowAddDeviceMenu(a, c, addDev);DockPanel.SetDock(addDev, Dock.Bottom);@@ -958,7 +960,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)DockPanel.SetDock(header, Dock.Top); DockPanel.SetDock(strip, Dock.Top);var content = new DockPanel { LastChildFill = true, Children = { header, strip, bodyView } };if (_irTick.Count > 0) _ctx.AddDeviceRefresher(() => { for (int i = 0; i < _irTick.Count; i++) _irTick[i](); });- return new Border { Width = 700, Height = 260, Background = new SolidColorBrush(Color.Parse("#171613")), BorderBrush = IrBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), ClipToBounds = true, Child = content };+ return new Border { Width = 700, Height = 260, Background = NotaPalette.BgApp, BorderBrush = IrBorder, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(8), ClipToBounds = true, Child = content };}// ---- header (26): name · pad count · view toggle · meter ----@@ -1009,8 +1011,8 @@ internal sealed class RackCardView(DeviceCardContext ctx)private static Border DrumChip(string text, bool on, Action onClick){- var b = new Border { BorderThickness = new Thickness(1), BorderBrush = on ? IrTeal : new SolidColorBrush(Color.Parse("#3A362D")), Background = on ? new SolidColorBrush(Color.FromArgb(0x24, 0x5B, 0x9E, 0x9C)) : IrCard, CornerRadius = new CornerRadius(4), Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center,- Child = new TextBlock { Text = text, FontSize = 9, Foreground = on ? IrTeal : new SolidColorBrush(Color.Parse("#A39D8F")) } };+ var b = new Border { BorderThickness = new Thickness(1), BorderBrush = on ? IrTeal : NotaPalette.BorderStrong, Background = on ? NotaPalette.Wash(NotaPalette.Teal, 0x24) : IrCard, CornerRadius = new CornerRadius(4), Padding = new Thickness(8, 2), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center,+ Child = new TextBlock { Text = text, FontSize = 9, Foreground = on ? IrTeal : NotaPalette.TextSecondary } };b.PointerPressed += (_, e) => { e.Handled = true; onClick(); };return b;}@@ -1019,7 +1021,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)private static Control HSlider(double width, IBrush accent, Func<double> get, Action<double> set){var fill = new Border { Height = 3, Background = accent, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Width = width, Height = 9, Cursor = new Cursor(StandardCursorType.Hand), Background = Brushes.Transparent, Children = { new Border { Height = 3, Background = IrInset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center }, fill, handle } };void Vis(double v) { fill.Width = v * width; handle.Margin = new Thickness(Math.Clamp(v * width - 4, 0, Math.Max(0, width - 8)), 0, 0, 0); }bool drag = false;@@ -1064,7 +1066,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)string name = filled ? a.ChainInstrumentName(chain) : NoteName(note);var nameTb = new TextBlock { Text = name, FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = filled ? IrTxt : IrMuted, TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Top };- var noteTb = IrMono(NoteName(note), filled ? new SolidColorBrush(Color.Parse("#A39D8F")) : IrMuted, 7);+ var noteTb = IrMono(NoteName(note), filled ? NotaPalette.TextSecondary : IrMuted, 7);var chokeTb = IrMono(choke > 0 ? $"CH {choke}" : "", IrTeal, 7);var bottom = new DockPanel { LastChildFill = false, VerticalAlignment = VerticalAlignment.Bottom, Children = { noteTb, WithRight(chokeTb) } };var cell = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto"), Margin = new Thickness(5, 4) };@@ -1119,7 +1121,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)// ---- selected-pad detail panel ----private Control DrumSelectedPanel(IRackAccess a){- var panel = new Border { Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = IrBorder, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(9, 6) };+ var panel = new Border { Background = NotaPalette.SurfaceInset, BorderBrush = IrBorder, BorderThickness = new Thickness(1, 0, 0, 0), Padding = new Thickness(9, 6) };int chains = a.ChainCount();if (chains == 0 || Sel < 0 || Sel >= chains || a.ChainTriggerNote(Sel) < 0){@@ -1200,7 +1202,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var lbl = new TextBlock { Text = label, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = IrMuted, Width = 44, VerticalAlignment = VerticalAlignment.Center };var val = IrMono(disp(), IrTxt, 9); val.Width = 48; val.TextAlignment = TextAlignment.Right;var fill = new Border { Height = 3, Background = IrAmber, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 8, Height = 9, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var handle = new Border { Width = 8, Height = 9, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var slot = new Panel { Height = 9, Cursor = new Cursor(StandardCursorType.Hand), Background = Brushes.Transparent, Children = { new Border { Height = 3, Background = IrInset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center }, fill, handle } };void Vis(double v) { double W = slot.Bounds.Width; fill.Width = v * W; handle.Margin = new Thickness(Math.Clamp(v * W - 4, 0, Math.Max(0, W - 8)), 0, 0, 0); }bool drag = false;@@ -1225,7 +1227,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var head = new Grid { ColumnDefinitions = new ColumnDefinitions("96,26,*,40,44"), ColumnSpacing = 6, Height = 22, Margin = new Thickness(9, 0) };void H(string t, int col, IBrush? cc = null) { var x = new TextBlock { Text = t, FontSize = 8, FontWeight = FontWeight.Bold, Foreground = cc ?? IrMuted, VerticalAlignment = VerticalAlignment.Center }; Grid.SetColumn(x, col); head.Children.Add(x); }H("PAD", 0); H("NOTE", 1); H("VOLUME", 2); H("PAN", 3); H("M S CHK", 4);- var headBar = new Border { Height = 22, Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = IrBorder, BorderThickness = new Thickness(0, 0, 0, 1), Child = head };+ var headBar = new Border { Height = 22, Background = NotaPalette.SurfaceInset, BorderBrush = IrBorder, BorderThickness = new Thickness(0, 0, 0, 1), Child = head };var rows = new StackPanel { Spacing = 2 };foreach (int c in pads) rows.Children.Add(DrumMixerRow(a, c));@@ -1248,7 +1250,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var noteTb = IrMono(NoteName(note), IrMuted); Grid.SetColumn(noteTb, 1); g.Children.Add(noteTb);var fill = new Border { Height = 4, Background = IrAmber, Opacity = 0.75, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };- var handle = new Border { Width = 7, Height = 10, Background = new SolidColorBrush(Color.Parse("#A39D8F")), CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };+ var handle = new Border { Width = 7, Height = 10, Background = NotaPalette.TextSecondary, CornerRadius = new CornerRadius(2), HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Center };var vslot = new Panel { Height = 10, Cursor = new Cursor(StandardCursorType.Hand), Background = Brushes.Transparent, Children = { new Border { Height = 4, Background = IrInset, CornerRadius = new CornerRadius(2), VerticalAlignment = VerticalAlignment.Center }, fill, handle } };void Vis(double v) { double W = vslot.Bounds.Width; fill.Width = v * W; handle.Margin = new Thickness(Math.Clamp(v * W - 3, 0, Math.Max(0, W - 7)), 0, 0, 0); }bool drag = false;@@ -1260,7 +1262,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)MidiLearn.Bind(vslot, MidiTarget.RackChainGain(T, a.AutomationDeviceIndex, c), "Pad Volume");Grid.SetColumn(vslot, 2); g.Children.Add(vslot);- var panTb = IrMono(PanText(a.ChainPan(c)), new SolidColorBrush(Color.Parse("#A39D8F"))); panTb.TextAlignment = TextAlignment.Center; Grid.SetColumn(panTb, 3); g.Children.Add(panTb);+ var panTb = IrMono(PanText(a.ChainPan(c)), NotaPalette.TextSecondary); panTb.TextAlignment = TextAlignment.Center; Grid.SetColumn(panTb, 3); g.Children.Add(panTb);int choke = E.RackChainChoke(T, c);var padMute = IrMsBtn("M", a.ChainMute(c), IrRed, () => { a.SetChainMute(c, !a.ChainMute(c)); _ctx.RequestRebuild(); });@@ -1454,7 +1456,7 @@ internal sealed class RackCardView(DeviceCardContext ctx)var wrap = new WrapPanel { MaxWidth = 456 };for (int p = 0; p < count; p++) wrap.Children.Add(new Border { Width = 148, Margin = new Thickness(2, 3), Child = row(p) });var scroll = new ScrollViewer { Content = wrap, MaxHeight = 360, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled, VerticalScrollBarVisibility = ScrollBarVisibility.Auto };- return new Border { Width = 476, Background = new SolidColorBrush(Color.Parse("#171613")), Padding = new Thickness(10), Child =+ return new Border { Width = 476, Background = NotaPalette.BgApp, Padding = new Thickness(10), Child =new StackPanel { Spacing = 7, Children = { new TextBlock { Text = title, FontSize = 11, FontWeight = FontWeight.SemiBold, Foreground = TextPrimary }, scroll } } };}@@ -1967,8 +1969,8 @@ internal sealed class RackCardView(DeviceCardContext ctx)// a keyboard (or a 0..127 strip in velocity mode); drag a bar's ends to edit the range.internal sealed class RackZoneMap : Control{- private static readonly IBrush KeyWhite = new SolidColorBrush(Color.Parse("#2A2721"));- private static readonly IBrush KeyBlack = new SolidColorBrush(Color.Parse("#151310"));+ private static readonly IBrush KeyWhite = NotaPalette.MiniKeyWhite;+ private static readonly IBrush KeyBlack = NotaPalette.MiniKeyBlack;private readonly int[] _lo, _hi;private readonly IBrush[] _cols;private readonly int _sel;diff --git a/src/managed/Nota.App/DeviceCards/Sampler/SamplerWaveform.cs b/src/managed/Nota.App/DeviceCards/Sampler/SamplerWaveform.csindex 7f8cd062..12197a55 100644--- a/src/managed/Nota.App/DeviceCards/Sampler/SamplerWaveform.cs+++ b/src/managed/Nota.App/DeviceCards/Sampler/SamplerWaveform.cs@@ -16,14 +16,14 @@ internal sealed class SamplerWaveform : Control{private static readonly IBrush Bg = NotaPalette.BgSunken;private static readonly IBrush Wave = NotaPalette.Accent;- private static readonly IBrush WaveDim = new SolidColorBrush(Color.FromArgb(0x40, 0xD8, 0xA0, 0x3D));- private static readonly IBrush Outside = new SolidColorBrush(Color.FromArgb(0x80, 0x10, 0x0F, 0x0D));- private static readonly IBrush LoopFill = new SolidColorBrush(Color.FromArgb(0x14, 0xD8, 0xA0, 0x3D)); // brass wash- private static readonly IPen StartPen = new Pen(new SolidColorBrush(Color.Parse("#58B368")), 2); // start = green- private static readonly IPen EndPen = new Pen(new SolidColorBrush(Color.Parse("#D95F4C")), 2); // end = red- private static readonly IPen LoopPen = new Pen(new SolidColorBrush(Color.FromArgb(0xC8, 0xF0, 0xC0, 0x60)), 1.2);+ private static readonly IBrush WaveDim = NotaPalette.Wash(NotaPalette.Accent, 0x40);+ private static readonly IBrush Outside = NotaPalette.Wash(NotaPalette.BgSunken, 0x80);+ private static readonly IBrush LoopFill = NotaPalette.Wash(NotaPalette.Accent, 0x14); // brass wash+ private static readonly IPen StartPen = new Pen(NotaPalette.Success, 2); // start = green+ private static readonly IPen EndPen = new Pen(NotaPalette.Danger, 2); // end = red+ private static readonly IPen LoopPen = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0xC8), 1.2);private static readonly IPen MidLine = new Pen(NotaPalette.GridBar, 1);- private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(0x55, 0x3A, 0x36, 0x2D)), 1);+ private static readonly IPen GridPen = new Pen(NotaPalette.Wash(NotaPalette.BorderStrong, 0x55), 1);private static readonly IPen PlayPen = new Pen(NotaPalette.AccentBright, 1.4) { };private static readonly IBrush GridText = NotaPalette.TextTertiary;private static readonly Typeface Mono = new("monospace");diff --git a/src/managed/Nota.App/DeviceChainView.Shell.cs b/src/managed/Nota.App/DeviceChainView.Shell.csindex 361a17bb..2a9992b3 100644--- a/src/managed/Nota.App/DeviceChainView.Shell.cs+++ b/src/managed/Nota.App/DeviceChainView.Shell.cs@@ -25,9 +25,9 @@ namespace Nota.App;public sealed partial class DeviceChainView{- private static readonly IBrush ShellBg = new SolidColorBrush(Color.Parse("#171613"));- private static readonly IBrush ShellHdr = new SolidColorBrush(Color.Parse("#1E1C18"));- private static readonly IBrush ShellInset = new SolidColorBrush(Color.Parse("#100F0D"));+ private static readonly IBrush ShellBg = NotaPalette.BgApp;+ private static readonly IBrush ShellHdr = NotaPalette.SurfaceCard;+ private static readonly IBrush ShellInset = NotaPalette.BgSunken;// The three device chains the one shell serves — each has its own param / bypass /// reorder / preset API, branched on below.diff --git a/src/managed/Nota.App/DeviceChainView.cs b/src/managed/Nota.App/DeviceChainView.csindex 54f13a78..33f41d30 100644--- a/src/managed/Nota.App/DeviceChainView.cs+++ b/src/managed/Nota.App/DeviceChainView.cs@@ -66,7 +66,7 @@ public sealed partial class DeviceChainView : UserControlIsVisible = false, IsHitTestVisible = false,BorderThickness = new Thickness(2), CornerRadius = new CornerRadius(7),BorderBrush = NotaPalette.AccentBright,- Background = new SolidColorBrush(Color.FromArgb(0x14, 0xF0, 0xC0, 0x60)),+ Background = NotaPalette.Wash(NotaPalette.AccentBright, 0x14),Margin = new Thickness(2),};diff --git a/src/managed/Nota.App/EqCurve.cs b/src/managed/Nota.App/EqCurve.csindex e13ab5d0..b17a739f 100644--- a/src/managed/Nota.App/EqCurve.cs+++ b/src/managed/Nota.App/EqCurve.cs@@ -31,15 +31,15 @@ public sealed class EqCurve : Controlprivate const int FftN = 2048, Bins = FftN / 2;private static readonly IBrush Bg = NotaPalette.BgSunken;- private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.Parse("#232019")), 1);- private static readonly IPen GridPenFaint = new Pen(new SolidColorBrush(Color.FromArgb(0x60, 0x23, 0x20, 0x19)), 1);+ private static readonly IPen GridPen = new Pen(NotaPalette.WellGrid, 1);+ private static readonly IPen GridPenFaint = new Pen(NotaPalette.Wash(NotaPalette.WellGrid, 0x60), 1);private static readonly IPen ZeroPen = new Pen(NotaPalette.BorderStrong, 1);private static readonly IPen CurvePen = new Pen(NotaPalette.Accent, 1.6);- private static readonly IBrush CurveFill = new SolidColorBrush(Color.FromArgb(0x1E, 0xD8, 0xA0, 0x3D));- private static readonly IBrush SpecFill = new SolidColorBrush(Color.FromArgb(0x30, 0x8A, 0xA6, 0xC0));- private static readonly IPen SpecPen = new Pen(new SolidColorBrush(Color.FromArgb(0x70, 0x9C, 0xB4, 0xCC)), 1);+ private static readonly IBrush CurveFill = NotaPalette.Wash(NotaPalette.Accent, 0x1E);+ private static readonly IBrush SpecFill = NotaPalette.Wash(NotaPalette.Ink("#8AA6C0"), 0x30);+ private static readonly IPen SpecPen = new Pen(NotaPalette.Wash(NotaPalette.Ink("#9CB4CC"), 0x70), 1);private static readonly IBrush DotOn = NotaPalette.AccentBright;- private static readonly IBrush DotSel = new SolidColorBrush(Color.Parse("#FFFFFF"));+ private static readonly IBrush DotSel = NotaPalette.HandleSel;private static readonly IBrush DotRing = NotaPalette.BgSunken;private static readonly IBrush LabelDim = NotaPalette.TextTertiary;private static readonly IBrush LabelBright = NotaPalette.TextSecondary;diff --git a/src/managed/Nota.App/ExportWindow.cs b/src/managed/Nota.App/ExportWindow.csindex e71087c3..75212db0 100644--- a/src/managed/Nota.App/ExportWindow.cs+++ b/src/managed/Nota.App/ExportWindow.cs@@ -263,7 +263,7 @@ public sealed class ExportWindow : NotaWindownew TextBlock { Text = "· one file per track, post-fader", FontSize = 9, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center },},};- var headerBar = new Border { Height = 28, Background = new SolidColorBrush(Color.Parse("#1B1916")), BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1), Padding = new Thickness(10, 0), Cursor = new Cursor(StandardCursorType.Hand), Child = header };+ var headerBar = new Border { Height = 28, Background = NotaPalette.SurfaceInset, BorderBrush = BorderDef, BorderThickness = new Thickness(0, 0, 0, 1), Padding = new Thickness(10, 0), Cursor = new Cursor(StandardCursorType.Hand), Child = header };headerBar.PointerPressed += (_, _) => { _stems = !_stems; Paint(); };var box = new StackPanel { Children = { headerBar } };return new Border { BorderBrush = BorderDef, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(7), ClipToBounds = true, Child = box };diff --git a/src/managed/Nota.App/MainWindow.Detail.cs b/src/managed/Nota.App/MainWindow.Detail.csindex 1f11f8b6..50e35ec0 100644--- a/src/managed/Nota.App/MainWindow.Detail.cs+++ b/src/managed/Nota.App/MainWindow.Detail.cs@@ -53,7 +53,7 @@ public partial class MainWindowstring summary = string.Format(System.Globalization.CultureInfo.InvariantCulture, "· {0} · Monitor Auto · PDC {1:0.0} ms", type, ms);var dot = new Rectangle { Width = 8, Height = 8, RadiusX = 2, RadiusY = 2, Fill = new SolidColorBrush(TrackColor(trackId)), VerticalAlignment = VerticalAlignment.Center };- var nameText = new TextBlock { Text = name, FontSize = 11, FontWeight = FontWeight.SemiBold, Foreground = (IBrush?)this.FindResource("Brush.TextPrimary"), VerticalAlignment = VerticalAlignment.Center };+ var nameText = new TextBlock { Text = name, FontSize = 11, 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 } };}diff --git a/src/managed/Nota.App/MainWindow.DetailWindow.cs b/src/managed/Nota.App/MainWindow.DetailWindow.csindex 1c384ce8..d9961e36 100644--- a/src/managed/Nota.App/MainWindow.DetailWindow.cs+++ b/src/managed/Nota.App/MainWindow.DetailWindow.cs@@ -78,7 +78,7 @@ public partial class MainWindow{Text = "Select a clip in the arrangement to edit it here",FontSize = 12,- Foreground = Avalonia.Application.Current?.FindResource("Brush.TextTertiary") as IBrush,+ Foreground = NotaPalette.TextTertiary,HorizontalAlignment = HorizontalAlignment.Center,VerticalAlignment = VerticalAlignment.Center,},diff --git a/src/managed/Nota.App/MainWindow.Freeze.cs b/src/managed/Nota.App/MainWindow.Freeze.csindex dcfd9328..d2970e82 100644--- a/src/managed/Nota.App/MainWindow.Freeze.cs+++ b/src/managed/Nota.App/MainWindow.Freeze.cs@@ -53,7 +53,7 @@ public partial class MainWindowbool frozen = Engine.IsTrackFrozen(trackId);FreezeLabel.Text = frozen ? "Frozen" : "Freeze";- IBrush idle = (IBrush?)this.FindResource("Brush.TextSecondary") ?? Brushes.Gray;+ IBrush idle = NotaPalette.TextSecondary;FreezeIcon.Foreground = frozen ? IceBrush : idle;FreezeLabel.Foreground = frozen ? IceBrush : idle;EnsureFreezeMenu();@@ -202,7 +202,7 @@ public partial class MainWindow// Menu-icon glyphs matching the arrangement header badges (❄ / chain-link in ice blue)// and the Edit / Done / Discard header buttons.- private static readonly IBrush IceBrush = new SolidColorBrush(Color.Parse("#7FC7EC"));+ private static readonly IBrush IceBrush = NotaPalette.Frozen;private static Control SnowflakeIcon()=> new TextBlock { Text = "❄", FontSize = 12, Foreground = IceBrush, VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center };@@ -218,7 +218,7 @@ public partial class MainWindow=> new TextBlock{Text = glyph, FontSize = 12, VerticalAlignment = Avalonia.Layout.VerticalAlignment.Center,- Foreground = (IBrush?)this.FindResource(accent ? "Brush.AccentBright" : "Brush.TextTertiary") ?? Brushes.Gray,+ Foreground = accent ? NotaPalette.AccentBright : NotaPalette.TextTertiary,};// --- Flatten -----------------------------------------------------------diff --git a/src/managed/Nota.App/MainWindow.axaml.cs b/src/managed/Nota.App/MainWindow.axaml.csindex 7d498af8..00e30589 100644--- a/src/managed/Nota.App/MainWindow.axaml.cs+++ b/src/managed/Nota.App/MainWindow.axaml.cs@@ -190,9 +190,9 @@ public partial class MainWindow : Windowelse if (e.PropertyName == nameof(vm.Transport.TimeSigDenominator)) tsDen.Value = vm.Transport.TimeSigDenominator;};- var cpuGreen = (IBrush?)this.FindResource("Brush.Success");- var cpuAmber = (IBrush?)this.FindResource("Brush.Warning");- var cpuRed = (IBrush?)this.FindResource("Brush.Danger");+ var cpuGreen = (IBrush?)NotaPalette.Success;+ var cpuAmber = (IBrush?)NotaPalette.Warning;+ var cpuRed = (IBrush?)NotaPalette.Danger;vm.PlayheadUpdated += beats =>{_learn?.Tick(); // apply incoming MIDI mappings / capture a learn messagediff --git a/src/managed/Nota.App/MixerWindow.cs b/src/managed/Nota.App/MixerWindow.csindex d46c6b60..7fbcbaf5 100644--- a/src/managed/Nota.App/MixerWindow.cs+++ b/src/managed/Nota.App/MixerWindow.cs@@ -36,7 +36,7 @@ internal sealed class MixerWindow : NotaWindowMinWidth = 560;MinHeight = 280;WindowStartupLocation = WindowStartupLocation.CenterOwner;- Background = Avalonia.Application.Current?.FindResource("Brush.BgApp") is IBrush bg ? bg : Brushes.Black;+ Background = NotaPalette.BgApp;Host = new ContentControl { HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Stretch };SetBody(Host);diff --git a/src/managed/Nota.App/ModularView.cs b/src/managed/Nota.App/ModularView.csindex f06431d4..aab5b445 100644--- a/src/managed/Nota.App/ModularView.cs+++ b/src/managed/Nota.App/ModularView.cs@@ -30,15 +30,15 @@ namespace Nota.App;public sealed class ModularView : UserControl{// ---- palette --------------------------------------------------------- private static readonly IBrush CanvasBg = new SolidColorBrush(Color.Parse("#121110"));- private static readonly IBrush Dot = NotaPalette.SurfaceRaised; // #26231E- private static readonly IBrush Card = NotaPalette.SurfaceCard; // #1E1C18- private static readonly IBrush Sunken = NotaPalette.BgSunken; // #100F0D- private static readonly IBrush Rail = new SolidColorBrush(Color.Parse("#1B1916"));- private static readonly IBrush BorderDef = NotaPalette.BorderDefault; // #2C2923+ private static readonly IBrush CanvasBg = NotaPalette.CanvasBg;+ private static readonly IBrush Dot = NotaPalette.SurfaceRaised;+ private static readonly IBrush Card = NotaPalette.SurfaceCard;+ private static readonly IBrush Sunken = NotaPalette.BgSunken;+ private static readonly IBrush Rail = NotaPalette.SurfaceInset;+ private static readonly IBrush BorderDef = NotaPalette.BorderDefault;private static readonly IBrush BorderInner = NotaPalette.SurfaceRaised;- private static readonly IBrush BorderStrong = NotaPalette.BorderStrong; // #3A362D- private static readonly IBrush BorderHover = new SolidColorBrush(Color.Parse("#444038"));+ private static readonly IBrush BorderStrong = NotaPalette.BorderStrong;+ private static readonly IBrush BorderHover = NotaPalette.BorderHover;private static readonly IBrush Text1 = NotaPalette.TextPrimary;private static readonly IBrush Text2 = NotaPalette.TextSecondary;private static readonly IBrush Text3 = NotaPalette.TextTertiary;@@ -48,8 +48,8 @@ public sealed class ModularView : UserControlprivate static readonly IBrush OnAccent = NotaPalette.TextOnAccent;private static readonly IBrush Teal = NotaPalette.Teal; // modulation accentprivate static readonly IBrush Sage = NotaPalette.Sage; // audio- private static readonly IBrush Slate = new SolidColorBrush(Color.Parse("#6D8FB5")); // MIDI- private static readonly IBrush Mauve = new SolidColorBrush(Color.Parse("#9B7FA6")); // MIDI FX+ private static readonly IBrush Slate = NotaPalette.Ink("#6D8FB5"); // MIDI+ private static readonly IBrush Mauve = NotaPalette.Ink("#9B7FA6"); // MIDI FXprivate static readonly IBrush Success = NotaPalette.Success;private const double NodeW = 214;@@ -2282,7 +2282,7 @@ public sealed class ModularView : UserControl}}- private static readonly IBrush ScopeBg = new SolidColorBrush(Color.FromRgb(0x14, 0x12, 0x0d));+ private static readonly IBrush ScopeBg = NotaPalette.SurfaceDeep;private sealed class GridLayer : Control{@@ -2440,7 +2440,7 @@ public sealed class ModularView : UserControlpublic override void Render(DrawingContext ctx){if (_v._nodes.Count == 0) return;- var bg = new SolidColorBrush(Color.FromArgb(178, 0, 0, 0));+ var bg = NotaPalette.Wash(NotaPalette.BgSunken, 0xB2);ctx.DrawRectangle(bg, new Pen(BorderDef, 1), new Rect(0, 0, Width, Height), 5, 5);double minX = double.MaxValue, minY = double.MaxValue, maxX = double.MinValue, maxY = double.MinValue;@@ -2472,7 +2472,7 @@ public sealed class ModularView : UserControldouble wx1 = (vw - _v._pan.X) / _v._scale, wy1 = (vh - _v._pan.Y) / _v._scale;var a = M(wx0, wy0); var c = M(wx1, wy1);var rect = new Rect(a, c).Intersect(new Rect(0, 0, Width, Height));- ctx.DrawRectangle(null, new Pen(new SolidColorBrush(Color.FromArgb(102, 255, 255, 255)), 1), rect, 3, 3);+ ctx.DrawRectangle(null, new Pen(NotaPalette.Wash(NotaPalette.TextPrimary, 0x66), 1), rect, 3, 3);}}}diff --git a/src/managed/Nota.App/NotaWindow.cs b/src/managed/Nota.App/NotaWindow.csindex 05698e7d..d09bc174 100644--- a/src/managed/Nota.App/NotaWindow.cs+++ b/src/managed/Nota.App/NotaWindow.cs@@ -31,7 +31,7 @@ public abstract class NotaWindow : Windowprotected NotaWindow(){- Background = Res("Brush.BgApp") ?? Brushes.Black;+ Background = NotaPalette.BgApp;// Body + learn glass share the space below the title bar (glass on top).var bodyLayer = new Panel();diff --git a/src/managed/Nota.App/PianoRollView.cs b/src/managed/Nota.App/PianoRollView.csindex 095ba874..e8f992f5 100644--- a/src/managed/Nota.App/PianoRollView.cs+++ b/src/managed/Nota.App/PianoRollView.cs@@ -169,29 +169,29 @@ public sealed class PianoRollView : UserControlprivate static readonly IBrush Bg = NotaPalette.BgApp;private static readonly IBrush KeysBg = NotaPalette.BgSunken;- private static readonly IBrush VelBg = new SolidColorBrush(Color.Parse("#141311"));- private static readonly IBrush KeyWhite = new SolidColorBrush(Color.Parse("#B7B1A3"));- private static readonly IBrush KeyBlack = new SolidColorBrush(Color.Parse("#201E1A"));+ private static readonly IBrush VelBg = NotaPalette.GridRow;+ private static readonly IBrush KeyWhite = NotaPalette.KeyWhite;+ private static readonly IBrush KeyBlack = NotaPalette.KeyBlack;private static readonly IBrush RowBlackTint = new SolidColorBrush(Color.FromArgb(0x2E, 0x00, 0x00, 0x00));// Scale overlay: out-of-scale rows/keys get a translucent dark wash (they read// dimmed / semi-transparent), in-scale rows a faint accent, the root a stronger one.- private static readonly IBrush OutScaleWash = new SolidColorBrush(Color.FromArgb(0xB4, 0x12, 0x11, 0x0F));- private static readonly IBrush InScaleTint = new SolidColorBrush(Color.FromArgb(0x1E, 0xF0, 0xC0, 0x60));- private static readonly IBrush RootTint = new SolidColorBrush(Color.FromArgb(0x40, 0xF0, 0xC0, 0x60));+ private static readonly IBrush OutScaleWash = NotaPalette.Wash(NotaPalette.BgSunken, 0xB4);+ private static readonly IBrush InScaleTint = NotaPalette.Wash(NotaPalette.AccentBright, 0x1E);+ private static readonly IBrush RootTint = NotaPalette.Wash(NotaPalette.AccentBright, 0x40);private static readonly IPen PlayheadPen = new Pen(NotaPalette.AccentBright, 1.5);- private static readonly IBrush KeyHover = new SolidColorBrush(Color.FromArgb(0x66, 0xF0, 0xC0, 0x60));+ private static readonly IBrush KeyHover = NotaPalette.Wash(NotaPalette.AccentBright, 0x66);// Played-key highlight (currently-pressed keyboard / MIDI note): a solid key tint + a faint row wash.- private static readonly IBrush HeldKeyFill = new SolidColorBrush(Color.Parse("#F0C060"));- private static readonly IBrush HeldRowTint = new SolidColorBrush(Color.FromArgb(0x30, 0xF0, 0xC0, 0x60));+ private static readonly IBrush HeldKeyFill = NotaPalette.AccentBright;+ private static readonly IBrush HeldRowTint = NotaPalette.Wash(NotaPalette.AccentBright, 0x30);private static readonly IPen KeyLine = new Pen(NotaPalette.BgApp, 1);- private static readonly IPen RowLine = new Pen(new SolidColorBrush(Color.Parse("#141311")), 1);+ private static readonly IPen RowLine = new Pen(NotaPalette.GridRow, 1);private static readonly IPen BeatPen = new Pen(NotaPalette.GridBeat, 1);private static readonly IPen BarPen = new Pen(NotaPalette.GridBar, 1);- private static readonly IPen SubBeatPen = new Pen(new SolidColorBrush(Color.Parse("#191712")), 1); // sub-beat grid (finer than a beat)+ private static readonly IPen SubBeatPen = new Pen(NotaPalette.GridSubBeat, 1); // sub-beat grid (finer than a beat)private static readonly IBrush AccentBright = NotaPalette.AccentBright;- private static readonly IBrush EdgeHighlight = new SolidColorBrush(Color.Parse("#FCE5B8"));- private static readonly IBrush MarqueeFill = new SolidColorBrush(Color.FromArgb(0x28, 0xF0, 0xC0, 0x60));- private static readonly IPen MarqueePen = new Pen(new SolidColorBrush(Color.FromArgb(0xA0, 0xF0, 0xC0, 0x60)), 1);+ private static readonly IBrush EdgeHighlight = NotaPalette.AccentPale;+ private static readonly IBrush MarqueeFill = NotaPalette.Wash(NotaPalette.AccentBright, 0x28);+ private static readonly IPen MarqueePen = new Pen(NotaPalette.Wash(NotaPalette.AccentBright, 0xA0), 1);private static readonly IBrush LabelText = NotaPalette.TextTertiary;private static readonly IBrush KeyLabel = NotaPalette.BgSunken;private static readonly IBrush Divider = NotaPalette.BorderDefault;diff --git a/src/managed/Nota.App/PreferencesWindow.cs b/src/managed/Nota.App/PreferencesWindow.csindex 23fcce5d..8ceaca34 100644--- a/src/managed/Nota.App/PreferencesWindow.cs+++ b/src/managed/Nota.App/PreferencesWindow.cs@@ -6,13 +6,14 @@// Audio device / sample-rate / buffer are persisted natively (audio.json) and// applied by restarting the backend (MainWindowViewModel.ApplyAudioSettings);// toolbar side persists via SettingsViewModel; scan folders via the catalog.-// Test-tone / CPU-check and the Light theme are flagged (NaBadge) — not wired.+// Test-tone / CPU-check are flagged (NaBadge) — not wired.using System;using System.Collections.Generic;using System.Collections.ObjectModel;using Avalonia;using Avalonia.Controls;+using Avalonia.Controls.Primitives;using Avalonia.Controls.Shapes;using Avalonia.Input;using Avalonia.Input.Platform;@@ -29,7 +30,7 @@ namespace Nota.App;public sealed class PreferencesWindow : NotaWindow{private static readonly IBrush Panel = NotaPalette.SurfaceCard;- private static readonly IBrush Sidebar = new SolidColorBrush(Color.Parse("#1B1916"));+ private static readonly IBrush Sidebar = NotaPalette.SurfaceInset;private static readonly IBrush Sunken = NotaPalette.BgSunken;private static readonly IBrush Raised = NotaPalette.SurfaceRaised;private static readonly IBrush Divider = NotaPalette.BorderDefault;@@ -462,23 +463,51 @@ public sealed class PreferencesWindow : NotaWindow// ---- Appearance -------------------------------------------------------+ // Dark / Light / System as a segmented control. The choice applies immediately —+ // NotaThemeService re-tints the palette and repaints every open window — and is+ // persisted so the next launch starts in the same variant.+ private static Control ThemePicker()+ {+ var settings = App.Services.GetRequiredService<ISettingsService>();+ var strip = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };+ var buttons = new List<(AppTheme Mode, ToggleButton Btn)>();++ foreach (var (mode, label) in new[]+ {+ (AppTheme.Dark, "Ember Graphite"),+ (AppTheme.Light, "Ember Paper"),+ (AppTheme.System, "System"),+ })+ {+ var m = mode;+ var btn = new ToggleButton+ {+ Content = label, Classes = { "seg" },+ IsChecked = settings.Current.Theme == m,+ };+ btn.Click += (_, _) =>+ {+ // A segment can only be turned on: clicking the live one must not clear it.+ foreach (var (bm, b) in buttons) b.IsChecked = bm == m;+ if (settings.Current.Theme == m) return;+ settings.Current.Theme = m;+ settings.Save();+ NotaThemeService.Set(m);+ };+ buttons.Add((m, btn));+ strip.Children.Add(btn);+ }++ return new Border { Classes = { "segmented" }, Child = strip };+ }+private Control AppearancePane(){var body = new StackPanel { Spacing = 14 };body.Children.Add(SectionLabel("UI"));- var theme = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2, VerticalAlignment = VerticalAlignment.Center };- var pill = new Border { Background = Sunken, BorderBrush = Divider, BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(5), Padding = new Thickness(2) };- var inner = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };- inner.Children.Add(new Border { Background = Brass, CornerRadius = new CornerRadius(3), Padding = new Thickness(10, 1), Child = new TextBlock { Text = "Ember (dark)", FontSize = 10, FontWeight = FontWeight.SemiBold, Foreground = OnAccent } });- inner.Children.Add(new StackPanel- {- Orientation = Orientation.Horizontal, Spacing = 4, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0),- Children = { new TextBlock { Text = "Light", FontSize = 10, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center }, new NaBadge { Kind = NaBadgeKind.Future } },- });- pill.Child = inner;- theme.Children.Add(pill);- body.Children.Add(Row("Theme", theme));+ body.Children.Add(Row("Theme", ThemePicker()));+ body.Children.Add(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."));// ---- AI control (MCP server) ----body.Children.Add(DividerLine());diff --git a/src/managed/Nota.App/ProgressWindow.cs b/src/managed/Nota.App/ProgressWindow.csindex cab60163..c86b3003 100644--- a/src/managed/Nota.App/ProgressWindow.cs+++ b/src/managed/Nota.App/ProgressWindow.cs@@ -91,5 +91,5 @@ public sealed class ProgressWindow : NotaWindowfinally { win.Close(); await dialog; }}- private IBrush Brush(string key) => this.TryFindResource(key, out var v) && v is IBrush b ? b : Brushes.Gray;+ private static IBrush Brush(string key) => (IBrush?)NotaPalette.ByKey(key) ?? Brushes.Gray;}diff --git a/src/managed/Nota.App/SessionView.cs b/src/managed/Nota.App/SessionView.csindex 457e1783..8b9b96fe 100644--- a/src/managed/Nota.App/SessionView.cs+++ b/src/managed/Nota.App/SessionView.cs@@ -32,7 +32,7 @@ public sealed class SessionView : UserControlprivate const double Radius = 5;// Ember Graphite palette (static so cells can repaint without resource lookups).- private static readonly IBrush Lane = new SolidColorBrush(Color.Parse("#1B1916"));+ private static readonly IBrush Lane = NotaPalette.SurfaceInset;private static readonly IBrush Card = NotaPalette.SurfaceCard;private static readonly IBrush Raised = NotaPalette.SurfaceRaised;private static readonly IBrush Sunken = NotaPalette.BgSunken;@@ -40,7 +40,7 @@ public sealed class SessionView : UserControlprivate static readonly IBrush BorderStrong = NotaPalette.BorderStrong;private static readonly IBrush Success = NotaPalette.Success;private static readonly IBrush Warning = NotaPalette.Warning;- private static readonly IBrush Warning40 = new SolidColorBrush(Color.FromArgb(0x66, 0xD9, 0xC3, 0x4C)); // queued blink dim (HANDOFF §4)+ private static readonly IBrush Warning40 = NotaPalette.Wash(NotaPalette.Warning, 0x66); // queued blink dim (HANDOFF §4)private static readonly IBrush Danger = NotaPalette.Danger;private static readonly IBrush Brass = NotaPalette.Accent;private static readonly IBrush AccentBright = NotaPalette.AccentBright;@@ -49,9 +49,9 @@ public sealed class SessionView : UserControlprivate static readonly IBrush TextTertiary = NotaPalette.TextTertiary;private static readonly IBrush TextDisabled = NotaPalette.TextDisabled;private static readonly IBrush OnAccent = NotaPalette.TextOnAccent;- private static readonly IBrush GreenFill = new SolidColorBrush(Color.FromArgb(0x21, 0x58, 0xB3, 0x68));- private static readonly IBrush RedFill = new SolidColorBrush(Color.FromArgb(0x28, 0xD9, 0x5F, 0x4C));- private static readonly IBrush AmberFill = new SolidColorBrush(Color.FromArgb(0x1F, 0xD9, 0xC3, 0x4C));+ private static readonly IBrush GreenFill = NotaPalette.Wash(NotaPalette.Success, 0x21);+ private static readonly IBrush RedFill = NotaPalette.Wash(NotaPalette.Danger, 0x28);+ private static readonly IBrush AmberFill = NotaPalette.Wash(NotaPalette.Warning, 0x1F);// Track palette — mirrors ArrangementView.TrackBase (Brush.Track1..8 + Return A/B).private static readonly Color[] TrackBase = NotaPalette.TrackColors;@@ -294,7 +294,7 @@ public sealed class SessionView : UserControlprivate void AddTrackColumn(NotaTrackInfo ti, int scenes, int colorIndex){- var color = new SolidColorBrush(TrackBase[colorIndex]);+ var color = NotaPalette.TrackBrushes[colorIndex];_headerRow.Children.Add(ColumnHeader((ti.IsInstrument ? "Inst " : "Audio ") + ti.Id, color));var mid = new StackPanel { Width = ColW, Spacing = Gap };@@ -564,8 +564,9 @@ public sealed class SessionView : UserControlScene = scene;_instrument = instrument;_trackColor = trackColor;- var c = trackColor.Color;- _trackBorder = new SolidColorBrush(Color.FromArgb(0x73, c.R, c.G, c.B));+ _trackBorder = trackColor is SolidColorBrush slot+ ? NotaPalette.Wash(slot, 0x73)+ : new SolidColorBrush(Color.FromArgb(0x73, trackColor.Color.R, trackColor.Color.G, trackColor.Color.B));_icon = new TextBlock { FontSize = 10, VerticalAlignment = VerticalAlignment.Center };_label = new TextBlock { FontSize = 10, FontWeight = FontWeight.Medium, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis };diff --git a/src/managed/Nota.App/TagEditorWindow.cs b/src/managed/Nota.App/TagEditorWindow.csindex 951b1edd..b47b47c5 100644--- a/src/managed/Nota.App/TagEditorWindow.cs+++ b/src/managed/Nota.App/TagEditorWindow.cs@@ -20,7 +20,8 @@ namespace Nota.App;public sealed class TagEditorWindow : NotaWindow{- // A small, dark-friendly palette; the first entry is the brass brand accent.+ // The swatch choices offered for a new tag. These are stored with the tag, so they are+ // data, not tokens; NotaPalette.Ink() gives whatever is stored a light-theme counterpart.private static readonly string[] Palette ={"#C8A24B", "#E0554E", "#E08A3C", "#E0C24E", "#6FB86F",@@ -41,7 +42,7 @@ public sealed class TagEditorWindow : NotaWindowSizeToContent = SizeToContent.Height;CanResize = false;WindowStartupLocation = WindowStartupLocation.CenterOwner;- Background = this.TryFindResource("Brush.BgApp", out var bg) && bg is IBrush b ? b : Brushes.Magenta;+ Background = NotaPalette.BgApp;_rows = new StackPanel { Spacing = 8 };@@ -106,9 +107,9 @@ public sealed class TagEditorWindow : NotaWindowvar sw = new Border{Width = 16, Height = 16, CornerRadius = new CornerRadius(8),- Background = new SolidColorBrush(Color.Parse(c)),+ Background = NotaPalette.Ink(c),BorderThickness = new Thickness(sel ? 2 : 0),- BorderBrush = Brushes.White,+ BorderBrush = NotaPalette.HandleSel,Cursor = new Cursor(StandardCursorType.Hand),};sw.PointerPressed += (_, _) => { _lib.UpdateTag(tag.Id, tag.Title, c); RebuildRows(); };diff --git a/src/managed/Nota.App/TextPromptWindow.cs b/src/managed/Nota.App/TextPromptWindow.csindex 0b33a9fe..47559ce2 100644--- a/src/managed/Nota.App/TextPromptWindow.cs+++ b/src/managed/Nota.App/TextPromptWindow.cs@@ -23,7 +23,7 @@ public sealed class TextPromptWindow : NotaWindowSizeToContent = SizeToContent.Height;CanResize = false;WindowStartupLocation = WindowStartupLocation.CenterOwner;- Background = this.TryFindResource("Brush.BgApp", out var bg) && bg is IBrush b ? b : Brushes.Magenta;+ Background = NotaPalette.BgApp;_input = new TextBox { Text = initial, PlaceholderText = prompt };_input.KeyDown += (_, e) => { if (e.Key == Key.Enter) Accept(); else if (e.Key == Key.Escape) Close(null); };diff --git a/src/managed/Nota.App/Theme/NotaPalette.cs b/src/managed/Nota.App/Theme/NotaPalette.csindex 9d05e374..b57df3e8 100644--- a/src/managed/Nota.App/Theme/NotaPalette.cs+++ b/src/managed/Nota.App/Theme/NotaPalette.cs@@ -1,72 +1,321 @@// SPDX-License-Identifier: AGPL-3.0-only// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.//-// The single source of truth for palette brushes used by C# custom-drawn controls-// (Render overrides can't cheaply resolve a XAML StaticResource). Every value here-// MIRRORS a Brush.* key in Theme/NotaTheme.axaml — keep the two in sync. Views used-// to each re-declare these hex literals privately; they now alias into this class so-// a colour changes in exactly one place. File-specific tints (low-alpha washes,-// one-off grid shades) intentionally stay local to their view.+// The single source of truth for palette colours used by C# custom-drawn controls+// (Render overrides can't cheaply resolve a XAML DynamicResource). Every slot here+// MIRRORS a Brush.* key in Theme/NotaTheme.axaml — keep the two in sync.+//+// Themable by construction: a slot hands out one long-lived SolidColorBrush whose+// *Color* is re-pointed when the variant changes. Call sites (and the private static+// readonly fields that alias them all over the view layer) keep the same brush object,+// so switching Ember Graphite ↔ Ember Paper needs no rebuild — only a repaint, which+// NotaThemeService triggers. Never wrap a slot in `new SolidColorBrush(slot.Color)`:+// that snapshots the colour and freezes the view in one theme.+//+// Three ways to get a colour:+// • a named token — NotaPalette.SurfaceCard (explicit dark + light pair)+// • a tinted wash — NotaPalette.Wash(Accent, 0x24) (tracks its source slot)+// • a device hue — NotaPalette.Ink("#D06FB0") (identity hue of one visualiser;+// its light counterpart is derived, or pinned in InkOverrides)+using System;+using System.Collections.Generic;+using Avalonia;using Avalonia.Media;namespace Nota.App;+internal enum NotaThemeVariant { Dark, Light }+internal static class NotaPalette{- private static IBrush Hex(string hex) => new SolidColorBrush(Color.Parse(hex));-- // Surfaces (Brush.Bg* / Brush.Surface*)- public static readonly IBrush BgSunken = Hex("#100F0D"); // Brush.BgSunken / ChromeBg- public static readonly IBrush BgApp = Hex("#171613"); // Brush.BgApp- public static readonly IBrush LaneB = Hex("#191814"); // Brush.LaneB- public static readonly IBrush SurfaceCard = Hex("#1E1C18"); // Brush.SurfaceCard- public static readonly IBrush SurfaceRaised = Hex("#26231E");// Brush.SurfaceRaised- public static readonly IBrush SurfaceHover = Hex("#2E2B24"); // Brush.SurfaceHover- public static readonly IBrush SurfaceActive = Hex("#332F27");// Brush.SurfaceActive-- // Text (Brush.Text*)- public static readonly IBrush TextPrimary = Hex("#E9E4D8"); // Brush.TextPrimary- public static readonly IBrush TextSecondary = Hex("#A39D8F");// Brush.TextSecondary- public static readonly IBrush TextTertiary = Hex("#6E6A5E"); // Brush.TextTertiary- public static readonly IBrush TextDisabled = Hex("#4A463D"); // Brush.TextDisabled- public static readonly IBrush TextOnAccent = Hex("#171613"); // Brush.TextOnAccent-- // Borders (Brush.Border*)- public static readonly IBrush BorderDefault = Hex("#2C2923");// Brush.BorderDefault- public static readonly IBrush BorderStrong = Hex("#3A362D"); // Brush.BorderStrong-- // Grid lines (Brush.Grid*)- public static readonly IBrush GridBeat = Hex("#1F1D18"); // Brush.GridBeat- public static readonly IBrush GridBar = Hex("#2A2721"); // Brush.GridBar-- // Accent (Brush.Accent*)- public static readonly IBrush Accent = Hex("#D8A03D"); // Brush.Accent (brass)- public static readonly IBrush AccentHover = Hex("#E8B24C"); // Brush.AccentHover- public static readonly IBrush AccentBright = Hex("#F0C060"); // Brush.AccentBright- public static readonly IBrush AccentSubtle = new SolidColorBrush(Color.FromArgb(0x24, 0xD8, 0xA0, 0x3D)); // Brush.AccentSubtle-- // Status (Brush.Success / Warning / Danger)- public static readonly IBrush Success = Hex("#58B368"); // Brush.Success- public static readonly IBrush Warning = Hex("#D9C34C"); // Brush.Warning- public static readonly IBrush Danger = Hex("#D95F4C"); // Brush.Danger- public static readonly IBrush DangerHover = Hex("#E4715F"); // Brush.DangerHover-- // Track palette (Brush.Track*) — only the shades reused by custom-drawn views.- public static readonly IBrush Sage = Hex("#6FA383"); // Brush.Track4- public static readonly IBrush Teal = Hex("#5B9E9C"); // Brush.Track5 (modulation accent)-- // Raw Colors — for the few call sites that need a Color rather than an IBrush.- public static readonly Color AccentColor = Color.Parse("#D8A03D"); // Brush.Accent- public static readonly Color AccentBrightColor = Color.Parse("#F0C060"); // Brush.AccentBright- public static readonly Color SuccessColor = Color.Parse("#58B368"); // Brush.Success-- // The 8-track colour cycle (Brush.Track1..8) + the two return-bus tints. Views index- // these to colour clips/tracks; keep the order in sync with NotaTheme.axaml.- public static readonly Color[] TrackColors =+ // ---- slot machinery ---------------------------------------------------++ private sealed record Slot(Color Dark, Color Light, SolidColorBrush Brush);++ private static readonly List<Slot> Slots = new();+ private static readonly List<(SolidColorBrush Src, byte Alpha, SolidColorBrush Out)> Washes = new();+ private static readonly Dictionary<(SolidColorBrush, byte), SolidColorBrush> WashCache = new();+ private static readonly List<(SolidColorBrush[] Slots, LinearGradientBrush Out)> Gradients = new();+ private static readonly List<(Func<Color> Compute, SolidColorBrush Out)> Derivations = new();+ private static readonly Dictionary<string, SolidColorBrush> InkCache = new();++ /// <summary>The variant every slot currently holds.</summary>+ public static NotaThemeVariant Variant { get; private set; } = NotaThemeVariant.Dark;++ /// <summary>Raised after <see cref="Apply"/> has re-tinted every slot, so views can+ /// drop colour caches they derived themselves (per-index clip brushes, gradients…).</summary>+ public static event Action? Changed;++ // A named token: the Ember Graphite value and its Ember Paper counterpart.+ private static SolidColorBrush T(string dark, string light)+ {+ var d = Color.Parse(dark);+ var slot = new Slot(d, Color.Parse(light), new SolidColorBrush(Variant == NotaThemeVariant.Dark ? d : Color.Parse(light)));+ Slots.Add(slot);+ return slot.Brush;+ }++ /// <summary>Re-tint every slot for <paramref name="variant"/>. Brush objects are kept;+ /// only their Color changes, so every existing reference follows along.</summary>+ public static void Apply(NotaThemeVariant variant){- Color.Parse("#C4756A"), Color.Parse("#C99C55"), Color.Parse("#9BA65D"), Color.Parse("#6FA383"),- Color.Parse("#5B9E9C"), Color.Parse("#6D8FB5"), Color.Parse("#9B7FA6"), Color.Parse("#B57286"),+ Variant = variant;+ bool dark = variant == NotaThemeVariant.Dark;+ foreach (var s in Slots) s.Brush.Color = dark ? s.Dark : s.Light;+ foreach (var (src, alpha, outB) in Washes)+ {+ var c = src.Color;+ outB.Color = Color.FromArgb(alpha, c.R, c.G, c.B);+ }+ foreach (var (src, g) in Gradients)+ for (int i = 0; i < src.Length; i++) g.GradientStops[i].Color = src[i].Color;+ for (int i = 0; i < TrackSlots.Length; i++) TrackColors[i] = TrackSlots[i].Color;+ for (int i = 0; i < ReturnSlots.Length; i++) ReturnColors[i] = ReturnSlots[i].Color;+ // Derivations read the slots above, so they recompute last.+ foreach (var (compute, outB) in Derivations) outB.Color = compute();+ Changed?.Invoke();+ }++ /// <summary>A translucent tint of a palette slot. Shared per (slot, alpha) and+ /// re-tinted with its source, so washes follow the theme like any other token.</summary>+ public static SolidColorBrush Wash(SolidColorBrush src, byte alpha)+ {+ if (WashCache.TryGetValue((src, alpha), out var b)) return b;+ var c = src.Color;+ b = new SolidColorBrush(Color.FromArgb(alpha, c.R, c.G, c.B));+ WashCache[(src, alpha)] = b;+ Washes.Add((src, alpha, b));+ return b;+ }++ /// <summary>A brush whose colour is computed from other slots — a track hue mixed to a+ /// shade, an alpha-blended clip fill. Recomputed on a variant change, so the brush can be+ /// handed to a control that outlives one. Registration is permanent: cache the result per+ /// key (a palette index, say), never build one per repaint.</summary>+ public static SolidColorBrush Derived(Func<Color> compute)+ {+ var b = new SolidColorBrush(compute());+ Derivations.Add((compute, b));+ return b;+ }++ /// <summary>A top-to-bottom gradient over palette slots. A LinearGradientBrush snapshots+ /// its stop Colors, so unlike a fill it cannot ride a slot on its own — this registers it+ /// for re-tinting. Registration is permanent: only ever assign the result to a static+ /// field, never build one per control instance.</summary>+ public static LinearGradientBrush VGradient(params (SolidColorBrush Slot, double Offset)[] stops)+ {+ var g = new LinearGradientBrush+ {+ StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),+ EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative),+ };+ foreach (var (slot, off) in stops) g.GradientStops.Add(new GradientStop(slot.Color, off));+ Gradients.Add((Array.ConvertAll(stops, t => t.Slot), g));+ return g;+ }++ /// <summary>The identity hue of one visualiser or picker swatch — a colour that means+ /// "this band / this quadrant / this tag", not a role in the design system. Give the+ /// Ember Graphite value; the Ember Paper counterpart is derived (same hue, darkened so+ /// it reads on paper) unless <see cref="InkOverrides"/> pins one.</summary>+ public static SolidColorBrush Ink(string darkHex)+ {+ var key = darkHex.ToUpperInvariant();+ if (InkCache.TryGetValue(key, out var b)) return b;+ b = T(darkHex, InkOverrides.TryGetValue(key, out var pin) ? pin : DeriveLight(Color.Parse(darkHex)));+ InkCache[key] = b;+ return b;+ }++ /// <summary>The Color of an <see cref="Ink"/> hue, for the call sites that mix or+ /// interpolate rather than fill. Read it at draw time — it changes with the theme.</summary>+ public static Color InkColor(string darkHex) => Ink(darkHex).Color;++ // Ember Paper counterparts that the generic derivation gets wrong — a hue whose job+ // is to be *pale* on graphite (a highlight) or whose saturation collapses when darkened.+ private static readonly Dictionary<string, string> InkOverrides = new()+ {+ ["#8A8F98"] = "#5A6068", // tag "slate": derivation leaves it near-neutral mud+ ["#CDEEF8"] = "#0E5470", // resize-edge / bracket highlight: hottest ink on paper is darkest+ ["#12181B"] = "#DCE6E8", // BPM chip ground — a surface, so it lightens rather than darkens+ ["#1A2B31"] = "#C8DEE4", // …and its hot state};- public static readonly Color[] ReturnColors = { Color.Parse("#7C88A0"), Color.Parse("#A08A7C") }; // ReturnA, ReturnB++ // Same hue and saturation, lightness reflected onto the paper ground: the brighter a+ // hue reads on graphite, the darker it must read on paper to carry the same emphasis.+ private static string DeriveLight(Color c)+ {+ var (h, s, l) = ToHsl(c);+ double nl = Math.Clamp(73.3 - 0.545 * l, 18, 58);+ double ns = Math.Clamp(s * 1.12, 0, 100);+ var o = FromHsl(h, ns, nl);+ return $"#{o.R:X2}{o.G:X2}{o.B:X2}";+ }++ private static (double H, double S, double L) ToHsl(Color c)+ {+ double r = c.R / 255.0, g = c.G / 255.0, b = c.B / 255.0;+ double max = Math.Max(r, Math.Max(g, b)), min = Math.Min(r, Math.Min(g, b)), d = max - min;+ double l = (max + min) / 2, s = d == 0 ? 0 : d / (1 - Math.Abs(2 * l - 1));+ double h = d == 0 ? 0+ : max == r ? 60 * (((g - b) / d) % 6)+ : max == g ? 60 * ((b - r) / d + 2)+ : 60 * ((r - g) / d + 4);+ return ((h + 360) % 360, s * 100, l * 100);+ }++ private static Color FromHsl(double h, double s, double l)+ {+ s /= 100; l /= 100;+ double cc = (1 - Math.Abs(2 * l - 1)) * s, x = cc * (1 - Math.Abs(h / 60 % 2 - 1)), m = l - cc / 2;+ (double r, double g, double b) = h < 60 ? (cc, x, 0.0) : h < 120 ? (x, cc, 0.0) : h < 180 ? (0.0, cc, x)+ : h < 240 ? (0.0, x, cc) : h < 300 ? (x, 0.0, cc) : (cc, 0.0, x);+ return Color.FromRgb((byte)Math.Round((r + m) * 255), (byte)Math.Round((g + m) * 255), (byte)Math.Round((b + m) * 255));+ }++ // =======================================================================+ // Tokens. dark = "Ember Graphite" light = "Ember Paper"+ // =======================================================================++ // ---- Surfaces (both themes: the further forward, the lighter) ---------+ public static readonly SolidColorBrush SurfaceAbyss = T("#0A0908", "#DCD6C5"); // deepest well (meter troughs)+ public static readonly SolidColorBrush BgSunken = T("#100F0D", "#E4DFD1"); // Brush.BgSunken / ChromeBg+ public static readonly SolidColorBrush SurfaceDeep = T("#131210", "#E7E2D4"); // step-sequencer ground+ public static readonly SolidColorBrush CanvasBg = T("#121110", "#E9E5D8"); // modular canvas+ public static readonly SolidColorBrush BgApp = T("#171613", "#EFEADE"); // Brush.BgApp+ public static readonly SolidColorBrush LaneB = T("#191814", "#E9E4D6"); // Brush.LaneB (alternating lane)+ public static readonly SolidColorBrush SurfaceInset = T("#1B1916", "#E7E2D4"); // rail / sunken chip+ public static readonly SolidColorBrush SurfaceCard = T("#1E1C18", "#F8F5EC"); // Brush.SurfaceCard+ public static readonly SolidColorBrush SurfaceRaised = T("#26231E", "#FFFEF8"); // Brush.SurfaceRaised+ public static readonly SolidColorBrush SurfaceHover = T("#2E2B24", "#E7E1D0"); // Brush.SurfaceHover+ public static readonly SolidColorBrush SurfaceActive = T("#332F27", "#DBD4C0"); // Brush.SurfaceActive++ // ---- Grid + graph lines (kept under ~12% contrast against their lane) -+ public static readonly SolidColorBrush GridSubBeat = T("#191712", "#E5DFCE"); // finer than a beat+ public static readonly SolidColorBrush GridBeat = T("#1F1D18", "#DED8C8"); // Brush.GridBeat+ public static readonly SolidColorBrush GridRow = T("#141311", "#E6E1D2"); // piano-roll row divider+ public static readonly SolidColorBrush GridBar = T("#2A2721", "#CFC8B4"); // Brush.GridBar+ public static readonly SolidColorBrush GraphBorder = T("#221F1A", "#D5CFBE"); // inner border of a visualiser well+ public static readonly SolidColorBrush WellGrid = T("#232019", "#DDD7C6"); // grid drawn inside a well+ public static readonly SolidColorBrush PadGrid = T("#1C1A16", "#DED8C7"); // XY-pad grid++ // ---- Text (warm off-white on graphite, warm near-black on paper) ------+ public static readonly SolidColorBrush TextPrimary = T("#E9E4D8", "#241F17"); // Brush.TextPrimary+ public static readonly SolidColorBrush TextStrong = T("#C8C2B4", "#3E382C"); // between primary and secondary+ public static readonly SolidColorBrush TextSecondary = T("#A39D8F", "#5E5849"); // Brush.TextSecondary+ public static readonly SolidColorBrush TextTertiary = T("#6E6A5E", "#8A8474"); // Brush.TextTertiary+ public static readonly SolidColorBrush TextDisabled = T("#4A463D", "#ADA694"); // Brush.TextDisabled+ public static readonly SolidColorBrush TextOnAccent = T("#171613", "#FFFBF2"); // Brush.TextOnAccent++ // ---- Borders ----------------------------------------------------------+ public static readonly SolidColorBrush BorderDefault = T("#2C2923", "#D5CEBB"); // Brush.BorderDefault+ public static readonly SolidColorBrush BorderStrong = T("#3A362D", "#BDB5A0"); // Brush.BorderStrong+ public static readonly SolidColorBrush BorderHover = T("#444038", "#ADA48D");++ // ---- Accent (brass on graphite, bronze on paper: darker carries the+ // same emphasis against a light ground) ----------------------------+ public static readonly SolidColorBrush Accent = T("#D8A03D", "#A87415"); // Brush.Accent+ public static readonly SolidColorBrush AccentHover = T("#E8B24C", "#8F6110"); // Brush.AccentHover+ public static readonly SolidColorBrush AccentBright = T("#F0C060", "#744D07"); // Brush.AccentBright — hottest+ public static readonly SolidColorBrush AccentGlow = T("#F4CE7A", "#C08D22"); // gradient highlight+ public static readonly SolidColorBrush AccentDeep = T("#B8842E", "#7A5008"); // gradient shadow+ public static readonly SolidColorBrush AccentPale = T("#FCE5B8", "#5C3C04"); // hot edge highlight+ public static readonly SolidColorBrush AccentTint = T("#5A4C2E", "#CCAB63"); // accent-tinted fill / border+ public static readonly SolidColorBrush AccentSubtle = Wash(Accent, 0x24); // Brush.AccentSubtle++ // ---- Status -----------------------------------------------------------+ public static readonly SolidColorBrush Success = T("#58B368", "#2C7A3E"); // Brush.Success+ public static readonly SolidColorBrush Warning = T("#D9C34C", "#837010"); // Brush.Warning+ public static readonly SolidColorBrush Danger = T("#D95F4C", "#B03A28"); // Brush.Danger+ public static readonly SolidColorBrush DangerHover= T("#E4715F", "#C64A36"); // Brush.DangerHover+ public static readonly SolidColorBrush DangerDeep = T("#C55A47", "#9C3221"); // over-threshold fill+ public static readonly SolidColorBrush DangerPale = T("#F0928A", "#8E2416"); // live-take waveform / label++ // ---- Data + modulation ------------------------------------------------+ public static readonly SolidColorBrush Teal = T("#5B9E9C", "#2F7472"); // Brush.Track5 — modulation accent+ public static readonly SolidColorBrush TealBright = T("#7FC9C6", "#3D9491");+ public static readonly SolidColorBrush Sage = T("#6FA383", "#42765A"); // Brush.Track4 — audio+ public static readonly SolidColorBrush Threshold = T("#C9884F", "#8A5218"); // threshold markers+ public static readonly SolidColorBrush Marker = T("#7FCCE1", "#1B6E8C"); // clip markers / brackets+ public static readonly SolidColorBrush MarkerHot = T("#CDEEF8", "#0E5470"); // resize-edge affordance+ public static readonly SolidColorBrush Frozen = T("#7FC7EC", "#1C6E96"); // frozen-track ice+ public static readonly SolidColorBrush SignalIn = T("#52604F", "#6E7C68"); // ghost "input" trace label+ public static readonly SolidColorBrush SignalInFill = T("#3E4A3C", "#D3DCCF");+ public static readonly SolidColorBrush HandleSel = T("#FFFFFF", "#1E1A14"); // selected graph handle++ // ---- Tinted chrome ----------------------------------------------------+ public static readonly SolidColorBrush SelHeaderBg = T("#332C1E", "#EFE4C6"); // selected track header+ public static readonly SolidColorBrush FrozenHeaderBg = T("#1B2A33", "#D8E8F0"); // frozen track header+ public static readonly SolidColorBrush MuteTint = T("#3A2320", "#F0D9D3"); // muted band+ public static readonly SolidColorBrush Veil = T("#121418", "#F2EFE6"); // deactivated-clip scrim base+ public static readonly SolidColorBrush TooltipBg = T("#18181E", "#2A251C"); // tooltips stay a dark pill+ public static readonly SolidColorBrush TooltipText = T("#F0E4C8", "#F5EEDC");++ // ---- Piano keys (literal keys: white stays light, black stays dark) ---+ public static readonly SolidColorBrush KeyWhite = T("#B7B1A3", "#FFFCF2");+ public static readonly SolidColorBrush KeyBlack = T("#201E1A", "#3A352B");+ public static readonly SolidColorBrush MiniKeyWhite = T("#2A2721", "#F5F1E4"); // device-card mini keyboards+ public static readonly SolidColorBrush MiniKeyBlack = T("#151310", "#38332A");++ // ---- Track-shade mix targets (TrackColorForIndex) ---------------------+ public static readonly SolidColorBrush ShadeUp = T("#FFFFFF", "#FFFCF2"); // "lighter" shade+ public static readonly SolidColorBrush ShadeDown = T("#141210", "#3A3227"); // "darker" shade++ // ---- Track palette (Brush.Track1..8) + return buses --------------------+ private static readonly SolidColorBrush[] TrackSlots =+ {+ T("#C4756A", "#9A4A3E"), // rust+ T("#C99C55", "#97682A"), // amber+ T("#9BA65D", "#646E32"), // olive+ T("#6FA383", "#42765A"), // sage+ T("#5B9E9C", "#2F7472"), // teal+ T("#6D8FB5", "#3E6288"), // slate+ T("#9B7FA6", "#6A5176"), // mauve+ T("#B57286", "#86465B"), // rose+ };+ private static readonly SolidColorBrush[] ReturnSlots = { T("#7C88A0", "#4D5972"), T("#A08A7C", "#705B4E") };++ /// <summary>Brush form of the 8-track cycle — index it for fills that follow the theme.</summary>+ public static readonly SolidColorBrush[] TrackBrushes = TrackSlots;+ public static readonly SolidColorBrush[] ReturnBrushes = ReturnSlots;++ /// <summary>The 8-track colour cycle + the two return-bus tints, as Colors for the views+ /// that mix or alpha-blend them. Rewritten in place by <see cref="Apply"/> — read at draw+ /// time (the array reference is stable, its contents are not).</summary>+ public static readonly Color[] TrackColors = { TrackSlots[0].Color, TrackSlots[1].Color, TrackSlots[2].Color, TrackSlots[3].Color, TrackSlots[4].Color, TrackSlots[5].Color, TrackSlots[6].Color, TrackSlots[7].Color };+ public static readonly Color[] ReturnColors = { ReturnSlots[0].Color, ReturnSlots[1].Color };++ // ---- Lookup by XAML key ------------------------------------------------++ // Code-built views that read a token by its XAML key resolve it here instead of+ // through TryFindResource: a resource read is a one-time snapshot, while the slot+ // brush follows the variant. (Bind-style reads — ControlExtensions.BindResource —+ // are already live and should keep using the resource observable.)+ private static readonly Dictionary<string, SolidColorBrush> KeyMap = new(StringComparer.OrdinalIgnoreCase)+ {+ ["Brush.BgSunken"] = BgSunken, ["Brush.ChromeBg"] = BgSunken,+ ["Brush.BgApp"] = BgApp, ["Brush.LaneB"] = LaneB,+ ["Brush.SurfaceCard"] = SurfaceCard, ["Brush.SurfaceRaised"] = SurfaceRaised,+ ["Brush.SurfaceHover"] = SurfaceHover, ["Brush.SurfaceActive"] = SurfaceActive,+ ["Brush.GridBeat"] = GridBeat, ["Brush.GridBar"] = GridBar,+ ["Brush.TextPrimary"] = TextPrimary, ["Brush.TextSecondary"] = TextSecondary,+ ["Brush.TextTertiary"] = TextTertiary, ["Brush.TextDisabled"] = TextDisabled,+ ["Brush.TextOnAccent"] = TextOnAccent,+ ["Brush.BorderDefault"] = BorderDefault, ["Brush.BorderStrong"] = BorderStrong,+ ["Brush.Accent"] = Accent, ["Brush.AccentHover"] = AccentHover,+ ["Brush.AccentBright"] = AccentBright, ["Brush.AccentSubtle"] = AccentSubtle,+ ["Brush.Success"] = Success, ["Brush.Warning"] = Warning,+ ["Brush.Danger"] = Danger, ["Brush.DangerHover"] = DangerHover,+ };++ /// <summary>The slot behind a <c>Brush.*</c> XAML key, or null if the key is unknown.</summary>+ public static SolidColorBrush? ByKey(string key) => KeyMap.GetValueOrDefault(key);++ // ---- Raw Colors — properties, never cached: they move with the theme --+ public static Color AccentColor => Accent.Color;+ public static Color AccentBrightColor => AccentBright.Color;+ public static Color SuccessColor => Success.Color;+ public static Color TealColor => Teal.Color;}diff --git a/src/managed/Nota.App/Theme/NotaTheme.axaml b/src/managed/Nota.App/Theme/NotaTheme.axamlindex b590f741..399fbc73 100644--- a/src/managed/Nota.App/Theme/NotaTheme.axaml+++ b/src/managed/Nota.App/Theme/NotaTheme.axaml@@ -1,9 +1,9 @@<!-- SPDX-License-Identifier: AGPL-3.0-only --><!--- Nota design tokens + control styles. Dark-first adaptation of the Lumenics- desktop design system (see .claude/skills/nota-design). This file is the- concrete source of truth for colors/geometry — views reference these keys,- never hardcoded values.+ Nota design tokens + control styles. Adaptation of the Lumenics desktop design+ system (see .claude/skills/nota-design), in two variants: "Ember Graphite" (dark,+ the default) and "Ember Paper" (light). This file is the concrete source of truth+ for colors/geometry — views reference these keys, never hardcoded values.--><Styles xmlns="https://github.com/avaloniaui"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"@@ -15,68 +15,6 @@<FontFamily x:Key="Font.UI">avares://Avalonia.Fonts.Inter/Assets#Inter</FontFamily><FontFamily x:Key="Font.Mono">Cascadia Code,Menlo,Consolas,monospace</FontFamily>- <!-- ===== "Ember Graphite" palette (warm graphite, hue ~40°, brass accent).- HANDOFF §1. Views reference these keys, never hardcoded values. ===== -->-- <!-- Surfaces -->- <SolidColorBrush x:Key="Brush.BgSunken">#100F0D</SolidColorBrush>- <SolidColorBrush x:Key="Brush.BgApp">#171613</SolidColorBrush>- <SolidColorBrush x:Key="Brush.LaneB">#191814</SolidColorBrush>- <SolidColorBrush x:Key="Brush.SurfaceCard">#1E1C18</SolidColorBrush>- <SolidColorBrush x:Key="Brush.SurfaceRaised">#26231E</SolidColorBrush>- <SolidColorBrush x:Key="Brush.SurfaceHover">#2E2B24</SolidColorBrush>- <SolidColorBrush x:Key="Brush.SurfaceActive">#332F27</SolidColorBrush>- <SolidColorBrush x:Key="Brush.SurfaceSelected">#24D8A03D</SolidColorBrush>- <SolidColorBrush x:Key="Brush.ChromeBg">#100F0D</SolidColorBrush>-- <!-- Grid lines (drawn by custom views) — keep < 12% contrast vs lanes -->- <SolidColorBrush x:Key="Brush.GridBeat">#1F1D18</SolidColorBrush>- <SolidColorBrush x:Key="Brush.GridBar">#2A2721</SolidColorBrush>-- <!-- Text (warm off-white) -->- <SolidColorBrush x:Key="Brush.TextPrimary">#E9E4D8</SolidColorBrush>- <SolidColorBrush x:Key="Brush.TextSecondary">#A39D8F</SolidColorBrush>- <SolidColorBrush x:Key="Brush.TextTertiary">#6E6A5E</SolidColorBrush>- <SolidColorBrush x:Key="Brush.TextDisabled">#4A463D</SolidColorBrush>- <SolidColorBrush x:Key="Brush.TextOnAccent">#171613</SolidColorBrush>-- <!-- Borders -->- <SolidColorBrush x:Key="Brush.BorderDefault">#2C2923</SolidColorBrush>- <SolidColorBrush x:Key="Brush.BorderStrong">#3A362D</SolidColorBrush>-- <!-- Accent (brass) + semantic -->- <SolidColorBrush x:Key="Brush.Accent">#D8A03D</SolidColorBrush>- <SolidColorBrush x:Key="Brush.AccentHover">#E8B24C</SolidColorBrush>- <SolidColorBrush x:Key="Brush.AccentBright">#F0C060</SolidColorBrush>- <SolidColorBrush x:Key="Brush.AccentSubtle">#24D8A03D</SolidColorBrush>- <SolidColorBrush x:Key="Brush.Success">#58B368</SolidColorBrush>- <SolidColorBrush x:Key="Brush.Warning">#D9C34C</SolidColorBrush>- <SolidColorBrush x:Key="Brush.Danger">#D95F4C</SolidColorBrush>- <SolidColorBrush x:Key="Brush.DangerHover">#E4715F</SolidColorBrush>-- <!-- Retint Fluent's built-in accent (slider fills, checkboxes, focus) to- brass so stock controls match the palette instead of the default blue. -->- <Color x:Key="SystemAccentColor">#D8A03D</Color>- <Color x:Key="SystemAccentColorLight1">#DEAB52</Color>- <Color x:Key="SystemAccentColorLight2">#E4B667</Color>- <Color x:Key="SystemAccentColorLight3">#EAC17C</Color>- <Color x:Key="SystemAccentColorDark1">#C2902F</Color>- <Color x:Key="SystemAccentColorDark2">#A87C28</Color>- <Color x:Key="SystemAccentColorDark3">#8E6820</Color>-- <!-- Track palette (8, assigned round-robin), returns, master -->- <SolidColorBrush x:Key="Brush.Track1">#C4756A</SolidColorBrush> <!-- rust -->- <SolidColorBrush x:Key="Brush.Track2">#C99C55</SolidColorBrush> <!-- amber -->- <SolidColorBrush x:Key="Brush.Track3">#9BA65D</SolidColorBrush> <!-- olive -->- <SolidColorBrush x:Key="Brush.Track4">#6FA383</SolidColorBrush> <!-- sage -->- <SolidColorBrush x:Key="Brush.Track5">#5B9E9C</SolidColorBrush> <!-- teal -->- <SolidColorBrush x:Key="Brush.Track6">#6D8FB5</SolidColorBrush> <!-- slate -->- <SolidColorBrush x:Key="Brush.Track7">#9B7FA6</SolidColorBrush> <!-- mauve -->- <SolidColorBrush x:Key="Brush.Track8">#B57286</SolidColorBrush> <!-- rose -->- <SolidColorBrush x:Key="Brush.ReturnA">#7C88A0</SolidColorBrush>- <SolidColorBrush x:Key="Brush.ReturnB">#A08A7C</SolidColorBrush>- <SolidColorBrush x:Key="Brush.Master">#D8A03D</SolidColorBrush>-<!-- Geometry: radii (control/card/panel/xl/clip/pill) --><CornerRadius x:Key="Radius.Sm">5</CornerRadius><CornerRadius x:Key="Radius.Md">7</CornerRadius>@@ -89,6 +27,142 @@<sys:Double x:Key="Control.Sm">22</sys:Double><sys:Double x:Key="Control.Md">26</sys:Double><sys:Double x:Key="Control.Lg">28</sys:Double>++ <!-- ===== Palette =========================================================+ Two variants of one system. "Ember Graphite" (dark) is the default: warm+ graphite, hue ~40°, brass accent. "Ember Paper" (light) keeps the hue and+ the roles and reflects the lightness ramp — brass darkens to bronze so a+ mark carries the same emphasis against paper that it carried against+ graphite. Every value here MIRRORS a slot in Theme/NotaPalette.cs, which+ serves the custom-drawn layer; the two files must be edited together.++ These live in ThemeDictionaries, so views must reach them with+ {DynamicResource Brush.*} — a StaticResource cannot follow the variant. -->+ <ResourceDictionary.ThemeDictionaries>++ <ResourceDictionary x:Key="Dark">+ <!-- Surfaces -->+ <SolidColorBrush x:Key="Brush.BgSunken">#100F0D</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.BgApp">#171613</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.LaneB">#191814</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceCard">#1E1C18</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceRaised">#26231E</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceHover">#2E2B24</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceActive">#332F27</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceSelected">#24D8A03D</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.ChromeBg">#100F0D</SolidColorBrush>++ <!-- Grid lines (drawn by custom views) — keep < 12% contrast vs lanes -->+ <SolidColorBrush x:Key="Brush.GridBeat">#1F1D18</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.GridBar">#2A2721</SolidColorBrush>++ <!-- Text (warm off-white) -->+ <SolidColorBrush x:Key="Brush.TextPrimary">#E9E4D8</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextSecondary">#A39D8F</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextTertiary">#6E6A5E</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextDisabled">#4A463D</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextOnAccent">#171613</SolidColorBrush>++ <!-- Borders -->+ <SolidColorBrush x:Key="Brush.BorderDefault">#2C2923</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.BorderStrong">#3A362D</SolidColorBrush>++ <!-- Accent (brass) + semantic -->+ <SolidColorBrush x:Key="Brush.Accent">#D8A03D</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.AccentHover">#E8B24C</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.AccentBright">#F0C060</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.AccentSubtle">#24D8A03D</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Success">#58B368</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Warning">#D9C34C</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Danger">#D95F4C</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.DangerHover">#E4715F</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.DangerSubtle">#33D95F4C</SolidColorBrush>++ <!-- Retint Fluent's built-in accent (slider fills, checkboxes, focus) to+ brass so stock controls match the palette instead of the default blue. -->+ <Color x:Key="SystemAccentColor">#D8A03D</Color>+ <Color x:Key="SystemAccentColorLight1">#DEAB52</Color>+ <Color x:Key="SystemAccentColorLight2">#E4B667</Color>+ <Color x:Key="SystemAccentColorLight3">#EAC17C</Color>+ <Color x:Key="SystemAccentColorDark1">#C2902F</Color>+ <Color x:Key="SystemAccentColorDark2">#A87C28</Color>+ <Color x:Key="SystemAccentColorDark3">#8E6820</Color>++ <!-- Track palette (8, assigned round-robin), returns, master -->+ <SolidColorBrush x:Key="Brush.Track1">#C4756A</SolidColorBrush> <!-- rust -->+ <SolidColorBrush x:Key="Brush.Track2">#C99C55</SolidColorBrush> <!-- amber -->+ <SolidColorBrush x:Key="Brush.Track3">#9BA65D</SolidColorBrush> <!-- olive -->+ <SolidColorBrush x:Key="Brush.Track4">#6FA383</SolidColorBrush> <!-- sage -->+ <SolidColorBrush x:Key="Brush.Track5">#5B9E9C</SolidColorBrush> <!-- teal -->+ <SolidColorBrush x:Key="Brush.Track6">#6D8FB5</SolidColorBrush> <!-- slate -->+ <SolidColorBrush x:Key="Brush.Track7">#9B7FA6</SolidColorBrush> <!-- mauve -->+ <SolidColorBrush x:Key="Brush.Track8">#B57286</SolidColorBrush> <!-- rose -->+ <SolidColorBrush x:Key="Brush.ReturnA">#7C88A0</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.ReturnB">#A08A7C</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Master">#D8A03D</SolidColorBrush>+ </ResourceDictionary>++ <ResourceDictionary x:Key="Light">+ <!-- Surfaces (warm paper; forward still means lighter, wells go darker) -->+ <SolidColorBrush x:Key="Brush.BgSunken">#E4DFD1</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.BgApp">#EFEADE</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.LaneB">#E9E4D6</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceCard">#F8F5EC</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceRaised">#FFFEF8</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceHover">#E7E1D0</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceActive">#DBD4C0</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.SurfaceSelected">#2EA87415</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.ChromeBg">#E4DFD1</SolidColorBrush>++ <!-- Grid lines — same job, now slightly darker than the lane they sit on -->+ <SolidColorBrush x:Key="Brush.GridBeat">#DED8C8</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.GridBar">#CFC8B4</SolidColorBrush>++ <!-- Text (warm near-black) -->+ <SolidColorBrush x:Key="Brush.TextPrimary">#241F17</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextSecondary">#5E5849</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextTertiary">#8A8474</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextDisabled">#ADA694</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.TextOnAccent">#FFFBF2</SolidColorBrush>++ <!-- Borders -->+ <SolidColorBrush x:Key="Brush.BorderDefault">#D5CEBB</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.BorderStrong">#BDB5A0</SolidColorBrush>++ <!-- Accent (bronze — brass darkened to hold its emphasis on paper) -->+ <SolidColorBrush x:Key="Brush.Accent">#A87415</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.AccentHover">#8F6110</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.AccentBright">#744D07</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.AccentSubtle">#24A87415</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Success">#2C7A3E</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Warning">#837010</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Danger">#B03A28</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.DangerHover">#C64A36</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.DangerSubtle">#33B03A28</SolidColorBrush>++ <Color x:Key="SystemAccentColor">#A87415</Color>+ <Color x:Key="SystemAccentColorLight1">#B98219</Color>+ <Color x:Key="SystemAccentColorLight2">#CA901D</Color>+ <Color x:Key="SystemAccentColorLight3">#DB9E22</Color>+ <Color x:Key="SystemAccentColorDark1">#966611</Color>+ <Color x:Key="SystemAccentColorDark2">#83590E</Color>+ <Color x:Key="SystemAccentColorDark3">#6F4B0B</Color>++ <!-- Track palette — same eight hues, darkened so a clip's content reads on paper -->+ <SolidColorBrush x:Key="Brush.Track1">#9A4A3E</SolidColorBrush> <!-- rust -->+ <SolidColorBrush x:Key="Brush.Track2">#97682A</SolidColorBrush> <!-- amber -->+ <SolidColorBrush x:Key="Brush.Track3">#646E32</SolidColorBrush> <!-- olive -->+ <SolidColorBrush x:Key="Brush.Track4">#42765A</SolidColorBrush> <!-- sage -->+ <SolidColorBrush x:Key="Brush.Track5">#2F7472</SolidColorBrush> <!-- teal -->+ <SolidColorBrush x:Key="Brush.Track6">#3E6288</SolidColorBrush> <!-- slate -->+ <SolidColorBrush x:Key="Brush.Track7">#6A5176</SolidColorBrush> <!-- mauve -->+ <SolidColorBrush x:Key="Brush.Track8">#86465B</SolidColorBrush> <!-- rose -->+ <SolidColorBrush x:Key="Brush.ReturnA">#4D5972</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.ReturnB">#705B4E</SolidColorBrush>+ <SolidColorBrush x:Key="Brush.Master">#A87415</SolidColorBrush>+ </ResourceDictionary>++ </ResourceDictionary.ThemeDictionaries></ResourceDictionary></Styles.Resources>@@ -199,7 +273,7 @@</Style><!-- Record engaged: translucent danger box, red glyph stays visible --><Style Selector="ToggleButton.tp-icon:checked /template/ ContentPresenter#PART_ContentPresenter">- <Setter Property="Background" Value="#33D95F4C"/>+ <Setter Property="Background" Value="{DynamicResource Brush.DangerSubtle}"/><Setter Property="BorderBrush" Value="{DynamicResource Brush.Danger}"/></Style><Style Selector="Button.tp-play">diff --git a/src/managed/Nota.App/Theme/NotaThemeService.cs b/src/managed/Nota.App/Theme/NotaThemeService.csnew file mode 100644index 00000000..a0552963--- /dev/null+++ b/src/managed/Nota.App/Theme/NotaThemeService.cs@@ -0,0 +1,80 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.+//+// Owns which palette variant the app is wearing. Two layers have to agree:+//+// • XAML — Application.RequestedThemeVariant picks the Light/Dark branch of the+// ThemeDictionaries in NotaTheme.axaml (and of FluentTheme's own resources),+// and every {DynamicResource Brush.*} re-resolves on its own.+// • C# — NotaPalette.Apply() re-tints the shared brush objects that the+// custom-drawn layer holds. Those changes don't reach a Render() override+// that never subscribed to the brush, so we force a repaint of every window.+//+// "System" is expressed as ThemeVariant.Default: Avalonia resolves it from the OS and+// raises ActualThemeVariantChanged when the OS flips, which is the single place the+// managed palette follows from.++using System;+using Avalonia;+using Avalonia.Controls;+using Avalonia.Controls.ApplicationLifetimes;+using Avalonia.Styling;+using Avalonia.VisualTree;+using Nota.Application;++namespace Nota.App;++internal static class NotaThemeService+{+ private static bool _hooked;++ /// <summary>Apply a mode and keep following it. Safe to call repeatedly.</summary>+ public static void Set(AppTheme mode)+ {+ var app = Avalonia.Application.Current;+ if (app is null) return;++ if (!_hooked)+ {+ app.ActualThemeVariantChanged += (_, _) => SyncManagedPalette();+ _hooked = true;+ }++ app.RequestedThemeVariant = mode switch+ {+ AppTheme.Light => ThemeVariant.Light,+ AppTheme.Dark => ThemeVariant.Dark,+ _ => ThemeVariant.Default, // follow the OS+ };++ // ActualThemeVariantChanged only fires when the resolved variant actually moved;+ // sync unconditionally so the first call (and a no-op re-apply) still lands.+ SyncManagedPalette();+ }++ private static void SyncManagedPalette()+ {+ var app = Avalonia.Application.Current;+ if (app is null) return;++ var want = app.ActualThemeVariant == ThemeVariant.Light ? NotaThemeVariant.Light : NotaThemeVariant.Dark;+ if (NotaPalette.Variant == want) return;++ NotaPalette.Apply(want);+ RepaintEverything();+ }++ // Custom-drawn views read palette brushes inside Render() without ever binding to+ // them, so a colour change is invisible until the visual is asked to draw again.+ private static void RepaintEverything()+ {+ if (Avalonia.Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop) return;+ foreach (var w in desktop.Windows) Invalidate(w);+ }++ private static void Invalidate(Visual v)+ {+ v.InvalidateVisual();+ foreach (var child in v.GetVisualChildren()) Invalidate(child);+ }+}diff --git a/src/managed/Nota.App/WaveformView.cs b/src/managed/Nota.App/WaveformView.csindex c3893474..3d2c2375 100644--- a/src/managed/Nota.App/WaveformView.cs+++ b/src/managed/Nota.App/WaveformView.cs@@ -18,9 +18,9 @@ public sealed class WaveformView : Controlprivate int _buckets;// Design tokens (see .claude/skills/nota-design — Data colors).- private static readonly IBrush Background = new SolidColorBrush(Color.FromRgb(0x10, 0x13, 0x18)); // bg-sunken- private static readonly IPen WavePen = new Pen(new SolidColorBrush(Color.FromRgb(0x16, 0x90, 0xB2)), 1); // accent- private static readonly IPen MidPen = new Pen(new SolidColorBrush(Color.FromRgb(0x2C, 0x32, 0x3D)), 1); // border-default+ private static readonly IBrush Background = NotaPalette.BgSunken;+ private static readonly IPen WavePen = new Pen(NotaPalette.Accent, 1);+ private static readonly IPen MidPen = new Pen(NotaPalette.BorderDefault, 1);public void SetPeaks(float[] minMax, int buckets){diff --git a/src/managed/Nota.App/WhatsNewWindow.cs b/src/managed/Nota.App/WhatsNewWindow.csindex 404ff457..84a87940 100644--- a/src/managed/Nota.App/WhatsNewWindow.cs+++ b/src/managed/Nota.App/WhatsNewWindow.cs@@ -137,5 +137,5 @@ public sealed class WhatsNewWindow : NotaWindow}private IBrush Brush(string key)- => this.TryFindResource(key, out var v) && v is IBrush b ? b : Brushes.Magenta;+ => (IBrush?)NotaPalette.ByKey(key) ?? Brushes.Magenta;}diff --git a/src/managed/Nota.Application/Settings.cs b/src/managed/Nota.Application/Settings.csindex b02380e9..49d555ca 100644--- a/src/managed/Nota.Application/Settings.cs+++ b/src/managed/Nota.Application/Settings.cs@@ -11,9 +11,16 @@ namespace Nota.Application;public enum ToolbarSide { Left, Right }+/// <summary>Which palette the UI wears. <see cref="System"/> follows the OS appearance+/// and flips live when the user changes it.</summary>+public enum AppTheme { Dark, Light, System }+public sealed class Settings{public ToolbarSide ToolbarSide { get; set; } = ToolbarSide.Left;+ /// <summary>Palette variant: Ember Graphite (dark), Ember Paper (light), or the OS+ /// appearance. Dark by default — a DAW is used in dark rooms for long sessions.</summary>+ public AppTheme Theme { get; set; } = AppTheme.Dark;/// <summary>Browser sample library folder ("" = default ~/Music/Nota Samples). M7-4.</summary>public string SamplesFolder { get; set; } = "";/// <summary>Browser projects folder ("" = default ~/Documents/Nota Projects). M7-4.</summary>