Skip to content

armgit / nota

Public Imported from GitHub
0

Nota — a free DAW for macOS, Windows and Linux. No subscription, no account — just open it and make music.

(feat) Classic look: 0.59's colours, corners and type, and solid clips (#572) (#577)

Egor Khindikayneneec6a4ff6ef2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 790e2c2e..70e5deb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,19 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
## [Unreleased]
### Added
+- **Classic look** (#572, specs/091). **Settings → Appearance → Look** switches between the
+ new look and **Classic**. Classic brings back 0.59's colours, its tighter corners and
+ values in Geist Mono (tempo, position, dB, Hz, counters). It works with any colour theme
+ and takes effect at once, without a restart. The new look stays the default, and the
+ layouts are the same in both looks.
+ - **Clips: Solid | Tinted** (Settings → Appearance). Solid draws Arrangement clips as in
+ 0.59: blocks of the track colour with a darker title band. With no pick, Classic draws
+ solid clips and New tinted ones. Your pick stays when you change the look.
+ - A user theme keeps its own colours under Classic, and its own typeface and corners when
+ it sets them. A theme file (format 3) can also set a typeface for values:
+ `"font": { "values": "…" }`.
+ - AI control (MCP): `set_look` switches the look. `list_themes` reports it, and
+ `get_theme` / `preview_theme` take an optional `look`.
- **Nota Remote shows what is in each clip on the Scenes screen** (#557, specs/090). A filled
cell reads like the desktop's Session slot: the clip's name and length on top, and below
them its notes as a small piano roll, or its waveform, in the clip's colour. Editing,
diff --git a/DESIGN.md b/DESIGN.md
index 318156ab..fd9f38bb 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -210,6 +210,64 @@ The fifteen style-guide brushes (§ Colour) shipped in both Ember themes at the
starting values unchanged; none is in the bar. Look at them by eye when an Ember ground
changes.
+## Classic look
+
+**Settings → Appearance → Look** has two options: **New** (this guide, the default) and
+**Classic**. Classic puts 0.59's colours, corners and type on today's layouts, over any theme
+(spec 091, #572). Shapes, sizes, layouts and orange's three strengths are the same in both
+looks. A user theme keeps whatever it sets: its colours always, and its typefaces and radii
+when it sets them. Classic fills in only what the theme leaves open.
+
+**Colours.** Each built-in has a classic palette, `Theme/Themes/Classic/<id>.json`. Every
+token 0.59.2 had keeps its 0.59.2 value, even where today's readability bar warns (the
+smoke test allows a warning only where 0.59.2 itself had it). The tokens added by the
+style guide take the 0.59.2 colour of the part they now draw:
+
+| Token | Classic value from (0.59.2 token) |
+|---|---|
+| `Well` | `SurfaceRaised` |
+| `WellTrack` | `SurfaceInset` |
+| `KnobTrack` | `BorderStrong` |
+| `Groove` | `BgSunken` |
+| `DeviceSection`, `DeviceHeader` | `SurfaceCard`, `Panel` |
+| `DeviceSectionEdge` | transparent (0.59 had no pressed-in sections) |
+| `Bevel` | `ShadowBevel` |
+| `AccentSoft` | `AccentSubtle` |
+| `KnobCap` | `SurfaceRaised` |
+| `MeterSafe`, `MeterHot`, `MeterOver` | `Success`, `Warning`, `Danger` |
+| `TrackHeaderSelected` | `SelHeaderBg` |
+| `LaneSelected` | `LaneB` |
+
+A new token needs a classic value in all four classic palettes as well; the smoke test
+checks that each one has the full catalogue.
+
+**Corners.** These are 0.59's tighter radii, laid on today's steps (`Looks.ClassicGeometry`):
+
+| Step | New | Classic |
+|---|---|---|
+| Card | 9 | 3 |
+| Group | 7 | 3 |
+| Field | 6 | 3 |
+| Cell | 5 | 2 |
+| ValueBar | 4 | 2 |
+| Switch | 3 | 2 |
+| Fine | 2 | 2 |
+
+Radii off the scale shrink by 0.4, and pills stay round. Three parts now share a step with
+something that 0.59 rounded differently: modal windows (were 4) and clips (were 2) get 3,
+and plot bars (were 1) get 2.
+
+**Type.** Text has two roles. *Words* are always Geist (`Font.UI`, `NotaFonts.Sans*`).
+*Values and readouts* (numbers with their units, tempo, position, counters, badges) use
+`Font.Measure` / `NotaFonts.Measure*`. In XAML these are the `TextBlock.Mono`, `.Readout`,
+`.Value`, `.Eyebrow`, `.KnobValue`, `.Axis` and `.RowTag` classes. In code a control names
+`NotaFonts.ValuesFamily`, and drawn text uses `NotaFonts.Measure*`, read when the text is
+built, never cached in a static field. Under New the values role *is* Geist, so the new look
+stays one typeface. Under Classic it is Geist Mono, or a theme's `font.values`. The role
+covers exactly the values that 0.59.2 set in Geist Mono (`specs/091-classic-look/role-sites.md`).
+A value display added since stays a word: use `TextBlock.Number` or `NotaFonts.Sans`, and
+it is Geist in both looks.
+
## Principles
1. **Keep every control.** The layout and every control stay where they are; this guide
@@ -1123,6 +1181,11 @@ A block of notes or audio on a track lane.
- **Content:** notes, waveform and the name (10.5 / 600) in the full track colour, moved toward
dark ink (or white) just enough to keep 3 : 1 on the lane. Only a light shade on Studio Light
needs it.
+- **Solid** (Settings → Appearance → Clips; the classic look's default, spec 091): 0.59's
+ clip. A full track-colour body with no outline, a 12 px title band in the track colour mixed
+ 30 % toward `ShadeDown` (the accent when selected) with the name (9.5 / 600) in readable ink,
+ and notes and waveform 58 % toward `ShadeDown`. A row too short for the band keeps a 2 px
+ band. The corner is the Field step.
- Audio clips draw their waveform as spaced bars by default (a 1 px stroke every 3 px,
mirrored about the centre); Settings → Appearance → Waveform switches to Solid.
diff --git a/FEATURES.md b/FEATURES.md
index 357e46d3..ff1bc2c7 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -1445,12 +1445,21 @@ audio effects after it keep running and keep their settings; saved with the proj
knob or fader turns orange while you hover or drag it; mute is amber, solo blue,
record-arm red; labels are in sentence case. Switching applies immediately, across every
open window — including the custom-drawn arrangement, piano roll, mixer and device cards.
+- **Classic look** — **Look: Classic** in Preferences → Appearance wears 0.59's look over
+ any theme: the built-in themes in their 0.59 colours, tighter corners (3 px on controls
+ and cards), and values and readouts (tempo, position, dB, Hz, counters) in Geist Mono
+ while words stay in Geist. Layouts are the same as in the new look, which stays the
+ default. Switching is live, in every window, and remembered. A skin keeps its own
+ colours, and its typeface and corners when it sets them. **Clips: Solid | Tinted** draws
+ Arrangement clips as solid blocks of the track colour with a darker title band (0.59) or
+ as a tint; with no pick it follows the look (Classic → Solid).
- **Skins (user themes)** — theme files in the **Themes** folder of the data folder appear
next to the built-ins and are worn the same way. A file sets every colour token. Format 2
can also name an installed system typeface, which replaces Geist for all of Nota's text,
and a corner roundness from 0 (square) to 2, with optional exact radii per step. All
three apply live in every window, device cards and drawn views included, without changing
- sizes. A file that fails is listed with the reason. A theme below the readability bar
+ sizes. Format 3 can also name a typeface for values and readouts (`font.values`). A file
+ that fails is listed with the reason. A theme below the readability bar
still loads, and shows its warnings. Over MCP an AI can validate a theme, get one picture
per part of the app in it without the window changing, and save, wear or try it on (see
[MCP](#mcp--ai-control)).
@@ -1564,7 +1573,9 @@ audio effects after it keep running and keep their settings; saved with the proj
- **Library**: library folders. Without an explicit choice, the Projects and Samples folders
sit in the system's Documents and Music locations (Known Folders on Windows and macOS,
`user-dirs.dirs` on Linux), relocated or translated ones included.
-- **Appearance**: **Colour theme** — **Dark**, **Light** or **Follow system** over two
+- **Appearance**: **Look** — **New** or **Classic** (0.59's colours, corners and monospaced
+ values, over any theme), applied live. **Clips** — **Solid** or **Tinted** Arrangement
+ clips, following the look until picked. **Colour theme** — **Dark**, **Light** or **Follow system** over two
rows of cards (Studio Dark and Ember Graphite; Studio Light and Ember Paper), each a
miniature Nota window in its own colours. Pick one theme, or with Follow system one for
dark mode and one for light mode, switched with the OS appearance; the choice applies
@@ -1650,7 +1661,9 @@ Coverage:
`list_system_fonts`, `validate_theme` (every problem and readability warning).
`preview_theme` returns a PNG per part of the app (overview, top bar, arrangement, mixer,
device rack, piano roll, browser, Preferences, a menu, a dialog) rendered offscreen in that
- theme. `save_theme`, `apply_theme`, `try_on_theme` / `revert_try_on`.
+ theme. `save_theme`, `apply_theme`, `try_on_theme` / `revert_try_on`. `set_look` switches
+ between the new and the classic look; `list_themes` reports the look, and `get_theme`
+ (a built-in's classic palette) and `preview_theme` take an optional `look`.
- **Session**: the clip launcher (grid snapshot with clip and scene properties, create, copy,
move and clear slots, read and write slot notes, loop length, clip name / colour / launch
mode / quantize / legato / loop / follow actions, scene name / colour / tempo / signature /
diff --git a/LICENSES/third-party.md b/LICENSES/third-party.md
index 3b2b28ec..37cb65e9 100644
--- a/LICENSES/third-party.md
+++ b/LICENSES/third-party.md
@@ -26,7 +26,7 @@ public domain, or AGPL-compatible copyleft.
| CPM.cmake | v0.43.2 | CMake package manager (build-time only, not linked) | MIT | ✅ in use — downloaded at configure time, never vendored |
| HIIR (Laurent de Soras) | 1.50 (bump ex 1.40; snapshot unavailable upstream — null-gated, see note 4) | Oversampling (polyphase halfband IIR) | WTFPL | ✅ in use — CPM URL+HASH zip, fetched to build dir — see note 4 |
| Apple CoreAudio / CoreMIDI / AudioToolbox | system | Audio + MIDI I/O (macOS) | system SDK | ✅ in use |
-| Geist (Vercel) | 1.7.2 | The UI typeface, words and numbers (`assets/fonts`) | **SIL OFL 1.1** | ✅ in use — see note 5 |
+| Geist and Geist Mono (Vercel) | 1.7.2 | The UI typeface; Geist Mono for values under the classic look (`assets/fonts`) | **SIL OFL 1.1** | ✅ in use — see note 5 |
| ONNX Runtime — managed API (`Microsoft.ML.OnnxRuntime.Managed`) | 1.23.2 | Runs the AI models (Separate Stems, Convert to MIDI) | MIT | ✅ in use — see note 6 |
| ONNX Runtime — native library | 1.23.2 | The same, downloaded with the first AI model | MIT | ✅ downloaded, not bundled — see note 6 |
| htdemucs (Demucs v4, Meta) | v4 weights, ONNX export | Separate Stems model | MIT | ✅ downloaded, not bundled — see note 6 |
@@ -59,14 +59,16 @@ with unusual patent terms.
HIIR is released under the WTFPL, which some corporate legal reviews reject (it carries
no warranty disclaimer and its enforceability is debated). It is fine for the AGPL build.
-**5 — Geist ships as bundled font files under the SIL Open Font License.** OFL 1.1
+**5 — Geist and Geist Mono ship as bundled font files under the SIL Open Font License.** OFL 1.1
allows embedding and redistributing the fonts with any software, including AGPL software,
provided the fonts are not sold on their own and the license travels with them
(`LICENSES/OFL-1.1-Geist.txt`). The four static weights we use (Regular, Medium,
SemiBold, Bold) are copied unmodified from the `geist` npm package; "Geist" is a Reserved
Font Name, so a subset or other modification must be renamed. Numbers use Geist's own
tabular figures (the `tnum` feature), turned on at shaping time rather than cut into the
-files. Geist Mono was bundled until the style guide (spec 038) dropped it.
+files. Geist Mono (same package, same licence, same four weights, unmodified) was dropped
+by the style guide (spec 038) and came back with the classic look (spec 091), which sets
+values and readouts in it as 0.59 did.
They replace Inter, which came in through the `Avalonia.Fonts.Inter` package.
**6 — The AI models and their runtime are downloaded, not shipped.**
diff --git a/assets/fonts/GeistMono-Bold.ttf b/assets/fonts/GeistMono-Bold.ttf
new file mode 100644
index 00000000..90eb8a86
Binary files /dev/null and b/assets/fonts/GeistMono-Bold.ttf differ
diff --git a/assets/fonts/GeistMono-Medium.ttf b/assets/fonts/GeistMono-Medium.ttf
new file mode 100644
index 00000000..ff49ece5
Binary files /dev/null and b/assets/fonts/GeistMono-Medium.ttf differ
diff --git a/assets/fonts/GeistMono-Regular.ttf b/assets/fonts/GeistMono-Regular.ttf
new file mode 100644
index 00000000..50c9d5a6
Binary files /dev/null and b/assets/fonts/GeistMono-Regular.ttf differ
diff --git a/assets/fonts/GeistMono-SemiBold.ttf b/assets/fonts/GeistMono-SemiBold.ttf
new file mode 100644
index 00000000..1b21724d
Binary files /dev/null and b/assets/fonts/GeistMono-SemiBold.ttf differ
diff --git a/scripts/classic-role-sites.py b/scripts/classic-role-sites.py
new file mode 100755
index 00000000..83036d66
--- /dev/null
+++ b/scripts/classic-role-sites.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
+#
+# Where 0.59.2 set values in Geist Mono (spec 091, FR-009). The style guide commit (#296)
+# replaced every Mono use with Sans in one go; its hunks are the inventory of the values
+# and readouts role. For each removed Mono line this prints the line the same hunk added
+# and, when that text is still on HEAD, where it is now — the place to restore the role.
+#
+# Usage: scripts/classic-role-sites.py [commit] (default: the #296 merge, cbd77012)
+# Output: markdown rows: file | head line | removed (0.59.2) | added (#296)
+
+import re
+import subprocess
+import sys
+
+COMMIT = sys.argv[1] if len(sys.argv) > 1 else "cbd77012"
+MONO = re.compile(r"NotaFonts\.Mono|MonoFamily|Font\.Mono")
+# What #296 turned each Mono name into, so a removed line can be found on HEAD as it reads now.
+SANS = [("NotaFonts.MonoFamily", "NotaFonts.UiFamily"), ("NotaFonts.MonoMedium", "NotaFonts.SansMedium"),
+ ("NotaFonts.MonoBold", "NotaFonts.SansBold"), ("NotaFonts.Mono", "NotaFonts.Sans"),
+ ("Font.Mono", "Font.UI")]
+
+
+def as_sans(line: str) -> str:
+ for a, b in SANS:
+ line = line.replace(a, b)
+ return line.strip()
+
+
+def git(*args: str) -> str:
+ return subprocess.run(["git", *args], check=True, capture_output=True, text=True).stdout
+
+
+def hunks(diff: str):
+ """Yield (file, removed lines, added lines) per hunk."""
+ file, removed, added = None, [], []
+ for line in diff.splitlines():
+ if line.startswith("diff --git"):
+ if file and (removed or added):
+ yield file, removed, added
+ file, removed, added = None, [], []
+ elif line.startswith("+++ "):
+ file = line[6:] if line.startswith("+++ b/") else None
+ elif line.startswith("@@"):
+ if file and (removed or added):
+ yield file, removed, added
+ removed, added = [], []
+ elif line.startswith("-") and not line.startswith("---"):
+ removed.append(line[1:])
+ elif line.startswith("+") and not line.startswith("+++"):
+ added.append(line[1:])
+ if file and (removed or added):
+ yield file, removed, added
+
+
+def head_lines(path: str):
+ try:
+ return git("show", f"HEAD:{path}").splitlines()
+ except subprocess.CalledProcessError:
+ return None
+
+
+def main() -> None:
+ diff = git("show", "-U0", "--format=", COMMIT, "--", "src/managed")
+ print("| file | head line | 0.59.2 (removed) | #296 (added) |")
+ print("|---|---|---|---|")
+ cache: dict[str, list[str] | None] = {}
+ for file, removed, added in hunks(diff):
+ mono = [r for r in removed if MONO.search(r)]
+ if not mono:
+ continue
+ if file not in cache:
+ cache[file] = head_lines(file)
+ lines = cache[file]
+ for i, old in enumerate(mono):
+ new = added[i] if i < len(added) else ""
+ where = "gone" if lines is None else "?"
+ if lines is not None:
+ # First the removed line as #296 would have rewritten it, then the hunk's own line.
+ for probe in (as_sans(old), new.strip()):
+ hits = [n + 1 for n, l in enumerate(lines) if probe and l.strip() == probe]
+ if hits:
+ where = ",".join(map(str, hits[:5]))
+ break
+ cell = lambda s: s.strip().replace("|", "\\|")[:140]
+ print(f"| {file.removeprefix('src/managed/')} | {where} | `{cell(old)}` | `{cell(new)}` |")
+
+
+if __name__ == "__main__":
+ main()
diff --git a/specs/091-classic-look/checklists/requirements.md b/specs/091-classic-look/checklists/requirements.md
new file mode 100644
index 00000000..be08e7e7
--- /dev/null
+++ b/specs/091-classic-look/checklists/requirements.md
@@ -0,0 +1,41 @@
+# Specification Quality Checklist: Classic look
+
+**Purpose**: Validate specification completeness and quality before proceeding to planning
+**Created**: 2026-11-11
+**Feature**: [spec.md](../spec.md)
+
+## Content Quality
+
+- [x] No implementation details (languages, frameworks, APIs)
+- [x] Focused on user value and business needs
+- [x] Written for non-technical stakeholders
+- [x] All mandatory sections completed
+
+## Requirement Completeness
+
+- [x] No [NEEDS CLARIFICATION] markers remain
+- [x] Requirements are testable and unambiguous
+- [x] Success criteria are measurable
+- [x] Success criteria are technology-agnostic (no implementation details)
+- [x] All acceptance scenarios are defined
+- [x] Edge cases are identified
+- [x] Scope is clearly bounded
+- [x] Dependencies and assumptions identified
+
+## Feature Readiness
+
+- [x] All functional requirements have clear acceptance criteria
+- [x] User scenarios cover primary flows
+- [x] Feature meets measurable outcomes defined in Success Criteria
+- [x] No implementation details leak into specification
+
+## Notes
+
+- Typeface names (Geist, Geist Mono), the MCP theme tools and the theme file format are
+ named because they are the user-facing product surface the issue (#572) and spec 087
+ define, not implementation choices. Class names, files and token storage are left to
+ the plan.
+- No clarification markers: the issue fixed the scope (colours, corners, typefaces; no
+ layouts) and the user chose a separate switch over classic themes in the list.
+- Clarified 2026-11-11: the values-and-readouts role covers exactly the 0.59.2 Geist Mono
+ uses (FR-009); classic palettes keep 0.59.2 colours even where readability warns (FR-007).
diff --git a/specs/091-classic-look/contracts/mcp-tools.md b/specs/091-classic-look/contracts/mcp-tools.md
new file mode 100644
index 00000000..33ce1496
--- /dev/null
+++ b/specs/091-classic-look/contracts/mcp-tools.md
@@ -0,0 +1,13 @@
+# Contract: MCP theme tools, Look
+
+Extends [087 MCP tools](../../087-user-skins/contracts/mcp-tools.md). All on the UI thread.
+
+| Tool | Change |
+|---|---|
+| `list_themes` | `choice` gains `look`: `"new"` or `"classic"`. |
+| `set_look` *(new)* | Input `look`: `"new"` \| `"classic"`. Wears it live, stores it as Preferences would, refreshes Preferences if open. Returns `{ look, worn }` (`worn` = theme id). Unknown value → error naming the allowed values; nothing changes. |
+| `get_theme` | Optional `look`. With `"classic"` a built-in id returns its classic palette (format 1, same id); a user theme is returned unchanged. Default: the original theme file (unchanged behaviour). |
+| `preview_theme` | Optional `look` (default: the worn look). Images render the theme under that look — colours (built-ins), radii and both typefaces; the live window is untouched. |
+| `try_on_theme` | Unchanged; the try-on is worn under the current look. |
+| `validate_theme`, `save_theme` | Accept format 3 (theme-file-v3). |
+| `get_theme_catalogue` | Unchanged. |
diff --git a/specs/091-classic-look/contracts/theme-file-v3.md b/specs/091-classic-look/contracts/theme-file-v3.md
new file mode 100644
index 00000000..3e4a2abb
--- /dev/null
+++ b/specs/091-classic-look/contracts/theme-file-v3.md
@@ -0,0 +1,37 @@
+# Contract: Theme file, format version 3
+
+Extends [087 format 2](../../087-user-skins/contracts/theme-file-v2.md). Format 1 and 2
+stay valid unchanged; the built-ins stay format 1.
+
+```json
+{
+ "formatVersion": 3,
+ "id": "night-shift",
+ "name": "Night Shift",
+ "kind": "dark",
+ "font": { "family": "IBM Plex Sans", "values": "IBM Plex Mono" },
+ "radius": { "scale": 0.5 },
+ "colors": { "...": "every catalogue token" }
+}
+```
+
+## Rules (changes only)
+
+| # | Rule | On violation |
+|---|---|---|
+| F1″ | `formatVersion` is `1`, `2` or `3`. | problem |
+| V1′ | `font` and `radius` appear only when `formatVersion` ≥ 2; `font.values` only when it is `3`. | problem, names the key |
+| V2′ | `font` is an object with optional `family` and (format 3) optional `values`, each a string of 1–100 characters after trimming; at least one present; no other keys. | problem, names `font.family` / `font.values` |
+| W1′ | Each named family (`font.family`, `font.values`) is installed. | warning; the look's default is used |
+
+## Meaning
+
+- `font.values`: the typeface for values and readouts (spec FR-009) under both looks.
+- Omitted `font.values` → Geist under New, Geist Mono under Classic.
+- A `radius` object (any content) means the skin's radii are worn under both looks;
+ without one, New wears the design scale and Classic the classic scale.
+
+## Writing
+
+- Nota writes `formatVersion` 3 only when `font.values` is set; else 2 when `font` or
+ `radius` is set; else 1 (as before).
diff --git a/specs/091-classic-look/contracts/ui-contract.md b/specs/091-classic-look/contracts/ui-contract.md
new file mode 100644
index 00000000..df96eda4
--- /dev/null
+++ b/specs/091-classic-look/contracts/ui-contract.md
@@ -0,0 +1,37 @@
+# Contract: Preferences → Appearance, Look
+
+Follows `DESIGN.md` and the `nota-design` skill; all strings via `Loc.T`, EN + RU.
+
+## L1 — The Look row
+
+- A row **Look** at the top of Preferences → Appearance, above the mode row (Dark / Light /
+ Follow system) and the theme cards: a two-cell segment control **New | Classic**.
+- A caption row under it, like the other Appearance rows: "Classic brings back the colours,
+ corners and monospaced values of Nota 0.59, over any theme." (RU via the translation sync).
+- Picking a cell applies at once (no Apply button), stores `Settings.Look`, and repaints
+ every window, this one included.
+- Keyboard: the segment control is reachable with Tab; arrows move between the cells.
+
+## L2 — Theme cards under Classic
+
+- Built-in theme cards show their classic colours and the classic corners while Look is
+ Classic; user theme cards show their own colours with the radii they would wear.
+- "Duplicate" on a built-in card copies the colours of the look being worn (FR-013).
+
+## L3 — Skins
+
+- A skin whose `font.values` names a family that is not installed carries a warning like a
+ missing typeface ("values font 'X' is not installed — the look's own is used instead"),
+ shown in the card's warning tooltip; values fall back to the look's own face (Geist under
+ New, Geist Mono under Classic).
+
+## L5 — Clips row
+
+- A row **Clips** under Look: a two-cell segment control **Solid | Tinted** showing the style
+ in effect (the look's default until the user picks), with a caption: "Solid draws clips as
+ blocks of the track colour, as in Nota 0.59. With no pick, it follows the look."
+- A pick applies at once to the open Arrangement and is stored.
+
+## L4 — No other UI changes
+
+- No restart prompt, no dialog. The Look row is not part of Nota Remote.
diff --git a/specs/091-classic-look/data-model.md b/specs/091-classic-look/data-model.md
new file mode 100644
index 00000000..ea1dac12
--- /dev/null
+++ b/specs/091-classic-look/data-model.md
@@ -0,0 +1,73 @@
+# Data model: Classic look
+
+Phase 1 of [plan.md](plan.md). Decisions behind each item: [research.md](research.md).
+
+## Look
+
+| Field | Values | Notes |
+|---|---|---|
+| `Look` | `New` (default), `Classic` | Pure enum in `Nota.Application` |
+
+- **Stored** as `Settings.Look` (string): `""` or `"new"` → New, `"classic"` → Classic;
+ anything else reads as New and is never rewritten on read (as `Appearance.Resolve`).
+- **Lifecycle**: read at startup before the first window; changed from Preferences →
+ Appearance or MCP `set_look`; written by the caller that changed it (as the accent).
+- Independent of `AppearanceChoice`; follow-system and per-mode picks are unaffected.
+
+## Clip style
+
+| Field | Values | Notes |
+|---|---|---|
+| `Settings.ClipStyle` | `""` (follow the look), `"solid"`, `"tinted"` | unknown reads as `""` |
+
+`Looks.ClipStyleOf(Settings)` → `Solid` when stored `"solid"`, or `""` under Classic;
+`Tinted` otherwise. A pick in Preferences stores `"solid"`/`"tinted"` and is never cleared by
+a look change.
+
+## Classic palette
+
+One per built-in theme id (`studio-dark`, `studio-light`, `ember-graphite`,
+`ember-paper`).
+
+| Field | Rule |
+|---|---|
+| `id`, `name`, `kind` | Equal to the built-in it belongs to |
+| `colors` | Every catalogue token (122). The 107 tokens of 0.59.2 equal `v0.59.2`; the 15 added by #296 have classic values (research R7) |
+
+- Format 1 file, embedded, not listed among themes, not selectable on its own.
+- Validation: F1–F6 must pass; T3 readability may warn only on pairings made solely of
+ 0.59.2 tokens at their 0.59.2 values (R8).
+
+## Classic geometry
+
+`SkinGeometry(FontFamily: null, Roundness: 0.4, Steps: Card 3, Group 3, Field 3, Cell 2,
+ValueBar 2, Switch 2, Fine 2)` — a constant in `Nota.Application` (`Looks.ClassicGeometry`).
+
+## Skin geometry (extended)
+
+`SkinGeometry` gains `ValuesFamily: string?` (the `font.values` of a format-3 file) and a
+`HasRadius: bool` (the file carried a `radius` object, even one equal to the defaults).
+
+## Composition
+
+`Looks.Compose(SkinGeometry skin, Look look) → WornGeometry`:
+
+| Out | Rule |
+|---|---|
+| `FontFamily` | `skin.FontFamily` (null → Geist) |
+| radii | `skin.HasRadius` → skin's roundness and steps; else Classic → classic geometry; else design scale |
+| `ValuesFamily` | `skin.ValuesFamily` if installed; else New → Geist (`Font.UI` URI), Classic → bundled Geist Mono |
+
+Colours: `look == Classic && theme.IsBuiltIn` → classic palette for `theme.Id`; else the
+theme's own colours. Accent is worn over the result in both looks.
+
+## Text roles
+
+| Role | Resource / API | New | Classic |
+|---|---|---|---|
+| Words | `Font.UI`, `NotaFonts.Sans*` | Geist | Geist |
+| Values and readouts | `Font.Measure`, `NotaFonts.Measure*` | Geist (tabular) | Geist Mono |
+
+Membership of the values role is fixed by 0.59.2 (spec FR-009); text classes
+`TextBlock.Mono`, `.Readout`, `.Value`, `.Eyebrow` carry it; `TextBlock.Number` is the
+words-role class for numbers added after 0.59.2.
diff --git a/specs/091-classic-look/plan.md b/specs/091-classic-look/plan.md
new file mode 100644
index 00000000..4cf0c003
--- /dev/null
+++ b/specs/091-classic-look/plan.md
@@ -0,0 +1,154 @@
+# Implementation Plan: Classic look
+
+**Branch**: `feat/classic-look` | **Date**: 2026-11-11 | **Spec**: [spec.md](spec.md)
+
+**Input**: Feature specification from `specs/091-classic-look/spec.md`
+(issue [nota-daw/nota#572](https://github.com/nota-daw/nota/issues/572))
+
+## Summary
+
+A **Look: New | Classic** switch in Preferences → Appearance brings back the 0.59.2
+colours, corners and Geist + Geist Mono pairing, live and stored, over any theme; the new
+look stays the default and renders unchanged. Approach (research): the look is a
+user-wide setting like the accent; the theme service composes theme × look × skin at the
+one point every theme change already goes through. Classic colours are four embedded
+palette files (only 5 old values differ from today, plus 15 new tokens); classic corners
+are a `SkinGeometry` over today's steps; the values-and-readouts role comes back as a
+dynamic `Font.Measure` resource that is Geist under New (no visual change) and Geist Mono
+under Classic, placed exactly where 0.59.2 used mono. Theme files gain format 3
+(`font.values`), MCP gains `set_look` and a `look` argument on previews.
+
+## Nota: Read Before Planning
+
+- **UI work** → [`DESIGN.md`](../../DESIGN.md) and the `nota-design` skill; DESIGN.md
+ gains a "Classic look" section (tokens, corner table, the two type roles).
+- **Anything** → [`CONTRIBUTING.md`](../../CONTRIBUTING.md): Geist Mono returns under the
+ existing OFL row (it shipped until #296).
+- Related specs: [011](../011-colour-themes/) themes and token catalogue,
+ [038](../038-style-guide/) the new look, [084] accent, [087](../087-user-skins/) skins,
+ format 2, MCP theme tools.
+
+## Technical Context
+
+**Language/Version**: C# / .NET 10 (managed app only); no C++ change
+
+**Primary Dependencies**: Avalonia (existing); Geist Mono 1.x font files (SIL OFL 1.1,
+previously bundled — license row and `LICENSES/OFL-1.1-Geist.txt` cover it; row text updated)
+
+**Storage**: `settings.json` gains `Look`; theme files in `<data>/Themes/` gain format 3;
+four embedded classic palette JSONs
+
+**Audio-Thread Impact**: None — UI-only. The switch runs on the UI thread through the
+existing theme-switch path; the engine is not called.
+
+**Testing**: `tests/Nota.SmokeTest` (pure resolve/compose logic, palette and format
+checks, design token/type checks); MCP preview images for visual checks; manual
+side-by-side with 0.59.2 (quickstart)
+
+**Target Platform**: macOS, Windows, Linux desktop (Avalonia)
+
+**Project Type**: desktop app
+
+**Performance Goals**: look switch shows in < 1 s (same cost as a theme switch); zero
+render cost difference under New
+
+**Constraints**: no layout size changes (FR-005); New previews pixel-identical before/after
+(SC-004); no xrun on switch (SC-007)
+
+**Scale/Scope**: 4 palettes × 15 new tokens; ~180 role call sites in 132 files at 0.59.2
+(fewer survive on develop); 1 Preferences row; 1 new MCP tool, 3 changed
+
+## Constitution Check
+
+*GATE: Must pass before Phase 0 research. Re-checked after Phase 1 design.*
+
+| Principle | Status |
+|---|---|
+| 0. Approved issue | ✅ #572, `approved`; scope = colours, corners, type; layouts out |
+| I. Real-time audio safety | ✅ N/A — no audio-thread code touched |
+| II. Boundary discipline | ✅ No ABI change, no JUCE |
+| III. Licensing hygiene | ✅ Geist Mono is OFL 1.1, AGPL-compatible, previously listed; the row in `LICENSES/third-party.md` is updated (no new dependency); new files carry SPDX headers |
+| IV. Verification gate | ✅ Smoke test extended (Looks, palettes, format 3, type check) |
+| V. One logical change | ✅ One feature; may split into 2 PRs (P1 switch+colours+corners+type, then P2/P3 skins+MCP) if review size demands |
+| VI. Docs in sync | ✅ CHANGELOG, FEATURES (nota-features), user manual EN+RU (nota-docs), DESIGN.md |
+| VII. Spec-first | ✅ This spec/plan/tasks |
+| VIII. No weakening of I–III | ✅ |
+
+Design-check change (R9): the "one typeface" guard becomes "two roles, New is one
+typeface" — it keeps guarding New exactly (FR-017), not a loosening of I–III.
+
+**Post-design re-check**: unchanged, all pass.
+
+## Project Structure
+
+### Documentation (this feature)
+
+```text
+specs/091-classic-look/
+├── plan.md # this file
+├── research.md # R1–R11
+├── data-model.md # Look, palettes, geometry, composition, text roles
+├── quickstart.md # validation guide
+├── contracts/
+│ ├── ui-contract.md # Preferences → Appearance, Look row
+│ ├── theme-file-v3.md # font.values
+│ └── mcp-tools.md # set_look, look arguments
+├── checklists/requirements.md
+└── tasks.md # /speckit-tasks
+```
+
+### Source Code (repository root)
+
+```text
+assets/fonts/ # + GeistMono-{Regular,Medium,SemiBold,Bold}.ttf (from v0.59.2)
+LICENSES/third-party.md # Geist row: Geist Mono back in use
+src/managed/
+├── Nota.Application/
+│ ├── Looks.cs # NEW: Look enum, Resolve, ClassicGeometry, Compose
+│ ├── Settings.cs # + Look
+│ └── Themes/
+│ ├── SkinGeometry.cs # + ValuesFamily, HasRadius
+│ └── ThemeFile.cs # format 3: font.values (read, validate, write)
+├── Nota.App/
+│ ├── App.axaml.cs # resolve Look at startup, before the first window
+│ ├── Nota.App.csproj # embed Theme/Themes/Classic/*.json, Geist Mono
+│ ├── PreferencesWindow*.cs # Look row (Appearance), duplicate under Classic
+│ ├── Theme/
+│ │ ├── NotaTheme.axaml # Font.Measure; role classes use it; TextBlock.Number
+│ │ ├── NotaFonts.cs # MeasureMonoUri, Measure* properties, SetMeasure
+│ │ ├── NotaThemeService.cs # SetLook, compose in ApplyActive, RenderScoped(look)
+│ │ ├── NotaThemes (loader) # classic palette lookup
+│ │ ├── NotaSkin.cs # wear composed geometry
+│ │ └── Themes/Classic/*.json # NEW: four classic palettes
+│ └── … ~130 view files # NotaFonts.Measure* / Font.Measure at 0.59.2 sites
+├── Nota.Mcp/
+│ ├── Abstractions.cs # IThemeAccess: look on list/get/preview, SetLook
+│ └── Tools/ThemeTools.cs # set_look; look args
+tests/Nota.SmokeTest/
+├── DesignTokenCheck.cs # RunType: two roles
+├── DesignTokenCheck.Themes.cs # classic palettes vs snapshot, readability rule
+├── DesignTokenCheck.Skins.cs # format 3 cases
+├── LooksCheck.cs # NEW: Resolve, Compose
+└── Fixtures/classic-0.59.2.json # NEW: committed snapshot of the 0.59.2 palettes
+scripts/classic-role-sites.sh # NEW (dev aid): lists the #296 Mono→Sans hunks still on develop
+DESIGN.md, CHANGELOG.md, FEATURES.md # docs
+```
+
+**Structure Decision**: Managed only. Pure logic (`Looks`, format 3) in
+`Nota.Application` so the smoke test covers it without UI; wearing in `Nota.App/Theme`;
+MCP surface in `Nota.Mcp`. No new project.
+
+## Phasing
+
+1. **Foundation** — `Looks`, `Settings.Look`, format-3 geometry fields, smoke checks.
+2. **US1 (P1, MVP)** — classic palettes, classic geometry, `Font.Measure` + Geist Mono,
+ role restored at the 0.59.2 sites, Preferences Look row, startup, design checks.
+3. **US2 (P2)** — skin composition rules, `font.values` in format 3, duplicate under
+ Classic, skins editor display.
+4. **US3 (P3)** — MCP `set_look`, `look` on `get_theme` / `preview_theme`, `list_themes`.
+5. **US4 (P2, widened scope)** — Clips: Solid | Tinted, default from the look (research R12).
+6. **Polish** — clipping pass (FR-016), DESIGN.md, CHANGELOG, FEATURES, user docs, RU.
+
+## Complexity Tracking
+
+No constitution violations.
diff --git a/specs/091-classic-look/quickstart.md b/specs/091-classic-look/quickstart.md
new file mode 100644
index 00000000..a0d89bd3
--- /dev/null
+++ b/specs/091-classic-look/quickstart.md
@@ -0,0 +1,65 @@
+# Quickstart: validating the Classic look
+
+How to prove [spec.md](spec.md) end to end. Contracts:
+[UI](contracts/ui-contract.md), [theme file v3](contracts/theme-file-v3.md),
+[MCP](contracts/mcp-tools.md).
+
+## Prerequisites
+
+- macOS build: `scripts/build.sh` green (builds native + managed, runs the smoke test).
+- A `v0.59.2` build or its screenshots for side-by-side comparison (the release DMG, or
+ `git worktree add /tmp/nota-0592 v0.59.2` and build there).
+- A scratch data folder: `export NOTA_DATA_DIR=/tmp/nota-classic` (keeps your settings).
+
+## 1. Smoke test (automated)
+
+`scripts/build.sh` must report, among the existing checks:
+
+- `Looks.Resolve`: `""`, `"new"`, `"classic"`, garbage → New/New/Classic/New.
+- `Looks.Compose`: the table in [data-model.md](data-model.md) § Composition, each row.
+- Classic palettes: four files, full catalogue, 107 tokens equal the committed 0.59.2
+ snapshot, readability warnings only on 0.59.2-only pairings.
+- Theme file v3: valid/invalid cases for `font.values`; v1/v2 files unchanged.
+- Type check: `Font.UI` + `Font.Measure` (default Geist), four Geist + four Geist Mono
+ weights, OFL licence present, no family named by string in views.
+
+## 2. Switch live (US1)
+
+1. Start Nota with an empty `NOTA_DATA_DIR`. Preferences → Appearance shows **Look: New**.
+2. Pick **Classic** during playback of a project with audio and a synth. Expect: every
+ window changes at once; no dropout or xrun in the log; transport keeps running.
+3. Compare against 0.59.2 on Studio Dark, then each other theme: main window, mixer, EQ-8
+ card, piano roll, Preferences. Colours match; corners tight; tempo, position, dB, Hz
+ in Geist Mono; names in Geist.
+4. Quit and start again: classic from the splash on.
+5. Pick **New**: today's look returns, identical to a build without this feature (compare
+ MCP previews before/after, SC-004).
+
+## 3. Clipping (FR-016)
+
+Under Classic, at 100 % and the largest UI scale, render the full preview set over MCP
+(`preview_theme` with `look: "classic"`) for Studio Dark and Studio Light, and walk every
+image for clipped, overlapping or wrapped values. Zero defects.
+
+## 4. Skins (US2)
+
+Put three files in `$NOTA_DATA_DIR/Themes/`:
+
+- colours only (format 1) → under Classic: own colours, classic corners and type;
+- `font.family` + `radius.scale: 0` (format 2) → under Classic: skin typeface and square
+ corners; values in Geist Mono;
+- `font.values: "Menlo"` (format 3) → values in Menlo under both looks; with a missing
+ family, the warning and fallback per contract L3.
+
+Duplicate Studio Dark under Classic → the copy has the 0.59.2 colours.
+
+## 5. MCP (US3)
+
+`list_themes` shows `choice.look`; `set_look classic` switches and Preferences follows;
+`get_theme studio-dark look=classic` returns the classic palette; `preview_theme` in both
+looks differs only in colours, corners and typefaces, and the live window does not change.
+
+## 6. Docs
+
+CHANGELOG `[Unreleased]` entry; FEATURES.md and the user manual (EN + RU) via
+`nota-features` / `nota-docs`; DESIGN.md § Classic look.
diff --git a/specs/091-classic-look/research.md b/specs/091-classic-look/research.md
new file mode 100644
index 00000000..b2446bb4
--- /dev/null
+++ b/specs/091-classic-look/research.md
@@ -0,0 +1,213 @@
+# Research: Classic look
+
+Phase 0 of [plan.md](plan.md). Each entry: decision, rationale, alternatives. Findings
+come from the code on `develop` (after #296 and #336) and the `v0.59.2` tag.
+
+## R1 — What actually differs from 0.59.2
+
+**Finding.** Against `v0.59.2`, the three things users asked for differ like this:
+
+| Area | 0.59.2 | Now (new look) |
+|---|---|---|
+| Colours | 107 tokens per theme | 122 tokens: 15 added (`Well`, `WellTrack`, `KnobTrack`, `Groove`, `DeviceSection`, `DeviceSectionEdge`, `DeviceHeader`, `Bevel`, `AccentSoft`, `KnobCap`, `MeterSafe`, `MeterHot`, `MeterOver`, `TrackHeaderSelected`, `LaneSelected`); changed values only in Studio Dark (`Panel`, `SurfaceRaised`, `TextDisabled`, `VizInk`) and Studio Light (`Mute`); Ember Graphite and Ember Paper unchanged |
+| Corners | 0 docked, 1 plot bars, 2 clips/keys/rows/badges, 3 controls/cards/panels/popovers, 4 modals | steps Card 9, Group 7, Field 6, Cell 5, ValueBar 4, Switch 3, Fine 2 (`SkinGeometry.Design`) |
+| Type | Geist for words, Geist Mono for measurements (`Font.Mono`, `NotaFonts.Mono*`; 181 code uses in 132 files plus the `TextBlock.Mono/.Readout/.Value/.Eyebrow` classes) | Geist only, tabular figures app-wide; Geist Mono files and the role removed |
+
+The type scale (sizes) also moved (e.g. Readout 13 → 16) but sizes are layout and stay
+out of scope (spec, Out of scope).
+
+**Consequence.** The classic palettes are the current files with 5 values reverted and
+15 new tokens given classic values; the corner scale is a geometry; the type work is
+mostly restoring a role at known call sites.
+
+## R2 — Where the Look lives and how it is stored
+
+**Decision.** A new `Settings.Look` string (`""` = new, `"classic"`), next to
+`Settings.Accent`. A pure `Look` enum and `Looks.Resolve(Settings)` in
+`Nota.Application` (unknown value → New), so the smoke test walks it like
+`Appearance.Resolve`. `AppearanceChoice` is unchanged: the look is orthogonal to which
+theme is worn.
+
+**Rationale.** Matches how the accent (spec 084) is stored and worn: one user-wide value,
+applied over whichever theme is active. Keeps follow-system, the theme pickers and their
+migration logic untouched.
+
+**Alternatives.** Folding Look into `AppearanceChoice` — touches every theme-pick path
+for no gain. Classic as extra theme ids — rejected by the user in favour of a switch.
+
+## R3 — Composing theme × look × skin
+
+**Decision.** `NotaThemeService.ApplyActive` builds the worn theme in this order:
+
+1. Pick the theme (stored choice, try-on or fallback) — unchanged.
+2. **Colours**: under Classic, a built-in theme is replaced by its classic palette
+ (same id, kind and name); a user skin keeps its own colours.
+3. **Accent** (`NotaAccent.Wear`) over the result — unchanged, so the accent option works
+ under both looks.
+4. **Geometry**: `Looks.Compose(skinGeometry, look)`:
+ - typeface: the skin's `font.family` if set, else Geist (both looks);
+ - radii: if the skin has a `radius` object, the skin's radii; else, under Classic, the
+ classic geometry (R4), under New the design scale;
+ - values typeface: the skin's `font.values` (R6) if set, else Geist under New and
+ Geist Mono under Classic.
+5. `NotaSkin.Set(geometry)` + `NotaFonts.SetMeasure(family)` (R5), re-coerce and repaint
+ — the path a theme switch already takes, so the switch is live with no restart.
+
+`Worn(theme)` (theme cards, Nota Remote) does **not** apply the look: Remote keeps the new
+look (spec, Edge Cases) and theme cards show each theme's own colours under the worn look
+via a separate `WornForCard`.
+
+**Rationale.** One switch point, the same one theme/accent/skin changes go through;
+"skin wins where it sets something" falls out of `Compose`. A skin's `radius` is treated
+as a whole (scale and steps belong together), which is simpler to explain than per-step
+merging.
+
+**Alternatives.** Per-step merge of skin steps over classic steps — a skin with
+`scale: 0.5` and no steps would then get classic steps, contradicting its own scale.
+
+## R4 — The classic corner scale on today's steps
+
+**Decision.** Classic geometry = `Roundness 0.4`, steps **Card 3, Group 3, Field 3,
+Cell 2, ValueBar 2, Switch 2, Fine 2**.
+
+**Rationale.** The skin overlay maps radii **by value** (`SkinGeometry.MapRadius`): every
+control written with 9 becomes Card's radius, and so on. Two 0.59.2 distinctions no
+longer have a value of their own: modal windows share Card (9) with device cards, and
+clips share Field (6) with fields and dropdowns. So under Classic modals get 3 (were 4)
+and clips 3 (were 2); plot bars on Fine get 2 (were 1). These three are the only
+deviations from 0.59.2 and are recorded in the spec (FR-008). Off-scale radii (pills, 8,
+10…) scale by 0.4 — close to 3/9 while pills stay round.
+
+**Alternatives.** New steps `Modal` and `Clip` — they would need distinct design values
+(the overlay keys on values), i.e. changing the new look's radii, which #572 rules out.
+A per-control classic radius table — a second radius system to maintain forever.
+
+## R5 — The values-and-readouts role
+
+**Decision.**
+- XAML: a new resource `Font.Measure`, a `FontFamily` set by the theme service into
+ `Application.Resources` and read with `{DynamicResource Font.Measure}` by the
+ `TextBlock.Mono`, `.Readout`, `.Value`, `.Eyebrow` classes and by the 0.59.2 markup that
+ named `Font.Mono` directly. `NotaTheme.axaml` defines its default as the Geist URI.
+- Code: `NotaFonts.Measure`, `MeasureMedium`, `MeasureBold` become properties over a
+ current measure family (`NotaFonts.SetMeasure`), read at render time;
+ `NotaFormattedText` keeps tabular figures on.
+- Under New the family **is** Geist (same URI as `Font.UI`), so every role use renders
+ exactly as today (SC-004) and a skin's `font.family` still reaches it through the
+ existing overlay (`NotaSkin.IsGeist`). Under Classic it is Geist Mono, which the overlay
+ leaves alone; a skin's `font.values` replaces either.
+
+**Inventory (FR-009, clarified).** The role goes exactly where 0.59.2 used mono: the
+call sites are recovered from the #296 commit (`cbd77012`), whose hunks replaced
+`NotaFonts.Mono*` / `Font.Mono` with `NotaFonts.Sans*` / `Font.UI`; a helper script lists
+them by file and line on `develop`. Where a 0.59.2 surface was redrawn, the same value
+on the same device/panel/bar takes the role (judged per hunk). Uses of the four role
+classes **added after 0.59.2** are moved to a words class (`TextBlock.Number`, Geist with
+tabular figures in both looks) so they stay Geist under Classic.
+
+**Rationale.** A dynamic resource changes live with no overlay bookkeeping and costs
+nothing under New. The inventory is bounded by 0.59.2, so the work is finite and
+reviewable per file.
+
+**Alternatives.** An overlay mapping Geist→Geist Mono per element (like `NotaSkin`) —
+cannot tell a value from a word without the role anyway. Making every number mono —
+rejected in clarification.
+
+## R6 — Theme file format 3
+
+**Decision.** `formatVersion: 3` allows `font.values` (a family name, 1–100 chars) and
+makes `font.family` optional when `font.values` is present. Format 1 and 2 files load
+unchanged; the writer emits 3 only when `font.values` is set. Older Nota reports a
+format-3 file as F1 (format version) — the existing behaviour for unknown versions.
+Validation: V2′ names `font.values`; W1 also warns when the values family is not
+installed (falls back to the look's default).
+
+**Rationale.** One new optional key, the same shape as `font.family`; the version bump is
+what older builds already understand as "newer than me".
+
+**Alternatives.** A top-level `measureFont` key — two places for type; `font.mono` —
+the role is about values, not about the face being monospaced.
+
+## R7 — Classic palettes as data
+
+**Decision.** Four embedded files `Theme/Themes/Classic/<id>.json` (format 1, same ids,
+names and kinds as the built-ins), loaded into a lookup by id, never listed as themes.
+Their 107 old tokens equal `v0.59.2`; the 15 new tokens take values that read like
+0.59.2:
+
+| New token | Classic value from (0.59.2 look) |
+|---|---|
+| `Well`, `WellTrack` | the 0.59.2 control fill (`Control`/`SurfaceRaised`) and track fill |
+| `KnobTrack`, `Groove` | the 0.59.2 knob/slider track colour |
+| `DeviceSection`, `DeviceSectionEdge`, `DeviceHeader`, `Bevel` | the 0.59.2 card body, its rule, card header, and transparent bevel |
+| `AccentSoft` | the 0.59.2 selection tint |
+| `KnobCap` | the 0.59.2 knob face |
+| `MeterSafe`, `MeterHot`, `MeterOver` | the 0.59.2 meter green / amber / red |
+| `TrackHeaderSelected`, `LaneSelected` | the 0.59.2 selected-row fill |
+
+Exact sources are picked per theme in implementation by reading the 0.59.2 styles that
+drew those parts, and noted in the file's sidecar comment table in DESIGN.md.
+
+**Rationale.** Data, not code: the existing loader, validator and catalogue apply; a test
+can compare against a committed snapshot of the tag (CI clones may be shallow, so the
+test does not read git).
+
+## R8 — Readability rule for classic palettes
+
+**Decision.** Classic palettes must pass F1–F6. T3 readability (W2) may warn only on
+pairings whose tokens all existed in 0.59.2 **and** whose values equal 0.59.2
+(clarified: keep 0.59.2 exactly). A pairing involving one of the 15 new tokens must
+pass. The smoke test enforces this with the 15-token list.
+
+## R9 — Design checks
+
+**Decision.** `DesignTokenCheck.RunType` changes from "one typeface" to "two roles":
+`Font.UI` and `Font.Measure` are the only families in the theme, `Font.Measure` defaults
+to the Geist URI (so New is one typeface), `NotaFonts` has `UiUri` and `MeasureMonoUri`;
+`assets/fonts` holds the four Geist and four Geist Mono weights and nothing else;
+`LICENSES/OFL-1.1-Geist.txt` covers both (Geist Mono is the same family, same licence —
+it shipped this way until #296); views still never name a family by string. Radius checks
+are unchanged (classic is a geometry, not new literals). A new check: every built-in has
+a classic palette with the full catalogue.
+
+## R10 — Startup, previews, MCP
+
+**Decision.**
+- Startup: `App` resolves `Looks.Resolve(settings)` and passes it with the appearance
+ choice to `NotaThemeService.Set` before the splash/first window, so the first frame is
+ classic.
+- Previews: `RenderScoped` gains a look argument; skin previews render in the named look.
+- MCP: `list_themes` → `choice.look`; new tool `set_look` (`new` | `classic`, UI thread,
+ stored, Preferences refresh); `preview_theme` and `get_theme` gain optional `look`
+ (default: the worn look). `get_theme` with `look: classic` on a built-in returns the
+ classic palette, so it can be saved as a user skin.
+- Duplicate (Preferences → Skins) copies the colours worn under the current look.
+
+## R11 — Risks
+
+- **Clipping under Geist Mono.** Mono digits are wider than Geist tabular; some redrawn
+ cards are tight (260 px rule). Mitigation: preview set at 100 % and the largest UI scale
+ under Classic, checked by hand per surface (quickstart); fix by role-local tweaks only
+ where clipping appears (no layout size changes, FR-005).
+- **Static typeface caches.** Views that cached `NotaFonts.Mono` in `static readonly`
+ fields in 0.59.2 must read the property at render time, or they miss a live switch.
+ Covered by the inventory review.
+- **Maintenance.** New tokens need a classic value (enforced by the catalogue check).
+
+## R12 — Solid clips (scope widened, User Story 4)
+
+**Decision.** `Settings.ClipStyle` string: `""` (follow the look), `"solid"`, `"tinted"`;
+`Looks.ClipStyleOf(Settings)` resolves it with the stored look (unknown → follow). MainWindow
+sets `ArrangementView.ClipStyle` from settings at start and on `Settings.Changed` — the path
+`ArrangementWaveform` takes; the Look switch saves settings, so a follow-the-look style
+changes with it. `DrawClipBody` gets the 0.59.2 branch back for Solid: the body in the track
+colour, the 12 px title band (`ClipBand`: 30 % toward `ShadeDown`; the accent when selected)
+with the name in `InkOn(band)`, content in `ClipInk` (58 % toward `ShadeDown`), no outline,
+2 px band on a short row. Corners use today's clip step (`NotaRadius.FieldValue`), so Classic
+gives 3 and New 6. The name keeps today's type size and the words role.
+
+**Rationale.** Code from the tag, behind one switch; Tinted is untouched, so New stays
+pixel-identical. Session slots were a tint in 0.59.2 as well, so they are left out.
+
+**Alternatives.** A third "Follow look" option in the control — the stored `""` already
+means that, and two options are what the issue agreed.
diff --git a/specs/091-classic-look/role-sites.md b/specs/091-classic-look/role-sites.md
new file mode 100644
index 00000000..5128b401
--- /dev/null
+++ b/specs/091-classic-look/role-sites.md
@@ -0,0 +1,285 @@
+# Values-role sites (spec 091, FR-009)
+
+Generated by `scripts/classic-role-sites.py` from the #296 commit (`cbd77012`): every line
+where 0.59.2 set a value in Geist Mono, and where that line is on HEAD now. "?" rows were
+redrawn or removed by the new look; each was resolved by hand during T020–T022 — restored on
+the same value where it still exists (e.g. the NumFace fields, the card text helpers, the
+Preferences and Remote readouts), or gone with the redraw (the instrument cards' meta line,
+Twin's value text, the piano-roll expression tabs, Monolith and Volt filter labels).
+
+| file | head line | 0.59.2 (removed) | #296 (added) |
+|---|---|---|---|
+| Nota.App/ArrangementView.Controls.cs | 192,223 | `FlowDirection.LeftToRight, NotaFonts.Mono, NotaType.Axis, RulerText);` | `var ft = new NotaFormattedText((bar + 1).ToString(), CultureInfo.InvariantCulture,` |
+| Nota.App/ArrangementView.Controls.cs | 205 | `NotaFonts.Mono, NotaType.Axis, RulerText).Width / 10;` | `if (_charW <= 0 \|\| _charWStep != NotaTextSize.Step) // re-measure when Text size changes` |
+| Nota.App/ArrangementView.Controls.cs | 192,223 | `FlowDirection.LeftToRight, NotaFonts.Mono, NotaType.Axis, RulerText);` | `var ft = new NotaFormattedText(RulerLabels.Time(t, stepS, NotaNum.Culture), CultureInfo.InvariantCulture,` |
+| Nota.App/ArrangementView.Controls.cs | 280 | `FlowDirection.LeftToRight, NotaFonts.Mono, NotaType.Axis, ReadoutText);` | `var ft = new NotaFormattedText(_o.LoopReadout(), CultureInfo.InvariantCulture,` |
+| Nota.App/ArrangementView.Overview.cs | ? | `_overviewRange.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `` |
+| Nota.App/ArticulationMapManager.cs | 687 | `Text = shown, FontSize = 11, FontFamily = NotaFonts.MonoFamily, Height = NotaSize.Shell, MinHeight = 0, Width = 52,` | `Text = shown, FontSize = 11, FontFamily = NotaFonts.UiFamily, Height = NotaSize.Shell, MinHeight = 0, Width = 52,` |
+| Nota.App/AudioClipEditorView.cs | 700 | `private static readonly Typeface GridFace = NotaFonts.Mono;` | `private static readonly Typeface GridFace = NotaFonts.Sans;` |
+| Nota.App/ClipEditorKit.cs | 61 | `Text = NotaText.Label(kind), FontFamily = NotaFonts.MonoFamily, FontSize = 10,` | `Text = kind.Length > 4 ? char.ToUpperInvariant(kind[0]) + kind[1..].ToLowerInvariant() : kind,` |
+| Nota.App/ClipEditorKit.cs | 239 | `Text = text, FontFamily = NotaFonts.MonoFamily, FontSize = size, Foreground = fg ?? NotaPalette.TextPrimary,` | `Text = text, FontFamily = NotaFonts.UiFamily, FontSize = size, Foreground = fg ?? NotaPalette.TextPrimary,` |
+| Nota.App/CommandPaletteView.cs | 211 | `new Run(_results.LayoutHint) { FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextPrimary },` | `new Run(_results.LayoutHint) { FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextPrimary },` |
+| Nota.App/CommandPaletteView.cs | 513 | `Text = label, FontSize = fontSize, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextStrong,` | `Text = label, FontSize = fontSize, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextStrong,` |
+| Nota.App/CommandPaletteView.cs | 520 | `Text = text, FontSize = size, FontFamily = NotaFonts.MonoFamily, Foreground = ink, VerticalAlignment = VerticalAlignment.Center,` | `Text = text, FontSize = size, FontFamily = NotaFonts.UiFamily, Foreground = ink, VerticalAlignment = VerticalAlignment.Center,` |
+| Nota.App/CommandPaletteView.cs | 553 | `new TextBlock { Text = MenuKit.Keys("⌘Z"), FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextSecondary, Vertica` | `new TextBlock { Text = Loc.T("common.undo"), FontSize = 10, Foreground = NotaPalette.Accent, VerticalAlignment = VerticalAlignment.Center },` |
+| Nota.App/Controls/ArpGrid.cs | 113 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ChamberViews.cs | 33 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ChordKeysViz.cs | 95 | `FlowDirection.LeftToRight, new Typeface(NotaFonts.MonoFamily), 6, Label);` | `var ft = new NotaFormattedText(DeviceCardKit.NoteName(_start + o * 12), System.Globalization.CultureInfo.InvariantCulture,` |
+| Nota.App/Controls/CompViews.cs | 24 | `=> new(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `public static FormattedText Text(string t, IBrush ink, double size = NotaGraph.AxisSize)` |
+| Nota.App/Controls/CompViz.cs | 21 | `private static readonly Typeface Face = NotaFonts.Mono;` | `private static readonly Typeface Face = NotaFonts.Sans;` |
+| Nota.App/Controls/ConsortViews.cs | ? | `private static readonly Typeface Mono = NotaFonts.Mono;` | `` |
+| Nota.App/Controls/ConsortViews.cs | 251,301,365,446,654 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ConsortViews.cs | 251,301,365,446,654 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ConsortViews.cs | 251,301,365,446,654 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ConsortViews.cs | 251,301,365,446,654 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ConsortViews.cs | 251,301,365,446,654 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ControlExtensions.cs | 13 | `/// <paramref name="key"/> (e.g. "Brush.TextPrimary", "Font.Mono").` | `/// <paramref name="key"/> (e.g. "Brush.TextPrimary", "Font.UI").` |
+| Nota.App/Controls/DelayViews.cs | 104 | `=> new(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `// ---- geometry ------------------------------------------------------------------` |
+| Nota.App/Controls/DragNumber.cs | 42 | `_display.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `if (fontSize >= NotaType.Readout) _display.FontWeight = FontWeight.Medium; // a toolbar value: 17 / 500` |
+| Nota.App/Controls/DragNumber.cs | 51 | `_editor.BindResource(TextBox.FontFamilyProperty, "Font.Mono");` | `_editor.BindResource(TextBox.FontFamilyProperty, "Font.UI");` |
+| Nota.App/Controls/DynamicEqCurve.cs | 419 | `mono ? (bold ? NotaFonts.MonoBold : NotaFonts.Mono) : bold ? NotaFonts.SansSemiBold : NotaFonts.Sans, size, ink);` | `=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,` |
+| Nota.App/Controls/Eq3Views.cs | 183 | `var ft = new FormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, 7, ink);` | `var ft = new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, NotaType.Axis, NotaPalette.TextTe` |
+| Nota.App/Controls/Eq3Views.cs | 246 | `text = new FormattedText(Eq3Math.Hz(f), CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, 7, NotaPalette.TextSecondar` | `double f = which == 0 ? _f1 : _f2, w = Bounds.Width;` |
+| Nota.App/Controls/Eq3Views.cs | 444 | `NotaFonts.Mono, 7, _kill[b] ? NotaPalette.TextTertiary : NotaPalette.TextPrimary);` | `names[b] = new NotaFormattedText(NotaText.Label(Eq3Math.Names[b]), CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, ` |
+| Nota.App/Controls/Eq8Views.cs | 463 | `mono ? (bold ? NotaFonts.MonoBold : NotaFonts.Mono) : bold ? NotaFonts.SansSemiBold : NotaFonts.Sans, size, ink);` | `=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,` |
+| Nota.App/Controls/GroupBandsLayer.cs | 81 | `FlowDirection.LeftToRight, NotaFonts.Mono, 9, NotaPalette.TextSecondary)` | `? new NotaFormattedText("+" + b.Hidden.ToString(CultureInfo.CurrentCulture), CultureInfo.CurrentCulture,` |
+| Nota.App/Controls/KeysViews.cs | 123 | `=> new(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `=> new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);` |
+| Nota.App/Controls/LengthGateViz.cs | 151 | `var tag = Text(Ms(nt.Out * msPerBeat), NotaFonts.Mono, 7, lit ? FillLit : TagInk);` | `var tag = Text(Ms(nt.Out * msPerBeat), NotaFonts.Sans, NotaType.KnobValue, lit ? FillLit : TagInk);` |
+| Nota.App/Controls/LengthGateViz.cs | 165 | `var name = Text(DeviceCardKit.NoteName(inp.Key), NotaFonts.Mono, 8, lit ? FillLit : Label);` | `var name = Text(DeviceCardKit.NoteName(inp.Key), NotaFonts.Sans, NotaType.KnobValue, lit ? FillLit : Label);` |
+| Nota.App/Controls/LengthGateViz.cs | 166 | `var vel = Text($"vel {inp.Vel}", NotaFonts.Mono, 6, VelInk);` | `var vel = Text($"vel {inp.Vel}", NotaFonts.Sans, NotaType.RowLabel, VelInk);` |
+| Nota.App/Controls/LengthGateViz.cs | 175 | `var ft = Text(s, NotaFonts.Mono, 7, Axis);` | `var ft = Text(s, NotaFonts.Sans, NotaType.RowLabel, Axis);` |
+| Nota.App/Controls/LensViews.cs | 158 | `mono ? NotaFonts.Mono : NotaFonts.SansMedium, size, ink), new Point(x, y));` | `=> ctx.DrawText(new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,` |
+| Nota.App/Controls/LensViews.cs | 162 | `mono ? NotaFonts.Mono : NotaFonts.SansMedium, size, NotaPalette.TextPrimary).Width;` | `=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,` |
+| Nota.App/Controls/MeterFader.cs | 134 | `NotaFonts.Mono, 7, NotaPalette.TextDisabled);` | `var t = new NotaFormattedText(MarkText[i], System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight,` |
+| Nota.App/Controls/MonolithViews.cs | ? | `private static readonly Typeface Mono = NotaFonts.Mono;` | `` |
+| Nota.App/Controls/NaBadge.cs | 46 | `_label.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_label.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/Controls/NotaGraph.cs | 65 | `=> new(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink ?? AxisInk);` | `/// <summary>An axis label at the column-head size, faint ink. Text size leaves it alone (devices'` |
+| Nota.App/Controls/NotaGraph.cs | 140 | `var ft = new FormattedText(label, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, 8, ink);` | `var ft = new NotaFormattedText(label, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, AxisSize, ink, NotaTextSize.I` |
+| Nota.App/Controls/OperatorAlgoViz.cs | 91,154 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/OperatorAlgoViz.cs | 91,154 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/PanBar.cs | 22 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `public const double W = 40;` |
+| Nota.App/Controls/PendulumViews.cs | 29 | `=> new(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `public static FormattedText Mono(string t, IBrush ink, double size = NotaGraph.AxisSize)` |
+| Nota.App/Controls/PentadViews.cs | ? | `private static readonly Typeface Mono = NotaFonts.Mono;` | `` |
+| Nota.App/Controls/PentadViews.cs | 123 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/PrismViews.cs | 39 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/RandomOutputViz.cs | 173 | `=> new(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);` |
+| Nota.App/Controls/ReverbViews.cs | 181 | `=> new(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `private static FormattedText Text(string t, IBrush ink, double size = NotaGraph.AxisSize)` |
+| Nota.App/Controls/RhythmViews.cs | 31 | `=> new(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `public static FormattedText Mono(string t, IBrush ink, double size = NotaGraph.AxisSize)` |
+| Nota.App/Controls/ScaleNoteMap.cs | 154 | `var mono = NotaFonts.Mono;` | `var mono = NotaFonts.Sans;` |
+| Nota.App/Controls/SynthViz.cs | 45 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/TwinViews.cs | 471 | `var mono = NotaFonts.Mono;` | `var mono = NotaFonts.Sans;` |
+| Nota.App/Controls/TwinViews.cs | ? | `FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.KnobValue, Foreground = NotaPalette.TextPrimary,` | `` |
+| Nota.App/Controls/TwinViews.cs | 658 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface Mono = NotaFonts.Sans;` |
+| Nota.App/Controls/ValueBar.cs | 25 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/Controls/ValueEntry.cs | 377 | `Text = was, FontFamily = font?.FontFamily ?? NotaFonts.MonoFamily, FontSize = fontSize,` | `Text = was, FontFamily = font?.FontFamily ?? NotaFonts.UiFamily, FontSize = fontSize,` |
+| Nota.App/Controls/VoltEnv.cs | 65 | `private static readonly Typeface Face = NotaFonts.Mono;` | `private static readonly Typeface Face = NotaFonts.Sans;` |
+| Nota.App/Controls/VoltFilter.cs | ? | `private static readonly Typeface Face = NotaFonts.Mono;` | `` |
+| Nota.App/Controls/VoltMatrix.cs | 36 | `private static readonly Typeface Face = NotaFonts.Mono;` | `private static readonly Typeface Face = NotaFonts.Sans;` |
+| Nota.App/DeviceCardKit.cs | 78 | `value.FontFamily = NotaFonts.MonoFamily;` | `value.LineHeight = 9;` |
+| Nota.App/DeviceCardKit.cs | 236 | `FontFamily = NotaFonts.MonoFamily, FontSize = 9, TextAlignment = TextAlignment.Right,` | `FontFamily = NotaFonts.UiFamily, FontSize = 9, TextAlignment = TextAlignment.Right,` |
+| Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs | 138 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs | 88 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/AutoPanDeviceBody.cs | 87 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs | 208 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs | 117 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs | 136 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs | 139 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/ChorusDeviceBody.cs | 95 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs | 114 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs | 104 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs | 107 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs | 91 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs | 118 | `num.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `num.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs | 74 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/EqDeviceBody.cs | 98 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/FlangerDeviceBody.cs | 92 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs | 111 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/LensDeviceBody.cs | 121 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/PhaserDeviceBody.cs | 95 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/PhaserDeviceBody.cs | 208 | `foreach (var tb in stageSeg.GetLogicalDescendants().OfType<TextBlock>()) tb.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `i => { SetP(Stages, i / (double)(PhaserMath.StageCounts.Length - 1)); RefreshAll(); }, out var stageSync, padX: 5);` |
+| Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs | 125 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs | 103 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs | 143 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs | 177 | `barNum.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `// ---------- transport ----------` |
+| Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs | 232 | `idxTxts[i].BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var idx = Mono($"{i + 1}", 9, TextTertiary); idx.Width = 8;` |
+| Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs | 233 | `dbTxts[i].BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var nameTxt = new TextBlock { Text = $"Layer {i + 1}", FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = TextPrimary, Width = 46,` |
+| Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs | 279 | `var val = new TextBlock { FontFamily = NotaFonts.MonoFamily, FontSize = 9, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.C` | `float def = p switch { Feedback => 100f, Speed => 1f, _ => 0f };` |
+| Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs | 136 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/ValveDeviceBody.cs | 119 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/VintageDeviceBody.cs | 111 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Bodies/VocoderDeviceBody.cs | 97 | `{ Text = t, FontSize = fs, Foreground = c, FontFamily = NotaFonts.MonoFamily, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, Foreground = c, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/DeviceParamControls.cs | 45,120 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/DeviceParamControls.cs | 45,120 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/InstrumentControls.cs | 33 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs | 169 | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.MonoFamily,` | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs | ? | `var meta = new TextBlock { FontSize = 8, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.Mo` | `` |
+| Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs | 259 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs | 274 | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily,` | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs | 110 | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.MonoFamily,` | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs | ? | `var meta = new TextBlock { FontSize = 8, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.Mo` | `` |
+| Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs | 134 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs | 155 | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily,` | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs | 123 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs | ? | `var meta = new TextBlock { FontSize = 8, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.Mo` | `` |
+| Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs | 112 | `Text = t, FontSize = NotaType.Axis, Foreground = c ?? TextTertiary, FontFamily = NotaFonts.MonoFamily,` | `Text = t, FontSize = NotaType.Axis, Foreground = c ?? TextTertiary, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs | 142 | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.MonoFamily,` | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs | ? | `var meta = new TextBlock { FontSize = 8, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.Mo` | `` |
+| Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs | 181 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs | 192 | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily,` | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs | ? | `meta.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `` |
+| Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs | 219 | `bark.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var bark = new TextBlock { FontSize = 8, Foreground = DeviceCardKit.ModInkBright, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs | 241 | `pedalTxt.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `pedalTxt.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs | 372 | `voicesLine.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `voicesLine.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs | 418 | `chain.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `chain.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs | 85 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs | 174 | `valTxt.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `valTxt.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs | 235 | `mt.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `mt.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/MosaicInstrumentCard.cs | 184 | `Text = t, FontSize = fs, Foreground = c ?? TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `Text = t, FontSize = fs, Foreground = c ?? TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/MosaicInstrumentCard.cs | 1190 | `new TextBlock { Text = where, FontSize = 8, Foreground = TextPrimary, FontFamily = NotaFonts.MonoFamily, TextWrapping = TextWrapping.Wrap },` | `new TextBlock { Text = where, FontSize = 8, Foreground = TextPrimary, FontFamily = NotaFonts.UiFamily, TextWrapping = TextWrapping.Wrap },` |
+| Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs | ? | `meta.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `` |
+| Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs | 131 | `tb.FontFamily = NotaFonts.MonoFamily;` | `tb.FontFamily = NotaFonts.UiFamily;` |
+| Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs | 145 | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily,` | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs | 103 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs | 119 | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` | `{ var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBloc` |
+| Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs | 111 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs | 152 | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily,` | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs | 124 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs | 328 | `if (sampleMode) fileText.FontFamily = NotaFonts.MonoFamily;` | `if (sampleMode) fileText.FontFamily = NotaFonts.UiFamily;` |
+| Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs | 98 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs | ? | `meta.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `` |
+| Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs | 214 | `hint.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `hint.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs | 406 | `tb.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs | 480 | `var legendText = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily, Foreground = TextSecondary, HorizontalAli` | `var legendText = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, HorizontalAlign` |
+| Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs | 580 | `var routeCount = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily, Foreground = TextSecondary, VerticalAlign` | `var routeCount = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, VerticalAlignme` |
+| Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs | 742 | `var stepInfo = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily, Foreground = TextSecondary, VerticalAlignme` | `var stepInfo = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, VerticalAlignment` |
+| Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs | 873 | `var value = new TextBlock { Width = 30, FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily, Foreground = TextPrimary, Vertical` | `var value = new TextBlock { Width = 30, FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary, VerticalAl` |
+| Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs | 1135 | `Text = t, FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.KnobValue, VerticalAlignment = VerticalAlignment.Center,` | `Text = t, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobValue, VerticalAlignment = VerticalAlignment.Center,` |
+| Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs | 149 | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.MonoFamily,` | `FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs | ? | `var meta = new TextBlock { FontSize = 8, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.Mo` | `` |
+| Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs | 174 | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.MonoFamily,` | `VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs | 191 | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.MonoFamily,` | `Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/DeviceCards/Midi/ArpMidiBody.cs | 70 | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.MonoFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/Midi/ChordMidiBody.cs | 134 | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.MonoFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/Midi/GenericMidiBody.cs | 34 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Midi/LengthMidiBody.cs | 116 | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.MonoFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/Midi/RandomMidiBody.cs | 93 | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.MonoFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/Midi/ScaleMidiBody.cs | 95 | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.MonoFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/Midi/VelocityMidiBody.cs | 155 | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.MonoFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` | `{ Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/DeviceCards/PluginCard.cs | 184 | `Text = value, FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.Value, Foreground = TextPrimary,` | `Text = value, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Value, Foreground = TextPrimary,` |
+| Nota.App/DeviceCards/PluginCard.cs | 197 | `Text = NotaText.Label(text), FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.KnobLabel,` | `Text = NotaText.Label(text), FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobLabel,` |
+| Nota.App/DeviceCards/PluginCard.cs | 237 | `var count = new TextBlock { FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.KnobValue, Foreground = TextTertiary, VerticalAlignment =` | `var count = new TextBlock { FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobValue, Foreground = TextTertiary, VerticalAlignment = V` |
+| Nota.App/DeviceCards/PluginCard.cs | 248 | `var pageText = new TextBlock { FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.KnobValue, Foreground = TextSecondary, VerticalAlignme` | `var pageText = new TextBlock { FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobValue, Foreground = TextSecondary, VerticalAlignment` |
+| Nota.App/DeviceCards/Rack/MacroPanel.cs | 151 | `var value = new TextBlock { Text = Pct(Value(e, s, m)), FontSize = 7, FontFamily = NotaFonts.MonoFamily, Foreground = assigned ? TextPrimary` | `var value = new TextBlock { Text = Pct(Value(e, s, m)), FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = assigned ? TextPrimary :` |
+| Nota.App/DeviceCards/Rack/MacroPanel.cs | 300 | `var val = new TextBlock { FontSize = 7, FontFamily = NotaFonts.MonoFamily, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.C` | `var val = new TextBlock { FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Cen` |
+| Nota.App/DeviceCards/Rack/MacroPanel.cs | 318 | `var mm2 = new TextBlock { Text = "min → max", FontSize = 7, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary, VerticalAlignment ` | `var mm2 = new TextBlock { Text = "min → max", FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, VerticalAlignment = ` |
+| Nota.App/DeviceCards/Rack/MacroPanel.cs | 398 | `var vals = new TextBlock { FontSize = 7, FontFamily = NotaFonts.MonoFamily, Foreground = TextSecondary, Width = 46, TextAlignment = TextAlig` | `var vals = new TextBlock { FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, Width = 46, TextAlignment = TextAlignm` |
+| Nota.App/DeviceCards/Rack/RackCard.cs | 245 | `Text = text, FontFamily = NotaFonts.MonoFamily, FontSize = size, Foreground = ink,` | `Text = text, FontFamily = NotaFonts.UiFamily, FontSize = size, Foreground = ink,` |
+| Nota.App/DeviceCards/Rack/RackCardView.Drum.cs | 497 | `if (choke) tb.FontFamily = NotaFonts.MonoFamily;` | `if (choke) tb.FontFamily = NotaFonts.UiFamily;` |
+| Nota.App/DeviceCards/Rack/RackCardView.Drum.cs | 912 | `Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.MonoFamily, VerticalAlignment = VerticalAlignment.Center,` | `Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center,` |
+| Nota.App/DeviceCards/Rack/RackCardView.cs | 565 | `val.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `val.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Rack/RackCardView.cs | 711,735 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Rack/RackCardView.cs | 711,735 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DeviceCards/Sampler/SamplerViews.cs | 37 | `=> new(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Mono, size, ink);` | `=> new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);` |
+| Nota.App/DeviceChainView.Shell.cs | 185 | `private static TextBlock Mono(string t, double w) { var tb = new TextBlock { Text = t, FontSize = 9, Foreground = TextSecondary, Width = w, ` | `private static TextBlock Mono(string t, double w) { var tb = new TextBlock { Text = t, FontSize = 9, Foreground = TextSecondary, Width = w, ` |
+| Nota.App/DeviceChainView.Shell.cs | 211 | `Text = type, FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.Eyebrow,` | `Text = type, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Caption,` |
+| Nota.App/DeviceChainView.cs | 328 | `value.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var value = new TextBlock { Text = Pct(_engine.GetTrackSend(_trackId, bus)), Foreground = TextPrimary };` |
+| Nota.App/DeviceWindow.cs | 338 | `tb.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/DrumPatternView.cs | 637 | `tb.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ExportWindow.cs | 318 | `box.BindResource(TextBox.FontFamilyProperty, "Font.Mono");` | `box.BindResource(TextBox.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ExportWindow.cs | 364 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var t = new TextBlock { Text = text, FontSize = 9, Foreground = fg, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/MenuKit.Rows.cs | 48 | `Text = badge, FontFamily = NotaFonts.MonoFamily, FontSize = NotaType.Value,` | `Text = badge, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Value,` |
+| Nota.App/MidiMapView.cs | 99 | `src.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var src = new TextBlock { Text = _learn.SourceLabel(m), FontSize = 9, Foreground = NotaPalette.TextSecondary, VerticalAlignment = VerticalAl` |
+| Nota.App/MixerView.cs | 820,1090,1172 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/MixerView.cs | 820,1090,1172 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/MixerView.cs | 1102 | `var t = new TextBlock { Text = txt, FontSize = NotaType.Axis, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextTertiary, Hori` | `// The letter is wider than its 3px column, so it borrows room either side` |
+| Nota.App/MixerView.cs | 820,1090,1172 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ModularView.cs | 138 | `hint.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `hint.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ModularView.cs | 142 | `_edgeTipText.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_edgeTipText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ModularView.cs | 197 | `_zoomLabel.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_zoomLabel.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ModularView.cs | 198 | `_statusRight.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_statusRight.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ModularView.cs | 634 | `cvLabel.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `cvLabel.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/ModularView.cs | 1341 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `if (n.Bypassed) return NotaPalette.SurfaceCard;` |
+| Nota.App/MosaicCreateWindow.cs | 302 | `private static TextBlock Mono(string t, IBrush ink, double fs) => new() { Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.` | `private static TextBlock Mono(string t, IBrush ink, double fs) => new() { Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.` |
+| Nota.App/PianoRollView.Expression.cs | 170 | `private static readonly Typeface TabFace = new(NotaFonts.Mono.FontFamily, FontStyle.Normal, FontWeight.Bold);` | `{ (LaneMode.Velocity, Loc.T("piano_roll.expression.vel")), (LaneMode.Bend, Loc.T("piano_roll.expression.bend")), (LaneMode.Pressure, Loc.T("` |
+| Nota.App/PianoRollView.cs | 413 | `private static readonly Typeface Mono = NotaFonts.Mono;` | `private static readonly Typeface NumFace = NotaFonts.Sans;` |
+| Nota.App/PreferencesWindow.Accent.cs | 107 | `var readoutHex = new TextBlock { FontSize = 12, Foreground = TextMuted, FontFamily = NotaFonts.MonoFamily, VerticalAlignment = VerticalAlign` | `var readoutHex = new TextBlock { FontSize = 12, Foreground = TextMuted, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignme` |
+| Nota.App/PreferencesWindow.Accent.cs | 191 | `var hex = new TextBox { Classes = { "field" }, FontSize = 12, FontFamily = NotaFonts.MonoFamily, Height = 22, MinHeight = 22, Width = 216 - ` | `var hex = new TextBox { Classes = { "field" }, FontSize = 12, FontFamily = NotaFonts.UiFamily, Height = 22, MinHeight = 22, Width = 216 - 38` |
+| Nota.App/PreferencesWindow.Models.cs | 68 | `new TextBlock { Text = m.Feature, FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlig` | `new TextBlock { Text = m.Name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = TextPrimary, Margin = new Thickness(0, 0, 8, 0)` |
+| Nota.App/PreferencesWindow.Models.cs | 72 | `new TextBlock { Text = $"{m.Author} · {m.License}", FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary },` | `new TextBlock { Text = $"{m.Author} · {m.License}", FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary },` |
+| Nota.App/PreferencesWindow.Models.cs | 99 | `FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary, HorizontalAlignment = HorizontalAlignment.Right,` | `FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, HorizontalAlignment = HorizontalAlignment.Right,` |
+| Nota.App/PreferencesWindow.Remote.cs | 39 | `FontSize = 12, FontFamily = NotaFonts.MonoFamily, HorizontalAlignment = HorizontalAlignment.Left,` | `FontSize = 11, FontFamily = NotaFonts.UiFamily, HorizontalAlignment = HorizontalAlignment.Left,` |
+| Nota.App/PreferencesWindow.Remote.cs | 42 | `var status = new TextBlock { FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlign` | `var status = new TextBlock { FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignme` |
+| Nota.App/PreferencesWindow.Remote.cs | 96 | `var seen = new TextBlock { Text = live ? Loc.T("preferences.remote.now") : Ago(d.LastSeen), FontSize = 10, FontFamily = NotaFonts.MonoFamily` | `var name = new TextBlock { Text = d.Name, FontSize = 11, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center, TextTrimmin` |
+| Nota.App/PreferencesWindow.Samples.cs | 59 | `var count = new TextBlock { FontSize = 9, FontFamily = NotaFonts.MonoFamily, VerticalAlignment = VerticalAlignment.Center };` | `var count = new TextBlock { FontSize = 8.5, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/PreferencesWindow.Samples.cs | 255 | `new TextBlock { Text = PackKindLabel(p.Kind), FontSize = 9, FontFamily = NotaFonts.MonoFamily, Foreground = TextMuted, VerticalAlignment = V` | `new TextBlock { Text = p.Name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = TextPrimary, Margin = new Thickness(0, 0, 8, 0)` |
+| Nota.App/PreferencesWindow.Samples.cs | 259 | `new TextBlock { Text = $"{p.Author} · {p.Version} · {p.License}", FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiar` | `new TextBlock { Text = $"{p.Author} · {p.Version} · {p.License}", FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary }` |
+| Nota.App/PreferencesWindow.Samples.cs | 296 | `FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary, HorizontalAlignment = HorizontalAlignment.Right,` | `FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, HorizontalAlignment = HorizontalAlignment.Right,` |
+| Nota.App/PreferencesWindow.Store.cs | 78 | `var count = new TextBlock { FontSize = 9, FontFamily = NotaFonts.MonoFamily, VerticalAlignment = VerticalAlignment.Center };` | `var count = new TextBlock { FontSize = 8.5, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/PreferencesWindow.Store.cs | 185 | `new TextBlock { Text = h.Count.ToString(), FontSize = 9, FontFamily = NotaFonts.MonoFamily, Foreground = TextDisabled, VerticalAlignment = V` | `new TextBlock { Text = h.Title, FontSize = 8.5, FontWeight = FontWeight.Medium, Foreground = TextTertiary, VerticalAlignment = VerticalAlign` |
+| Nota.App/PreferencesWindow.Store.cs | 311 | `_dockDetail = new TextBlock { FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlign` | `_dockTitle = new TextBlock { FontSize = 11, FontWeight = FontWeight.Medium, Foreground = TextPrimary, TextWrapping = TextWrapping.Wrap, Vert` |
+| Nota.App/PreferencesWindow.Store.cs | 382 | `new TextBlock { Text = KindLabel(p.Kind), FontSize = 9, FontFamily = NotaFonts.MonoFamily, Foreground = TextMuted, VerticalAlignment = Verti` | `new TextBlock { Text = p.Name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = here ? TextPrimary : TextSecondary, Margin = ne` |
+| Nota.App/PreferencesWindow.Store.cs | 387 | `new TextBlock { Text = $"{p.Developer} · {p.Version} · {p.License}", FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = here ? T` | `new TextBlock { Text = $"{p.Developer} · {p.Version} · {p.License}", FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = here ? Text` |
+| Nota.App/PreferencesWindow.Store.cs | 423 | `Text = NotaNum.Unit(asset.Size / 1048576.0, "0.0", "MB"), FontSize = 10, FontFamily = NotaFonts.MonoFamily,` | `Text = NotaNum.Unit(asset.Size / 1048576.0, "0.0", "MB"), FontSize = 9, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/PreferencesWindow.cs | 239 | `FontSize = 9, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary,` | `FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary,` |
+| Nota.App/PreferencesWindow.cs | 357 | `_latencyValue = new TextBlock { FontSize = 12, FontFamily = NotaFonts.MonoFamily, Foreground = TextPrimary };` | `_latencyValue = new TextBlock { FontSize = 11, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary };` |
+| Nota.App/PreferencesWindow.cs | 358 | `_latencyDetail = new TextBlock { FontSize = 12, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary, TextWrapping = TextWrapping.Wr` | `_latencyDetail = new TextBlock { FontSize = 11, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, TextWrapping = TextWrapping.Wrap` |
+| Nota.App/PreferencesWindow.cs | 784 | `Text = "—", FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = TextTertiary,` | `Text = "—", FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary,` |
+| Nota.App/PreferencesWindow.cs | 840 | `var a = new TextBlock { Text = action, FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = TextPrimary, Margin = new Thickness(12` | `grid.Children.Add(new TextBlock { Text = input, FontSize = 11, Foreground = TextSecondary, Margin = new Thickness(12, 9) });` |
+| Nota.App/PreferencesWindow.cs | 885 | `Text = path, FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = sel ? TextPrimary : TextSecondary,` | `Text = path, FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = sel ? TextPrimary : TextSecondary,` |
+| Nota.App/PreferencesWindow.cs | 1002 | `Text = custom ? get() : resolved(), FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = TextPrimary,` | `Text = custom ? get() : resolved(), FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary,` |
+| Nota.App/PreferencesWindow.cs | ? | `FontSize = 12, FontFamily = NotaFonts.MonoFamily, HorizontalAlignment = HorizontalAlignment.Left,` | `FontSize = 11, FontFamily = NotaFonts.UiFamily, HorizontalAlignment = HorizontalAlignment.Left,` |
+| Nota.App/PreferencesWindow.cs | ? | `FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = TextSecondary,` | `FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary,` |
+| Nota.App/PreferencesWindow.cs | 1648 | `new TextBlock { Text = shown.Count.ToString(), FontSize = 9, FontFamily = NotaFonts.MonoFamily, Foreground = TextDisabled, VerticalAlignment` | `new TextBlock { Text = shown.Count.ToString(), FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextDisabled, VerticalAlignment` |
+| Nota.App/PreferencesWindow.cs | 1729 | `Text = label, FontSize = 11, FontFamily = NotaFonts.MonoFamily, Foreground = TextPrimary,` | `Text = label, FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary,` |
+| Nota.App/PreviewPlayer.cs | 113 | `FontSize = 9, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextTertiary,` | `FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextTertiary,` |
+| Nota.App/PreviewPlayer.cs | 133 | `_timeNow = new TextBlock { FontSize = 10, FontFamily = NotaFonts.MonoFamily, VerticalAlignment = VerticalAlignment.Center };` | `_timeNow = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/PreviewPlayer.cs | 134 | `_timeTotal = new TextBlock { FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextDisabled, VerticalAlignment = Ve` | `_timeTotal = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextDisabled, VerticalAlignment = Verti` |
+| Nota.App/PreviewPlayer.cs | 605 | `if (nameW + 8 + TextW(m, NotaFonts.Mono, 9) <= avail) { meta = m; break; }` | `if (nameW + 8 + TextW(m, NotaFonts.Sans, 9) <= avail) { meta = m; break; }` |
+| Nota.App/PreviewPlayer.cs | 612 | `double now = TextW(_timeNow.Text ?? "", NotaFonts.Mono, 10);` | `double now = TextW(_timeNow.Text ?? "", NotaFonts.Sans, 10);` |
+| Nota.App/PreviewPlayer.cs | 613 | `double total = 3 + TextW(_timeTotal.Text ?? "", NotaFonts.Mono, 10);` | `double total = 3 + TextW(_timeTotal.Text ?? "", NotaFonts.Sans, 10);` |
+| Nota.App/PreviewPlayer.cs | 1083 | `NotaFonts.Mono, 8, NotaPalette.TextPrimary);` | `var ft = new NotaFormattedText(Fmt(f * _duration), NotaNum.Culture, FlowDirection.LeftToRight,` |
+| Nota.App/PreviewPlayer.cs | 1092 | `var ht = new FormattedText(hint, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Mono, 9, NotaPalette.TextTertiary)` | `var ht = new NotaFormattedText(hint, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Sans, 9, NotaPalette.TextTertiary)` |
+| Nota.App/Remote/ConnectPhoneView.cs | 105 | `_code = new TextBlock { FontSize = 24, FontWeight = FontWeight.Medium, LetterSpacing = 4.8, FontFamily = NotaFonts.MonoFamily, Foreground = ` | `_code = new TextBlock { FontSize = 23, FontWeight = FontWeight.Medium, LetterSpacing = 4.8, FontFamily = NotaFonts.UiFamily, Foreground = No` |
+| Nota.App/Remote/ConnectPhoneView.cs | 108 | `_left = new TextBlock { FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextTertiary, VerticalAlignment = Vertica` | `_left = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextTertiary, VerticalAlignment = VerticalAl` |
+| Nota.App/Remote/ConnectPhoneView.cs | 147 | `names.Children.Add(new TextBlock { Text = sub, FontSize = 10, FontFamily = NotaFonts.MonoFamily, Foreground = weak ? NotaPalette.Warning : N` | `names.Children.Add(new TextBlock { Text = d.Name, FontSize = 11, FontWeight = FontWeight.Medium, Foreground = NotaPalette.TextPrimary, TextT` |
+| Nota.App/Remote/ConnectPhoneView.cs | 192 | `first.Children.Add(new TextBlock { Text = host, FontSize = 13, FontFamily = NotaFonts.MonoFamily, Foreground = NotaPalette.TextPrimary, Vert` | `first.Children.Add(new TextBlock { Text = host, FontSize = 12, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextPrimary, Vertic` |
+| Nota.App/Remote/ConnectPhoneView.cs | 204 | `Text = $"{links[i].Name} {links[i].Address}:{_settings.Current.RemotePort}", FontSize = 10, FontFamily = NotaFonts.MonoFamily,` | `Text = $"{links[i].Name} {links[i].Address}:{_settings.Current.RemotePort}", FontSize = 9, FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/SaveChangesWindow.cs | 118 | `FontFamily = NotaFonts.MonoFamily,` | `FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/SessionView.Grid.cs | 135 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/SessionView.Grid.cs | 258 | `arrText.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `arrText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/SessionView.Grid.cs | 273 | `kind.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var kind = new TextBlock { Text = c.KindLabel, FontSize = 8.5, FontWeight = FontWeight.Medium, Foreground = NotaPalette.TextMuted, TextTrimm` |
+| Nota.App/SessionView.Grid.cs | 541 | `var lenFt = Ft(_len, NotaFonts.Mono, 9, playing ? NotaPalette.TextStrong : NotaPalette.TextMuted);` | `var lenFt = Ft(_len, NotaFonts.Sans, 10, playing ? NotaPalette.TextStrong : NotaPalette.TextTertiary);` |
+| Nota.App/SessionView.Grid.cs | 591 | `var lenFt = Ft(FormatDuration(waiting ? 0 : _o._recElapsed), NotaFonts.Mono, 9, NotaPalette.DangerBright);` | `var lenFt = Ft(FormatDuration(waiting ? 0 : _o._recElapsed), NotaFonts.Sans, 9, NotaPalette.DangerBright);` |
+| Nota.App/SessionView.Grid.cs | 871 | `var b = Ft(_badge, NotaFonts.Mono, 9, NotaPalette.TextSecondary);` | `var b = Ft(_badge, NotaFonts.Sans, 9, NotaPalette.TextSecondary);` |
+| Nota.App/SessionView.Grid.cs | 877 | `var idx = Ft((_scene + 1).ToString("00", CultureInfo.CurrentCulture), NotaFonts.Mono, 9, NotaPalette.TextDisabled);` | `var idx = Ft((_scene + 1).ToString("00", CultureInfo.CurrentCulture), NotaFonts.Sans, 9, NotaPalette.TextDisabled);` |
+| Nota.App/SessionView.Inspector.cs | 65 | `hint.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `hint.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/SessionView.Mixer.cs | 253 | `t.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `var t = new TextBlock { FontSize = 8.5, Foreground = NotaPalette.TextMuted, Width = 30, TextAlignment = TextAlignment.Right, VerticalAlignme` |
+| Nota.App/SessionView.Mixer.cs | 399 | `if (mono) tb.BindResource(ToggleButton.FontFamilyProperty, "Font.Mono");` | `if (mono) tb.BindResource(ToggleButton.FontFamilyProperty, "Font.UI");` |
+| Nota.App/SessionView.Toolbar.cs | 62 | `_quantLabel.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_quantLabel = new TextBlock { FontSize = 9, Foreground = NotaPalette.TextPrimary, VerticalAlignment = VerticalAlignment.Center };` |
+| Nota.App/SessionView.Toolbar.cs | 115 | `_posText.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_posText = new TextBlock { FontSize = 11, Foreground = NotaPalette.TextPrimary, MinWidth = 56, VerticalAlignment = VerticalAlignment.Center ` |
+| Nota.App/SessionView.Toolbar.cs | 117 | `_tempoText.BindResource(TextBlock.FontFamilyProperty, "Font.Mono");` | `_posText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");` |
+| Nota.App/SnapChip.cs | 55 | `FontFamily = NotaFonts.MonoFamily, FontSize = 11, VerticalAlignment = VerticalAlignment.Center,` | `FontFamily = NotaFonts.UiFamily, FontSize = 10, VerticalAlignment = VerticalAlignment.Center,` |
+| Nota.App/StereoMapView.cs | 257 | `DrawText(ctx, label, NotaFonts.Mono, 8, NotaPalette.TextTertiary, new Point(x, p.Bottom + 6), hCenter: true);` | `DrawText(ctx, label, NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(x, p.Bottom + 6), hCenter: true);` |
+| Nota.App/StereoMapView.cs | 263 | `DrawText(ctx, label, NotaFonts.Mono, 8, NotaPalette.TextTertiary, new Point(p.Left - 6, y), vCenter: true, rightAlign: true);` | `DrawText(ctx, label, NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(p.Left - 6, y), vCenter: true, rightAlign: true);` |
+| Nota.App/StereoMapView.cs | 326 | `x += DrawText(ctx, "−1", NotaFonts.Mono, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 6;` | `x += DrawText(ctx, "−1", NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 6;` |
+| Nota.App/StereoMapView.cs | 337 | `x += DrawText(ctx, "+1", NotaFonts.Mono, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 10;` | `x += DrawText(ctx, "+1", NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 10;` |
+| Nota.App/StereoMapView.cs | 338 | `DrawText(ctx, Signed(corr, 2), NotaFonts.Mono, 10, corr < PhaseAlarm ? NotaPalette.Danger : NotaPalette.TextSecondary, new Point(x, cy), vCe` | `DrawText(ctx, Signed(corr, 2), NotaFonts.Sans, 10, corr < PhaseAlarm ? NotaPalette.Danger : NotaPalette.TextSecondary, new Point(x, cy), vCe` |
+| Nota.App/StereoMapView.cs | 394 | `DrawText(ctx, v, NotaFonts.Mono, 9, ink, new Point(r.Left + Pad + 62, ty + 6), vCenter: true);` | `DrawText(ctx, v, NotaFonts.Sans, 9, ink, new Point(r.Left + Pad + 62, ty + 6), vCenter: true);` |
+| Nota.App/Theme/NotaFonts.cs | 11 | `// This is the C# side of Font.UI / Font.Mono in Theme/NotaTheme.axaml, for the` | `// This is the C# side of Font.UI in Theme/NotaTheme.axaml, for the custom-drawn layer` |
+| Nota.App/Theme/NotaFonts.cs | ? | `public static readonly FontFamily MonoFamily = new(MonoUri);` | `` |
+| Nota.App/Theme/NotaFonts.cs | 44 | `public static readonly Typeface Mono = new(MonoFamily);` | `/// <summary>Tabular figures: every digit the same width. Applied to all text.</summary>` |
+| Nota.App/Theme/NotaFonts.cs | 45 | `public static readonly Typeface MonoMedium = new(MonoFamily, FontStyle.Normal, FontWeight.Medium);` | `public static readonly FontFeatureCollection Tabular = FontFeatureCollection.Parse("+tnum");` |
+| Nota.App/Theme/NotaFonts.cs | ? | `public static readonly Typeface MonoBold = new(MonoFamily, FontStyle.Normal, FontWeight.Bold);` | `` |
+| Nota.App/Theme/NotaTheme.axaml | ? | `<FontFamily x:Key="Font.Mono">avares://Nota.App/Assets/Fonts#Geist Mono</FontFamily>` | `` |
+| Nota.App/Theme/NotaTheme.axaml | 133 | `FontFamily="{StaticResource Font.Mono}" FontSize="11"` | `FontFamily="{StaticResource Font.UI}" FontSize="10"` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Style Selector="TextBlock.Mono"> <!-- kept for older markup: numbers are Geist like everything else -->` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Style Selector="TextBlock.Readout"> <!-- toolbar values: 16 / 500 -->` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Style Selector="TextBlock.Value"> <!-- a number on a button or in a row: 10.5 / 400 -->` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Style Selector="TextBlock.Eyebrow"> <!-- format badge: 9.5 / 400, muted, as written -->` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Style Selector="TextBlock.KnobValue"> <!-- parameter value: 10 / 400, ink 1 -->` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Style Selector="TextBlock.Axis"> <!-- tick label inside a graph: 10, ink 4 -->` |
+| Nota.App/Theme/NotaTheme.axaml | 81,292,429,841,1016 | `<Setter Property="FontFamily" Value="{StaticResource Font.Mono}"/>` | `<Setter Property="FontFamily" Value="{StaticResource Font.UI}"/>` |
+| Nota.App/WelcomeWindow.cs | 83,113,537 | `FontFamily = NotaFonts.MonoFamily,` | `FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/WelcomeWindow.cs | 83,113,537 | `FontFamily = NotaFonts.MonoFamily,` | `FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/WelcomeWindow.cs | 83,113,537 | `FontFamily = NotaFonts.MonoFamily,` | `FontFamily = NotaFonts.UiFamily,` |
+| Nota.App/WhatsNewWindow.cs | 230 | `if (this.TryFindResource("Font.Mono", out var mono) && mono is FontFamily ff)` | `if (this.TryFindResource("Font.UI", out var mono) && mono is FontFamily ff)` |
diff --git a/specs/091-classic-look/spec.md b/specs/091-classic-look/spec.md
new file mode 100644
index 00000000..c3fac1fb
--- /dev/null
+++ b/specs/091-classic-look/spec.md
@@ -0,0 +1,360 @@
+# Feature Specification: Classic look
+
+**Feature Branch**: `feat/classic-look`
+
+**Created**: 2026-11-11
+
+**Status**: Draft
+
+**Issue**: [nota-daw/nota#572](https://github.com/nota-daw/nota/issues/572)
+
+**Input**: User description: "Classic look: a switch back to the 0.59.2 appearance (issue nota-daw/nota#572). The new look (#296) stays the default; Preferences → Appearance gets a "Look: New / Classic" switch, stored with appearance settings and applied live, working with any of the four colour themes. Classic = the 0.59.2 palettes of the four built-in themes (tokens added in #296 get values that read like 0.59.2), the 0.59.2 corner scale (controls and cards 3, clips 2, bars 1, modals 4) via the skin radius steps from #336, and Geist Mono back in the bundle with a "measurement" text role (values, units, counters, tempo, position): Geist with tabular figures in the new look, Geist Mono in classic. With a user skin worn, the skin wins wherever it sets something (colours always, font and radii when set); Classic supplies radii and fonts the skin leaves unset; skins get an optional second font slot for the measurement role. MCP theme tools can read and set the look; previews render in either. Out of scope: pre-#296 layouts (device cards, toolbar, track headers, control shapes stay as now)."
+
+## Nota Context *(fill in — drives plan and tasks)*
+
+**Feature area** *(pick the main one)*:
+
+- [ ] Engine (C++, `src/native/nota.engine`) — real-time audio rules apply, see `ARCHITECTURE.md` AR table
+- [x] Managed app (C#, `src/managed/*`) — domain, application, infrastructure, presentation
+- [x] UI (Avalonia, `src/managed/Nota.Presentation`) — follow `DESIGN.md` (Studio)
+- [ ] Plugin hosting (`pluginhost/`) — the only place JUCE is allowed
+- [ ] Build / packaging / CI (`scripts/`, `.github/`) — see `BUILD.md`
+- [ ] Docs only
+
+**Nota docs to keep in mind** *(links relative to `specs/<slug>/`, where this file lands)*:
+[`ARCHITECTURE.md`](../../ARCHITECTURE.md) (AR rules),
+[`CONTRIBUTING.md`](../../CONTRIBUTING.md) (licensing, dependency policy, PR
+expectations), [`BUILD.md`](../../BUILD.md), [`DESIGN.md`](../../DESIGN.md),
+[`FEATURES.md`](../../FEATURES.md).
+
+**Related specs**: [038 style guide](../038-style-guide/spec.md) (the new look this
+switches away from), [087 user skins](../087-user-skins/spec.md) (theme file format 2,
+typeface and radius settings, MCP theme tools), [011 colour themes](../011-colour-themes/)
+(the four built-in themes and the token catalogue).
+
+**Background.** Version 0.59.2 is the last release before the new look (#296). Testers
+who tried the new look asked for three things from 0.59.2 back: the colour themes as they
+were, the tighter corners, and the pairing of Geist for words with Geist Mono for values
+and readouts. The new look stays the default; this feature adds a way to choose the
+classic appearance instead. Layouts drawn for the new look (device cards, toolbar, track
+headers, control shapes) are not part of the switch.
+
+## Clarifications
+
+### Session 2026-11-11
+
+- Q: Where does Classic set values in the monospaced face — everywhere, or only where
+ 0.59.2 did? → A: Only where 0.59.2 did; value displays added after 0.59.2 stay in
+ Geist under both looks.
+- Q: If a 0.59.2 colour fails today's readability check, does Classic lift it or keep it?
+ → A: Keep it exactly as in 0.59.2; readability warnings are allowed for the classic
+ palettes.
+
+### Session 2026-11-11 (scope widened)
+
+- Q: Can the classic look also bring back 0.59's solid clips? → A: Yes — #572 was widened
+ with a Clips: Solid / Tinted choice. Solid is 0.59.2's Arrangement clip; Session slots were
+ a tint in 0.59.2 too and are not part of it. The default follows the look (Classic → Solid,
+ New → Tinted); a choice the user makes is kept whatever the look.
+
+## User Scenarios & Testing *(mandatory)*
+
+### User Story 1 - Switch to the classic look (Priority: P1)
+
+A user who prefers 0.59.2 opens Preferences → Appearance and sets **Look** to
+**Classic**. The whole app changes at once, without a restart: the colours of the chosen
+colour theme turn back to their 0.59.2 values, corners become as tight as in 0.59.2, and
+values and readouts (tempo, position, dB, Hz, ms, percentages, counters) are set in a
+monospaced face wherever 0.59.2 set them so, while names and words stay in Geist. On the next launch Nota opens in the
+classic look. Setting Look back to **New** restores today's appearance just as live.
+
+**Why this priority**: This is the request itself. Without it, nothing else matters; with
+only this, the users who asked are served.
+
+**Independent Test**: With a built-in theme worn, flip Look to Classic and compare the
+main window, mixer, a device card and the piano roll against 0.59.2 screenshots of the
+same theme: colours, corners and the two typefaces match; restart and confirm the choice
+held; flip back and confirm today's look returns.
+
+**Acceptance Scenarios**:
+
+1. **Given** a fresh install, **When** the user opens Preferences → Appearance, **Then**
+ Look shows **New** and the app looks exactly as it does before this feature.
+2. **Given** Look is New and a built-in theme is worn, **When** the user picks Classic,
+ **Then** within a moment every open window — main window, Preferences, open plug-in
+ and device windows, menus, dialogs and tooltips opened afterwards — wears the 0.59.2
+ palette of that theme, the 0.59.2 corner scale and the classic typefaces, with no
+ restart and no change to any layout size.
+3. **Given** Look is Classic, **When** the user switches between the four colour themes,
+ **Then** each one appears in its 0.59.2 colours.
+4. **Given** Look is Classic, **When** Nota is quit and started again, **Then** it opens in
+ the classic look, splash and first frame included, with no flash of the new look.
+5. **Given** Look is Classic, **When** the user picks New, **Then** the app returns to
+ today's appearance, live, and the choice is kept.
+
+---
+
+### User Story 2 - Classic with a user skin (Priority: P2)
+
+A user who wears their own skin also likes the classic typefaces and corners. With
+Look set to Classic, the skin's own choices are kept wherever it makes them (its colours
+always; its typeface and radii when it sets them), and Classic fills in what the skin
+leaves open. A skin author can also name a typeface for values and readouts, next to the
+existing typeface for everything else.
+
+**Why this priority**: Skins shipped in #336 just before this; users already wear them,
+and the switch must not silently override a skin or behave unpredictably with one.
+
+**Independent Test**: Wear a skin with no typeface or radius settings, flip to Classic:
+colours stay the skin's, corners and typefaces turn classic. Wear a skin that sets a
+typeface and roundness 0, flip to Classic: nothing the skin sets changes, only the
+values-and-readouts face turns monospaced (if the skin leaves that slot empty).
+
+**Acceptance Scenarios**:
+
+1. **Given** a user skin with colours only, **When** Look is Classic, **Then** the skin's
+ colours are worn unchanged, and corners and typefaces are classic.
+2. **Given** a user skin that sets a typeface and radii, **When** Look is Classic,
+ **Then** the skin's typeface and radii are worn; only what the skin leaves unset comes
+ from Classic.
+3. **Given** a user skin that sets a typeface for values and readouts, **When** worn
+ under either look, **Then** values and readouts use that typeface.
+4. **Given** a skin file in the current format without the new slot, **When** loaded,
+ **Then** it loads as before; a file using the new slot declares a newer format
+ version, and older Nota versions list it as a load problem naming the format version,
+ as they do for any format they do not know.
+5. **Given** a user duplicates a built-in theme while Look is Classic, **When** the copy
+ is created, **Then** it carries the colours the user sees (the 0.59.2 palette), so a
+ classic theme can be the start of a user skin.
+
+---
+
+### User Story 3 - Look from MCP clients (Priority: P3)
+
+An MCP client (an AI assistant designing a skin, or a script) can read which look is
+worn, set it, and render the theme preview images in either look without changing what
+the user sees.
+
+**Why this priority**: The skin design loop from #336 runs over MCP; without this a
+client cannot show or test how a skin reads under Classic.
+
+**Independent Test**: Over MCP, read the current look, set Classic, confirm Preferences
+shows Classic; render previews of one theme in New and in Classic and compare: only
+colours, corners and the two typefaces differ, and the live window did not change.
+
+**Acceptance Scenarios**:
+
+1. **Given** an MCP client, **When** it reads the appearance state, **Then** it learns the
+ current look alongside the current theme.
+2. **Given** an MCP client, **When** it sets the look, **Then** the app changes as from
+ Preferences, stores the choice, and Preferences (if open) shows it.
+3. **Given** an MCP client, **When** it asks for previews of a theme in a named look,
+ **Then** the images show that look and the live window keeps the user's look.
+4. **Given** an MCP client, **When** it reads a built-in theme with a look named,
+ **Then** it receives that look's colours (so the classic palette can be saved as a
+ user skin).
+
+---
+
+### User Story 4 - Solid or tinted clips (Priority: P2)
+
+A user who preferred 0.59's arrangement wants clips drawn as solid blocks of the track
+colour again. Under Classic that is what they get by default; under New clips stay a tint.
+**Preferences → Appearance → Clips: Solid | Tinted** lets anyone pick either, in either look.
+
+**Why this priority**: Users named the solid clips as part of "how it was"; it is the most
+visible surface after the colours.
+
+**Independent Test**: Fresh settings: under New clips are tinted, switch Look to Classic and
+they turn solid; pick Tinted, switch Look back and forth — they stay tinted; restart — the
+pick holds.
+
+**Acceptance Scenarios**:
+
+1. **Given** no clip style was ever picked, **When** Look is New, **Then** Arrangement clips
+ are tinted (today's drawing); **When** Look is Classic, **Then** they are solid.
+2. **Given** Look is Classic, **When** the user picks Tinted, **Then** clips turn tinted at
+ once and stay tinted when Look changes or Nota restarts.
+3. **Given** Look is New, **When** the user picks Solid, **Then** clips turn solid at once:
+ a full track-colour body, a title band in the track colour mixed 30 % toward black (the
+ accent when selected) with the name in readable ink, notes or waveform in the track
+ colour mixed 58 % toward black, no outline.
+4. **Given** solid clips, **When** a clip is short, deactivated, being resized, or shows its
+ ADSR, **Then** each reads as it did in 0.59.2 (a 2 px band on a short row, the dark veil,
+ the trim-edge bar, the curve in the content ink).
+
+---
+
+### Edge Cases
+
+- **Typeface missing.** The classic monospaced face ships with Nota, so it is always
+ present. A skin's values-and-readouts typeface that is not installed falls back to the
+ look's default for that role (Geist with tabular figures under New, the bundled
+ monospaced face under Classic), the same way the skin's main typeface already falls back.
+- **Glyphs the monospaced face lacks** (Cyrillic in the Russian UI, the thin space,
+ symbols like ■ ▾ ✓ ★): per-character fallback, as in 0.59.2; no tofu boxes.
+- **Width of values.** Monospaced digits are wider than Geist's tabular ones. A value that
+ fits its field, cell or knob label under New must not clip, overlap or wrap under
+ Classic at 100 % and at the largest UI scale.
+- **Text sized for Geist.** Where the new look sized a field to its text, Classic must not
+ push neighbouring controls or change layout sizes; the text may be tighter, never cut.
+- **Readability.** A 0.59.2 colour that falls below the readability bar the theme
+ validator enforces today keeps its 0.59.2 value; the validator's readability warnings
+ for it are accepted for the classic palettes and listed in the plan.
+- **Tokens without a 0.59.2 value.** The 15 colour tokens added by the new look (wells,
+ groove, pressed-in device sections, device header, bevel, knob cap, soft accent, meter
+ zones, selected track header and lane) get classic values chosen to read like 0.59.2:
+ e.g. wells and grooves in the 0.59.2 control and track fills, the soft accent as the
+ 0.59.2 selection tint.
+- **Accent option.** The accent choice in Appearance applies under both looks.
+- **Try-on.** An unsaved try-on theme from MCP is worn under the current look; reverting
+ returns to the stored theme under the current look.
+- **Switch while busy.** Changing the look during playback or recording causes no audio
+ dropout and does not stop the transport.
+- **Nota Remote.** The phone remote keeps its own new look; the switch covers the
+ desktop app only.
+
+## Requirements *(mandatory)*
+
+### Functional Requirements
+
+**The switch**
+
+- **FR-001**: Preferences → Appearance MUST offer a **Look** choice with two options,
+ **New** and **Classic**, next to the colour theme choice. New MUST be the default for new
+ and existing installs.
+- **FR-002**: Changing Look MUST apply to every open window at once without a restart,
+ and to every window, menu, dialog and tooltip opened afterwards.
+- **FR-003**: The chosen look MUST be stored with the other appearance settings and worn
+ from the first frame of the next launch, splash included.
+- **FR-004**: Look MUST be independent of the colour theme choice: any of the four
+ built-in themes and any user skin can be worn under either look.
+- **FR-005**: Changing Look MUST NOT change any layout size, control shape, device card
+ arrangement, toolbar, track header or other layout introduced by the new look; it
+ changes colours, corner radii and typefaces only.
+
+**Classic colours**
+
+- **FR-006**: Under Classic, each of the four built-in themes MUST wear its 0.59.2 colour
+ values for every token that existed in 0.59.2.
+- **FR-007**: Under Classic, each colour token added by the new look MUST have a value
+ per built-in theme that reads like 0.59.2. Every classic palette MUST pass the same
+ format checks as the built-in themes do today; readability warnings are allowed where
+ they come from a 0.59.2 value, and only there.
+
+**Classic corners**
+
+- **FR-008**: Under Classic, corners MUST follow the 0.59.2 scale — 3 for controls, cards,
+ panels and popovers, 2 for keys, rows and badges, 0 for docked panels — mapped onto
+ today's radius steps. Where one step now covers parts that differed in 0.59.2, the step
+ takes the controls' value: modal windows and clips get 3 (were 4 and 2), bars inside
+ plots 2 (were 1) (plan, research R4).
+
+**Typefaces**
+
+- **FR-009**: The app MUST distinguish a **values and readouts** text role — numbers with
+ their units, tempo, time position, counters, measurements and format badges — from the
+ role used for names, labels and words. The role MUST cover exactly the value displays
+ that 0.59.2 set in the monospaced face, including those whose surface was redrawn by
+ the new look (the same value on the same device, panel or bar keeps the role). Value
+ displays added after 0.59.2 use the words role (Geist) under both looks.
+- **FR-010**: Under New, the values-and-readouts role MUST look exactly as it does today
+ (Geist with tabular figures); under Classic, it MUST use Geist Mono, which MUST ship with
+ the app again. Names, labels and words use Geist under both looks.
+
+**User skins**
+
+- **FR-011**: When a user skin is worn, its colours MUST be used under both looks; its
+ typeface and radius settings MUST be used where it sets them; Classic MUST supply only
+ the radii and typefaces the skin leaves unset.
+- **FR-012**: The theme file format MUST gain an optional typeface for the
+ values-and-readouts role; files without it MUST load exactly as before; the format's
+ validation MUST report a malformed value with a reason that names the field.
+- **FR-013**: Duplicating a built-in theme MUST copy the colours of the look being worn.
+
+**MCP**
+
+- **FR-014**: The MCP theme tools MUST let a client read the current look and set it; a
+ set MUST behave as the Preferences switch does (live, stored, reflected in Preferences
+ if open, run on the UI thread).
+- **FR-015**: The MCP preview and read tools MUST accept a look, render or return that
+ look without changing the live window, and default to the worn look when none is named.
+
+**Clips**
+
+- **FR-019**: Preferences → Appearance MUST offer **Clips: Solid | Tinted**. Tinted MUST draw
+ Arrangement clips exactly as today. Solid MUST draw them as 0.59.2 did (User Story 4,
+ scenario 3), with today's corner radius for the step clips use.
+- **FR-020**: With no stored pick, the clip style MUST follow the look (Classic → Solid, New
+ → Tinted) and change with it live; a pick MUST be stored and win over the look. Session
+ slots, the clip editors and other views are unchanged.
+
+**Quality**
+
+- **FR-016**: Values and readouts MUST NOT clip, overlap or wrap under Classic on any
+ surface covered by the theme preview set, at 100 % and at the largest UI scale.
+- **FR-017**: The design checks that guard the new look (one typeface, radius scale,
+ token use) MUST keep guarding it under New, and MUST accept Classic's second typeface
+ and corner scale without loosening the checks for New.
+- **FR-018**: All new interface text MUST be available in English and Russian.
+
+### Key Entities
+
+- **Look**: the appearance mode, New or Classic; one per user; stored with the appearance
+ settings; independent of the theme.
+- **Clip style**: Solid or Tinted, or unset (follows the look); one per user.
+- **Classic palette**: per built-in theme, the full set of colour tokens — 0.59.2 values
+ plus classic values for the tokens added since.
+- **Classic corner scale**: the 0.59.2 radii expressed per today's radius steps.
+- **Text role**: *words* (names, labels, prose) or *values and readouts*; each maps to a
+ typeface per look, which a skin may override.
+- **Theme file (skin)**: the #336 format, extended with an optional values-and-readouts
+ typeface.
+
+## Success Criteria *(mandatory)*
+
+### Measurable Outcomes
+
+- **SC-001**: A user can go from the new look to the classic look in under 15 seconds
+ (open Preferences, one choice), and the change shows in under 1 second with no restart.
+- **SC-002**: For each of the four built-in themes, every colour token that existed in
+ 0.59.2 matches its 0.59.2 value under Classic (100 %, no exceptions).
+- **SC-003**: Side-by-side with 0.59.2 on the same theme, testers who asked for the old
+ appearance identify the classic look's colours, corners and typefaces as "the old
+ look" in at least 4 of 5 comparisons (main window, mixer, device card, piano roll,
+ Preferences).
+- **SC-004**: Under New, the theme preview images are identical to those rendered
+ before this feature for every surface drawn from the sample scene (no regression for
+ the default look).
+- **SC-005**: Under Classic, no value or readout is clipped or overlapping on any preview
+ surface at 100 % and the largest UI scale (0 defects in a visual check of the set).
+- **SC-006**: Every user skin in the #336 test set loads and looks the same under New as
+ before this feature, and changes under Classic only in what it leaves unset.
+- **SC-007**: Switching the look during playback causes no audible dropout or xrun.
+- **SC-008**: Under New with no clip-style pick, Arrangement previews are pixel-identical to
+ those before this feature; under Solid a clip matches its 0.59.2 drawing in body, band,
+ name and content colours.
+
+## Assumptions
+
+- "0.59.2 appearance" means the colours, corners and typefaces at tag `v0.59.2`; it does
+ not include 0.59.2's control shapes or layouts (issue #572, out of scope).
+- Geist Mono is under the SIL OFL 1.1 like Geist and was bundled until #296, so bringing
+ it back adds no new dependency; its licence entry returns with it.
+- The Look choice is a per-user appearance setting like the accent option, not a
+ per-project one.
+- Nota Remote, the docs site and the marketing site keep the new look; user docs gain a
+ short note on the switch, with screenshots in the default (new) look.
+- Classic is maintained going forward: new colour tokens get a classic value, enforced by
+ the design checks. New value displays are not required to take the values-and-readouts
+ role (see Clarifications), so the inventory of role uses is fixed by 0.59.2.
+
+## Nota Compliance Checklist *(review before implementation; re-check in tasks.md)*
+
+- [x] Every new source file will carry the AGPL-3.0-only SPDX header (two lines, see CONTRIBUTING.md)
+- [x] No new dependency — or: license checked, AGPL-compatible, `LICENSES/third-party.md` row planned (Geist Mono returns, OFL 1.1, row restored)
+- [x] Audio-thread impact considered: no alloc / lock / I/O on the audio thread (AR-6), command queue for data in (AR-4), immutable snapshots for structural edits (AR-5) — UI-only change, no engine path touched
+- [x] Managed/native crossings go through the pure C ABI in `nota_engine.h` only (AR-7); no JUCE outside `pluginhost/` — no crossing added
+- [x] Smoke-test impact assessed: engine behaviour change → extend `tests/Nota.SmokeTest` (no engine change; design/layout checks in the smoke test cover both looks)
+- [x] User-visible change → `CHANGELOG.md` `[Unreleased]` entry planned (and FEATURES.md / user docs via the nota-features / nota-docs skills when working with an agent that has them)
+- [x] UI change → follows `DESIGN.md` (Studio design language) — DESIGN.md gains a Classic section
diff --git a/specs/091-classic-look/tasks.md b/specs/091-classic-look/tasks.md
new file mode 100644
index 00000000..a9155689
--- /dev/null
+++ b/specs/091-classic-look/tasks.md
@@ -0,0 +1,175 @@
+---
+description: "Tasks for the Classic look (spec 091, issue #572)"
+---
+
+# Tasks: Classic look
+
+**Input**: Design documents from `specs/091-classic-look/`
+
+**Prerequisites**: [plan.md](plan.md), [spec.md](spec.md), [research.md](research.md),
+[data-model.md](data-model.md), [contracts/](contracts/), [quickstart.md](quickstart.md)
+
+**Tests**: The project gate is `tests/Nota.SmokeTest`; the plan (Constitution IV, R9)
+requires smoke checks for the pure logic, palettes, file format and type rules, so they
+are included as tasks. No separate unit-test project.
+
+**Organization**: Grouped by user story; each story is testable on its own.
+
+## Format: `[ID] [P?] [Story] Description`
+
+- **[P]**: Can run in parallel (different files, no dependencies)
+- **[Story]**: US1 (switch, P1), US2 (skins, P2), US3 (MCP, P3)
+
+---
+
+## Phase 1: Setup
+
+**Purpose**: Bring back the font files and the data the rest builds on.
+
+- [X] T001 Restore `assets/fonts/GeistMono-Regular.ttf`, `GeistMono-Medium.ttf`, `GeistMono-SemiBold.ttf`, `GeistMono-Bold.ttf` unmodified from `v0.59.2` (`git show v0.59.2:assets/fonts/<file> > assets/fonts/<file>`), and make sure `src/managed/Nota.App/Nota.App.csproj` packs them as `Assets/Fonts` like the Geist files
+- [X] T002 [P] Update the Geist row and note 5 in `LICENSES/third-party.md`: Geist Mono back in use for values and readouts under the classic look, same OFL 1.1 licence file `LICENSES/OFL-1.1-Geist.txt`, unmodified files from the same package
+- [X] T003 [P] Write `scripts/classic-role-sites.py` (SPDX header): from the #296 commit `cbd77012` list every removed line containing `NotaFonts.Mono`, `MonoFamily`, `MonoBold`, `MonoMedium` or `Font.Mono` with its file, and for each file that still exists on HEAD print the likely current line (the added line of the same hunk); output `file:line old → new`, used by T019–T023
+- [X] T004 [P] Commit the 0.59.2 palettes as a test fixture `tests/Nota.SmokeTest/Fixtures/classic-0.59.2.json`: `{ "<theme id>": { "<token>": "#RRGGBB[AA]" } }` for the four built-ins, values read from `git show v0.59.2:src/managed/Nota.App/Theme/Themes/<id>.json` (107 tokens each)
+
+---
+
+## Phase 2: Foundational (blocking)
+
+**Purpose**: The look as data and the composition rule every story uses.
+
+- [X] T005 Add `public string Look { get; set; } = "";` with a doc comment (`""`/`"new"` → New, `"classic"` → Classic; unknown reads as New, never rewritten on read) to `src/managed/Nota.Application/Settings.cs`, next to `Accent`
+- [X] T006 Create `src/managed/Nota.Application/Looks.cs` (SPDX header, why-comment): `public enum Look { New, Classic }`; `Looks.Resolve(Settings)`; `Looks.Store(Settings, Look)` (writes `""` for New, `"classic"` for Classic); `Looks.Id(Look)` → `"new"`/`"classic"` and `Looks.Parse(string)` → `Look?` for MCP
+- [X] T007 Extend `src/managed/Nota.Application/Themes/SkinGeometry.cs`: add `string? ValuesFamily` and `bool HasRadius` (true when the file carried a `radius` object, even an empty one); include both in `Equals`/`GetHashCode`; `Default` has `ValuesFamily = null`, `HasRadius = false`; `IsDefault` also requires `ValuesFamily is null && !HasRadius`; update every constructor call (grep `new SkinGeometry(`) including `ThemeFile.cs` reading format 2 (`HasRadius = root has "radius"`)
+- [X] T008 In `src/managed/Nota.Application/Looks.cs` add `ClassicGeometry` = roundness `0.4`, steps `Card 3, Group 3, Field 3, Cell 2, ValueBar 2, Switch 2, Fine 2`, and `Compose(SkinGeometry skin, Look look) → SkinGeometry`: typeface = `skin.FontFamily`; radii = `skin.HasRadius` → skin's roundness+steps, else Classic → `ClassicGeometry`'s, else design (roundness 1, no steps); `ValuesFamily` = `skin.ValuesFamily` (installed-ness is checked in the app layer, T015)
+- [X] T009 Create `tests/Nota.SmokeTest/LooksCheck.cs` (`RunLooks()`): `Resolve` of `""`, `"new"`, `"classic"`, `"Classic"`, `"x"` → New, New, Classic, New, New; `Store` round-trips; `Compose` rows of data-model § Composition — default skin × New = design scale; default × Classic = classic steps 3/3/3/2/2/2/2 and `MapRadius(9)=3`, `MapRadius(6)=3`, `MapRadius(0)=0`, off-scale `MapRadius(10)=4`; skin with `HasRadius` (scale 0) × Classic = all 0; skin font kept in both looks; register in `tests/Nota.SmokeTest/Program.cs` next to `RunSkins`
+
+**Checkpoint**: `scripts/build.sh` green with the new checks.
+
+---
+
+## Phase 3: User Story 1 — Switch to the classic look (P1) 🎯 MVP
+
+**Goal**: Preferences → Appearance → Look: New | Classic, live and stored; classic
+colours, corners and Geist Mono for values on the four built-in themes.
+
+**Independent Test**: quickstart § 2 and § 3 — flip during playback, compare with 0.59.2,
+restart, flip back; New previews identical to before.
+
+### Colours
+
+- [X] T010 [P] [US1] Create the four classic palettes `src/managed/Nota.App/Theme/Themes/Classic/{studio-dark,studio-light,ember-graphite,ember-paper}.json` (format 1, same `id`/`name`/`kind` as the built-in, keys in catalogue order): copy the current built-in file, set `Panel`, `SurfaceRaised`, `TextDisabled`, `VizInk` (studio-dark) and `Mute` (studio-light) back to their `v0.59.2` values, and give the 15 new tokens (`Well`, `WellTrack`, `KnobTrack`, `Groove`, `DeviceSection`, `DeviceSectionEdge`, `DeviceHeader`, `Bevel`, `AccentSoft`, `KnobCap`, `MeterSafe`, `MeterHot`, `MeterOver`, `TrackHeaderSelected`, `LaneSelected`) values that read like 0.59.2, taken from the colours the `v0.59.2` styles used for those parts (`git show v0.59.2:src/managed/Nota.App/Theme/NotaTheme.axaml` and the views) per research R7
+- [X] T011 [US1] Embed the classic palettes in `src/managed/Nota.App/Nota.App.csproj` with `LogicalName="Nota.Themes.Classic.%(Filename)%(Extension)"` (the existing `Theme\Themes\*.json` glob must not pick them up as built-ins), and load them in `src/managed/Nota.App/Theme/NotaColourTheme.cs` (`NotaThemes`) into a `Classic(string id) → NotaColourTheme?` lookup that is never listed in `All`/`BuiltIn`
+- [X] T012 [P] [US1] Add `RunClassicPalettes()` to `tests/Nota.SmokeTest/DesignTokenCheck.Themes.cs` (registered in `Program.cs`): each built-in has a classic file; each passes F1–F6 with the full catalogue; every token present in `Fixtures/classic-0.59.2.json` equals the fixture (SC-002, no exceptions); T3 readability warnings are allowed only when every token of the pairing is in the fixture and equals it — a pairing that involves one of the 15 new tokens must pass (research R8)
+
+### Corners and composition
+
+- [X] T013 [US1] In `src/managed/Nota.App/Theme/NotaThemeService.cs` add `Look` state, `public static Look Look`, `SetLook(Look)` (live; saving is the caller's, as `SetAccent`), and change `Set` to take the look at startup; in `ApplyActive` compose per research R3: theme → under Classic a built-in id is replaced by `NotaThemes.Classic(id)` → accent (`Worn`) → `Looks.Compose(theme.Geometry, look)` → `NotaSkin.Set` + `NotaFonts.SetMeasure` (T016) → re-coerce, repaint, `Changed`; compare composed state so a look change with the same theme still re-applies (today's `ReferenceEquals(NotaPalette.Theme, theme)` short-circuit must not swallow it)
+- [X] T014 [US1] Keep `NotaThemeService.Worn(theme)` look-free for Nota Remote (`src/managed/Nota.App/MainWindow.Remote.cs` stays on the new palette, spec Edge Cases) and add `WornForCard(theme)` that applies the look's colours (built-ins only) for theme cards
+- [X] T015 [US1] Teach `src/managed/Nota.App/Theme/NotaSkin.cs` the composed geometry: `Set` keeps working from a `SkinGeometry` (now composed), and `IsDefault` short-cuts stay exact no-ops under New with the default skin (SC-004)
+
+### Values and readouts role
+
+- [X] T016 [US1] In `src/managed/Nota.App/Theme/NotaFonts.cs` add `public const string MeasureMonoUri = "avares://Nota.App/Assets/Fonts#Geist Mono";`, a current `MeasureFamily` (default `UiFamily`), `SetMeasure(FontFamily)` that also writes `Application.Current.Resources["Font.Measure"]`, and properties `Measure`, `MeasureMedium`, `MeasureBold` built from the current family (read at call time, never cached in static readonly fields); update the file's header comment (two roles; New is one typeface)
+- [X] T017 [US1] In `src/managed/Nota.App/Theme/NotaTheme.axaml` add `<FontFamily x:Key="Font.Measure">avares://Nota.App/Assets/Fonts#Geist</FontFamily>` beside `Font.UI`; make `TextBlock.Mono`, `.Readout`, `.Value`, `.Eyebrow` set `FontFamily="{DynamicResource Font.Measure}"` (sizes/weights unchanged); add `TextBlock.Number` (Geist via `Font.UI`, same size/colour as `.Value`) for numbers added after 0.59.2; restore `Font.Measure` at each 0.59.2 `Font.Mono` use still present (T003 output)
+- [X] T018 [US1] In `NotaThemeService.ApplyActive` (T013) set the measure family: skin `ValuesFamily` if installed (`NotaThemes.IsFontInstalled`), else New → `NotaFonts.UiFamily`, Classic → `new FontFamily(NotaFonts.MeasureMonoUri)`; under New with no skin values font the resource must be the very Geist URI so `NotaSkin.IsGeist` still maps it to a skin's `font.family`
+- [X] T019 [US1] Run `scripts/classic-role-sites.py` and save its output as the inventory checklist `specs/091-classic-look/role-sites.md` (file, old line, current line, decision: role / gone / redrawn-same-value)
+- [X] T020 [P] [US1] Restore the role in the shell views per `role-sites.md` — `NotaFonts.Sans*` → `NotaFonts.Measure*` (or `Font.UI` → `{DynamicResource Font.Measure}`) only at 0.59.2 mono sites: `src/managed/Nota.App/{PreferencesWindow*.cs, PreviewPlayer.cs, SessionView*.cs, ArrangementView*.cs, MixerView.cs, CommandPaletteView.cs, WelcomeWindow.cs, StereoMapView.cs, ModularView.cs}`, `src/managed/Nota.App/Remote/ConnectPhoneView.cs`
+- [X] T021 [P] [US1] Same for `src/managed/Nota.App/Controls/*.cs` (e.g. `ConsortViews.cs`, `LengthGateViz.cs`) and the piano roll / audio editor views listed in `role-sites.md`
+- [X] T022 [P] [US1] Same for `src/managed/Nota.App/DeviceCards/**` (instrument cards, bodies, rack `MacroPanel.cs`, `PluginCard.cs`); where a card was redrawn, put the role on the same value (e.g. a band's Freq readout) per research R5
+- [X] T023 [US1] Move uses of `TextBlock.Mono/.Readout/.Value/.Eyebrow` and `NotaFonts.Sans*` numbers that were **added after 0.59.2** (in `role-sites.md`'s "new since" list: `git log -S'Classes.Add("Value")' v0.59.2..HEAD` and the XAML class uses) to `TextBlock.Number` / `NotaFonts.Sans*` so they stay Geist under Classic (clarification, FR-009)
+- [X] T024 [US1] Replace every `static readonly` cache of a measure typeface introduced in T020–T022 with a call-time read (`NotaFonts.Measure`), so a live switch reaches custom-drawn text (research R11)
+
+### Preferences and startup
+
+- [X] T025 [US1] Add the Look row to the Appearance pane in `src/managed/Nota.App/PreferencesWindow.cs` (`AppearancePane`, above the mode row) per contracts/ui-contract.md L1: a two-cell segment control **New | Classic** (shared segment control from `Controls/`), caption under it, applies on pick via `NotaThemeService.SetLook`, stores `Looks.Store(settings, look)` and saves settings the way the accent does (`PreferencesWindow.Accent.cs`), Tab/arrow reachable; refresh on `NotaThemeService.Changed`
+- [X] T026 [US1] Theme cards in `src/managed/Nota.App/PreferencesWindow.cs` use `NotaThemeService.WornForCard` so built-in cards show classic colours and classic corners under Classic (contract L2)
+- [X] T027 [US1] At startup in `src/managed/Nota.App/App.axaml.cs` (where `NotaThemeService.Set(Appearance.Resolve(...))` runs) resolve `Looks.Resolve(startSettings)` and pass it in, before the splash/first window
+- [X] T028 [P] [US1] Add the English strings to `src/managed/Nota.Application/Localization/en.json`: `preferences.look`, `preferences.look_new` ("New"), `preferences.look_classic` ("Classic"), `preferences.look_new_caption` ("The current Nota look."), `preferences.look_classic_caption` ("Colours, corners and type as in Nota 0.59.") — Russian follows via the reference sync (FR-018)
+
+### Design checks
+
+- [X] T029 [US1] Update `RunType()` in `tests/Nota.SmokeTest/DesignTokenCheck.cs` per research R9: families in the theme are exactly `Font.UI` and `Font.Measure`; `Font.Measure`'s default equals `Font.UI`'s URI; `NotaFonts` has `UiUri` and `MeasureMonoUri` and nothing else Mono; `assets/fonts` holds the four `Geist-*.ttf` and four `GeistMono-*.ttf` weights and nothing else; the OFL file exists; views still never name a family by string or `FontFamily.Default`; Geist Mono is named only in `Theme/`
+- [X] T030 [US1] Run `scripts/build.sh`; then quickstart § 2–3: switch live during playback (no xrun in log), compare against `v0.59.2` on all four themes, restart, switch back; render the MCP preview set under New before (from `develop`) and after and confirm identical images (SC-004); fix clipping found under Classic at 100 % and the largest UI scale without changing layout sizes (FR-016)
+
+**Checkpoint**: US1 is shippable on its own.
+
+---
+
+## Phase 4: User Story 2 — Classic with a user skin (P2)
+
+**Goal**: Skin wins where it sets something; format 3 adds `font.values`; Duplicate copies
+what is worn.
+
+**Independent Test**: quickstart § 4 with the three skin files.
+
+- [X] T031 [US2] Format 3 in `src/managed/Nota.Application/Themes/ThemeFile.cs` per contracts/theme-file-v3.md: F1″ accepts 1–3; V1′ `font.values` only in 3; V2′ `font` has optional `family` and (v3) optional `values`, "each a string of 1–100 characters after trimming; at least one present; no other keys", problems name `font.family`/`font.values`; W1′ warns for a missing `values` family; reader fills `SkinGeometry.ValuesFamily`; writer emits `formatVersion` 3 only when `ValuesFamily` is set, else 2 when font/radius set, else 1
+- [X] T032 [P] [US2] Add problem/warning strings for the new rules to `src/managed/Nota.Application/Localization/en.json` (`themes.problem.needs_v3`, `themes.problem.font_values`, the missing-values-font warning)
+- [X] T033 [P] [US2] Format-3 cases in `tests/Nota.SmokeTest/LooksCheck.cs` (`Format3()`; `DesignTokenCheck.Skins.cs` now refuses format 4 instead of 3): v3 valid (`family`+`values`, `values` only); invalid (`values` in v2, empty, 101 chars, extra key, `font: {}`); v1/v2 fixtures unchanged after load+save; `Compose` with a v3 skin keeps `ValuesFamily` under both looks
+- [X] T034 [US2] Duplicate in `src/managed/Nota.App/PreferencesWindow.Skins.cs`: a built-in duplicated while Look is Classic writes the classic palette's colours (not the geometry) (FR-013, contract L2)
+- [X] T035 [US2] Skins UI in `src/managed/Nota.App/PreferencesWindow.Skins.cs` / theme card tooltip: show the values typeface when a skin sets one; missing-family warning text names the fallback of the current look ("using Geist Mono" under Classic, "using Geist" under New) (contract L3; the warning names the missing values font and the look's own face is used — there is no separate skins editor)
+
+**Checkpoint**: US1 + US2 work together; skins from #336 unchanged under New (SC-006).
+
+---
+
+## Phase 5: User Story 3 — Look from MCP clients (P3)
+
+**Goal**: Read/set the look and preview either look over MCP.
+
+**Independent Test**: quickstart § 5.
+
+- [X] T036 [US3] Extend `IThemeAccess` and records in `src/managed/Nota.Mcp/Abstractions.cs`: `ThemeChoiceInfo` gains `string Look`; `string SetLook(string look)` (returns worn id; throws `ArgumentException` naming "new, classic" on an unknown value); `GetFile(string id, string? look)`; `PreviewAsync(..., string? look)`
+- [X] T037 [US3] Implement them in `src/managed/Nota.App/Mcp/ThemeAccess.cs` on the UI thread: `SetLook` wears, stores (`Looks.Store` + settings save), refreshes Preferences if open; `GetFile(id, "classic")` for a built-in returns the classic palette file text; previews go through `NotaThemeService.RenderScoped(theme, themeAccent, look, render)` (add the `look` parameter in `src/managed/Nota.App/Theme/NotaThemeService.cs`, composing as `ApplyActive` does and restoring the live look's measure family afterwards)
+- [X] T038 [US3] In `src/managed/Nota.Mcp/Tools/ThemeTools.cs` add `set_look` (input `look`: `"new"` | `"classic"`, returns `{ look, worn }`), optional `look` on `get_theme` and `preview_theme` (default: worn look for previews, original file for `get_theme`), and `choice.look` in `list_themes`; descriptions per contracts/mcp-tools.md; format 3 mentioned in `validate_theme`/`save_theme` descriptions
+- [X] T039 [US3] Verify over MCP per quickstart § 5 (list, set, get classic, preview both looks, live window untouched)
+
+**Checkpoint**: all stories done.
+
+---
+
+## Phase 7: User Story 4 — Solid or tinted clips (P2, scope widened)
+
+**Goal**: Preferences → Appearance → Clips: Solid | Tinted; default follows the look.
+
+**Independent Test**: spec User Story 4; harness renders Arrangement under each combination.
+
+- [X] T046 [US4] Add `public string ClipStyle { get; set; } = "";` (`""` follows the look, `"solid"`, `"tinted"`) to `src/managed/Nota.Application/Settings.cs`, and `enum ClipStyle { Tinted, Solid }` with `Looks.ClipStyleOf(Settings)` / `Looks.StoreClipStyle(Settings, ClipStyle)` in `src/managed/Nota.Application/Looks.cs`
+- [X] T047 [P] [US4] Smoke checks in `tests/Nota.SmokeTest/LooksCheck.cs`: `""` × New → Tinted, `""` × Classic → Solid, `"tinted"` × Classic → Tinted, `"solid"` × New → Solid, `"x"` follows the look
+- [X] T048 [US4] `ArrangementView.ClipStyle` property (invalidates the lanes) in `src/managed/Nota.App/ArrangementView.cs`, set from settings in `src/managed/Nota.App/MainWindow.axaml.cs` at start and on `Settings.Changed`
+- [X] T049 [US4] Solid branch in `DrawClipBody` (`src/managed/Nota.App/ArrangementView.LaneControl.cs`) per research R12, with `ClipBand` / `ClipInk` shades restored in `src/managed/Nota.App/ArrangementView.cs`; Tinted path unchanged
+- [X] T050 [US4] Clips row in `src/managed/Nota.App/PreferencesWindow.cs` (contract L5) + strings `preferences.clips`, `preferences.clips_solid`, `preferences.clips_tinted`, `preferences.clips_caption` in `src/managed/Nota.Application/Localization/en.json`; refresh on `NotaThemeService.Changed` so a look switch moves the shown default
+- [X] T051 [US4] Verify headless: Arrangement under New (identical to develop), Classic (solid), New+Solid, Classic+Tinted; update CHANGELOG, FEATURES, DESIGN.md (§ Clip: the Solid style)
+
+## Phase 6: Polish & cross-cutting
+
+- [X] T040 [P] Add a "Classic look" section to `DESIGN.md` (the switch, classic tokens table with where each of the 15 values came from, corner table with the three deviations, the two type roles and when to use `TextBlock.Number`) and regenerate `DESIGN.html` with its script
+- [X] T041 [P] `CHANGELOG.md` `[Unreleased]` → Added: the Look switch (classic colours, corners, Geist Mono values), skins `font.values`, MCP `set_look` (#572)
+- [X] T042 [P] Run the `nota-features` skill: FEATURES.md entries for the Look switch, format 3, MCP
+- [X] T043 Run the `nota-docs` skill: Preferences → Appearance page EN + RU in `../nota-docs` (Look row; screenshots stay in the new look), skins page (`font.values`)
+- [X] T044 Re-check the Nota Compliance Checklist in `specs/091-classic-look/spec.md` and tick what holds
+- [X] T045 Full quickstart run (`specs/091-classic-look/quickstart.md` §§ 1–6) and `scripts/build.sh` green
+
+---
+
+## Dependencies & Execution Order
+
+- **Setup (T001–T004)** → **Foundational (T005–T009)** → stories.
+- **US1**: T010 → T011 → T012; T013 → T014, T015; T016 → T017 → T018; T019 → T020–T022 [P] → T023 → T024; T025–T027 after T013; T029 after T016–T017; T030 last.
+- **US2** depends on Foundational (T007) and T013/T018 for wearing; T031 → T033; T034–T035 after T011.
+- **US3** depends on T013 and T031 (format 3 in validate/save); T036 → T037 → T038 → T039.
+- **Polish** after the stories it documents.
+
+## Parallel Examples
+
+- Setup: T002, T003, T004 together after T001.
+- US1: T010 (palettes) beside T016–T017 (fonts); T020, T021, T022 (role sites in disjoint folders) together; T028 any time.
+- US2: T032 and T033 beside T034–T035.
+- Polish: T040, T041, T042 together.
+
+## Implementation Strategy
+
+1. **MVP = Phases 1–3 (US1)**: the switch over built-in themes — what the users asked
+ for. Ship-ready alone (quickstart § 2–3).
+2. **+US2**: skins behave predictably under Classic; format 3.
+3. **+US3**: MCP parity for the skin design loop.
+4. Polish, docs, full quickstart, `/speckit-converge`.
diff --git a/src/managed/Nota.App/App.axaml.cs b/src/managed/Nota.App/App.axaml.cs
index e39fb2cd..7db45e58 100644
--- a/src/managed/Nota.App/App.axaml.cs
+++ b/src/managed/Nota.App/App.axaml.cs
@@ -118,7 +118,8 @@ public partial class App : Avalonia.Application
var startSettings = Services.GetRequiredService<ISettingsService>().Current;
NotaThemeService.StoredChoice = () => Appearance.Resolve(
Services.GetRequiredService<ISettingsService>().Current, NotaThemeService.KnownThemes);
- NotaThemeService.Set(Appearance.Resolve(startSettings, NotaThemeService.KnownThemes));
+ // The look (spec 091) too: a classic first frame, not a new one that switches.
+ NotaThemeService.Start(Appearance.Resolve(startSettings, NotaThemeService.KnownThemes), Looks.Resolve(startSettings));
NotaThemeService.SetAccent(Accent.Resolve(startSettings));
// Interface scale (spec 027), likewise before the first window: windows and every
// popup they open take it from here.
diff --git a/src/managed/Nota.App/ArrangementView.Controls.cs b/src/managed/Nota.App/ArrangementView.Controls.cs
index 6830a440..e2baddbc 100644
--- a/src/managed/Nota.App/ArrangementView.Controls.cs
+++ b/src/managed/Nota.App/ArrangementView.Controls.cs
@@ -189,7 +189,7 @@ public sealed partial class ArrangementView
ctx.DrawLine(BarPen, new Point(x, h - 7), new Point(x, h));
if (bar % labelEvery != 0) continue;
var ft = new NotaFormattedText((bar + 1).ToString(), CultureInfo.InvariantCulture,
- FlowDirection.LeftToRight, NotaFonts.Sans, NotaType.Axis, RulerText);
+ FlowDirection.LeftToRight, NotaFonts.Measure, NotaType.Axis, RulerText);
ctx.DrawText(ft, new Point(x + 3, 3));
}
}
@@ -198,11 +198,11 @@ public sealed partial class ArrangementView
private void RenderTime(DrawingContext ctx, double w, double h, double bpm)
{
double pxPerSec = _o._pixelsPerBeat * bpm / 60.0;
- if (_charW <= 0 || _charWStep != NotaTextSize.Step) // re-measure when Text size changes
+ if (_charW <= 0 || _charWKey != (NotaTextSize.Step, NotaFonts.FaceStamp)) // re-measure when Text size or the face changes
{
- _charWStep = NotaTextSize.Step;
+ _charWKey = (NotaTextSize.Step, NotaFonts.FaceStamp);
_charW = new NotaFormattedText("0000000000", CultureInfo.InvariantCulture, FlowDirection.LeftToRight,
- NotaFonts.Sans, NotaType.Axis, RulerText).Width / 10;
+ NotaFonts.Measure, NotaType.Axis, RulerText).Width / 10;
}
double charW = _charW;
double stepS = RulerLabels.TimeSteps[^1];
@@ -220,12 +220,12 @@ public sealed partial class ArrangementView
if (x < 0) continue;
ctx.DrawLine(BarPen, new Point(x, h - 7), new Point(x, h));
var ft = new NotaFormattedText(RulerLabels.Time(t, stepS, NotaNum.Culture), CultureInfo.InvariantCulture,
- FlowDirection.LeftToRight, NotaFonts.Sans, NotaType.Axis, RulerText);
+ FlowDirection.LeftToRight, NotaFonts.Measure, NotaType.Axis, RulerText);
ctx.DrawText(ft, new Point(x + 3, 3));
}
}
private double _charW;
- private int _charWStep; // the Text size step _charW was measured at
+ private (int Step, int Face) _charWKey; // the Text size step and face _charW was measured at
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
@@ -277,7 +277,7 @@ public sealed partial class ArrangementView
if (_o._loopDragging && _o._loopE > _o._loopS)
{
var ft = new NotaFormattedText(_o.LoopReadout(), CultureInfo.InvariantCulture,
- FlowDirection.LeftToRight, NotaFonts.Sans, NotaType.Axis, ReadoutText);
+ FlowDirection.LeftToRight, NotaFonts.Measure, NotaType.Axis, ReadoutText);
double tx = Math.Clamp(_o.BeatToX(_o._loopE) + 6, 2, Math.Max(2, w - ft.Width - 6));
var box = new Rect(tx - 3, 2, ft.Width + 6, h - 4);
ctx.FillRectangle(ChromeBg, box);
diff --git a/src/managed/Nota.App/ArrangementView.LaneControl.cs b/src/managed/Nota.App/ArrangementView.LaneControl.cs
index 9b1474ff..7e186741 100644
--- a/src/managed/Nota.App/ArrangementView.LaneControl.cs
+++ b/src/managed/Nota.App/ArrangementView.LaneControl.cs
@@ -1566,6 +1566,11 @@ public sealed partial class ArrangementView
double x0 = _o.BeatToX(c.StartBeat);
double x1 = _o.BeatToX(c.StartBeat + c.LengthBeats);
if (x1 < 0 || x0 > w || c.LengthBeats <= 0) return;
+ if (_o.ClipStyle == ClipStyle.Solid)
+ {
+ DrawSolidClipBody(ctx, colorIndex, label, c, x0, x1, y, rowH, selected, edgeHi, pitches, trackId, row, appear);
+ return;
+ }
var (_, edge, tint, content) = ClipColors(colorIndex);
// The clip (style guide): a 20% tint of the track colour over the lane, corner 6, a
// thin edge in the track colour; its notes, waveform and name in the full colour.
@@ -1608,6 +1613,53 @@ public sealed partial class ArrangementView
ctx.DrawRectangle(InactiveVeil, null, rect.Deflate(1), ClipRadius, ClipRadius);
}
+ // The Solid clip style (0.59, spec 091): a flat body in the track colour with no outline,
+ // its notes and waveform in a deeper shade of it, and a title band across the top — the
+ // colour mixed 30 % toward black, the accent when selected — with the name in readable
+ // ink. A row too short for the band keeps a 2 px band. Corners follow the clip step.
+ private void DrawSolidClipBody(DrawingContext ctx, int colorIndex, string label, ClipVM c, double x0, double x1,
+ double y, double rowH, bool selected, Drag edgeHi, (int lo, int hi)? pitches,
+ int trackId, int row, RecordPreview? appear)
+ {
+ var body = TrackBrush(colorIndex);
+ var content = ClipInk(colorIndex);
+ var rect = new Rect(x0, y + 2, Math.Max(2, x1 - x0), rowH - 4);
+ ctx.DrawRectangle(body, selected ? ClipSelBorder : null, rect, ClipRadius, ClipRadius);
+
+ if (edgeHi != Drag.None)
+ {
+ double ex = edgeHi == Drag.TrimL ? rect.X : rect.Right - 2.5;
+ ctx.FillRectangle(EdgeHighlight, new Rect(ex, rect.Y, 2.5, rect.Height));
+ }
+
+ var contentRect = new Rect(rect.X, rect.Y + BandH, rect.Width, Math.Max(0, rect.Height - BandH));
+ if (c.IsMidi) DrawNotes(ctx, c, contentRect, content, pitches, appear);
+ else DrawWaveform(ctx, c, contentRect, content, trackId);
+
+ bool tall = rect.Height > TitleBandH * 2.5;
+ var band = selected ? NotaPalette.Accent : ClipBand(colorIndex);
+ if (rect.Width > 3)
+ {
+ using var bc = ctx.PushClip(new RoundedRect(rect, ClipRadius));
+ ctx.FillRectangle(band, new Rect(rect.X, rect.Y, rect.Width, tall ? TitleBandH : BandH + 1));
+ }
+
+ if (tall && rect.Width > 24 && ShowsLabel(c))
+ {
+ string text = string.IsNullOrEmpty(c.Name) ? label : c.Name;
+ var ft = new NotaFormattedText(text, CultureInfo.InvariantCulture,
+ FlowDirection.LeftToRight, NotaFonts.SansSemiBold, NotaType.Eyebrow, NotaPalette.InkOn(band))
+ { MaxTextWidth = Math.Max(8, rect.Width - 10), Trimming = TextTrimming.CharacterEllipsis };
+ using var _ = ctx.PushClip(rect);
+ ctx.DrawText(ft, new Point(rect.X + 5, rect.Y + (TitleBandH - ft.Height) / 2));
+ }
+
+ if (!c.IsMidi && row >= 0) DrawAdsr(ctx, c, trackId, row, selected, content, NotaPalette.BgSunken);
+ if (!c.Active)
+ ctx.DrawRectangle(InactiveVeil, null, rect.Deflate(1), ClipRadius, ClipRadius);
+ }
+
+ private const double TitleBandH = 12; // the Solid style's title band over the top of the content
private const double BandH = 2; // the content area starts under this (ADSR frame, notes)
private const double LabelH = 18; // the clip name's line over the notes and waveform
private const double NameMinClipH = 30; // a clip taller than this (a row over 34 px) shows its name
diff --git a/src/managed/Nota.App/ArrangementView.cs b/src/managed/Nota.App/ArrangementView.cs
index ef707f6b..310d7acd 100644
--- a/src/managed/Nota.App/ArrangementView.cs
+++ b/src/managed/Nota.App/ArrangementView.cs
@@ -381,6 +381,7 @@ public sealed partial class ArrangementView : UserControl
TextTrimming = TextTrimming.CharacterEllipsis,
};
_overviewRange.BindResource(TextBlock.ForegroundProperty, "Brush.TextTertiary");
+ _overviewRange.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
// "Zoom" names the two keys. On a header narrowed so far that the range read-out
// would be cut, the caption steps aside first (the keys keep their tooltips).
var zoomLabel = new TextBlock
@@ -603,6 +604,14 @@ public sealed partial class ArrangementView : UserControl
set { if (_clipLabels == value) return; _clipLabels = value; _lanes.InvalidateVisual(); }
}
private ClipLabelMode _clipLabels = ClipLabelMode.RunStart;
+ /// <summary>Tinted clips (the new look) or solid ones with a title band (0.59; Settings →
+ /// Appearance → Clips, spec 091).</summary>
+ public ClipStyle ClipStyle
+ {
+ get => _clipStyle;
+ set { if (_clipStyle == value) return; _clipStyle = value; _lanes.InvalidateVisual(); }
+ }
+ private ClipStyle _clipStyle = ClipStyle.Tinted;
/// <summary>Audio-clip waveform style (Settings → Appearance).</summary>
public WaveformStyle Waveform
{
@@ -3628,6 +3637,19 @@ public sealed partial class ArrangementView : UserControl
}
private static readonly Dictionary<int, SolidColorBrush> _trackBrushes = new();
+ // A solid clip's title band: its track colour mixed 30 % toward black; its notes and waveform
+ // 58 % toward black (0.59, the Solid clip style). Theme-following and cached per index.
+ internal static SolidColorBrush ClipBand(int idx) => Shade(_clipBands, idx, 0.30);
+ internal static SolidColorBrush ClipInk(int idx) => Shade(_clipInks, idx, 0.58);
+ private static SolidColorBrush Shade(Dictionary<int, SolidColorBrush> cache, int idx, double t)
+ {
+ if (cache.TryGetValue(idx, out var b)) return b;
+ b = NotaPalette.Derived(() => Mix(TrackColorForIndex(idx), NotaPalette.ShadeDown.Color, t));
+ cache[idx] = b;
+ return b;
+ }
+ private static readonly Dictionary<int, SolidColorBrush> _clipBands = new(), _clipInks = new();
+
/// <summary>The theme-following brush for a palette index. A view that wants a track's
/// colour takes this; wrapping <see cref="TrackColorForIndex"/> in a new brush freezes it
/// in the variant that was active when the view was built.</summary>
diff --git a/src/managed/Nota.App/ArticulationMapManager.cs b/src/managed/Nota.App/ArticulationMapManager.cs
index 4b239b8b..4d15d7a9 100644
--- a/src/managed/Nota.App/ArticulationMapManager.cs
+++ b/src/managed/Nota.App/ArticulationMapManager.cs
@@ -684,7 +684,7 @@ public sealed class ArticulationMapManager : NotaWindow
string shown = Show(value);
var box = new TextBox
{
- Text = shown, FontSize = 11, FontFamily = NotaFonts.UiFamily, Height = NotaSize.Shell, MinHeight = 0, Width = 52,
+ Text = shown, FontSize = 11, FontFamily = NotaFonts.ValuesFamily, Height = NotaSize.Shell, MinHeight = 0, Width = 52,
VerticalContentAlignment = VerticalAlignment.Center, HorizontalContentAlignment = HorizontalAlignment.Right,
};
ToolTip.SetTip(box, tip);
diff --git a/src/managed/Nota.App/AudioClipEditorView.cs b/src/managed/Nota.App/AudioClipEditorView.cs
index 8f6de424..1a6665b1 100644
--- a/src/managed/Nota.App/AudioClipEditorView.cs
+++ b/src/managed/Nota.App/AudioClipEditorView.cs
@@ -697,7 +697,7 @@ public sealed class AudioClipEditorView : UserControl
private static readonly IPen SelLine = new Pen(NotaPalette.AccentDim, 1);
private static readonly IPen GridBeatPen = new Pen(NotaPalette.GridSubBeat, 1);
private static readonly IPen GridBarPen = new Pen(NotaPalette.BorderDefault, 1);
- private static readonly Typeface GridFace = NotaFonts.Sans;
+ private static Typeface GridFace => NotaFonts.Measure;
// BPM chip in the marker strip (drag to scrub the segment tempo); the hot one and the
// selected marker's position chip take Brass Wash with a brass edge.
private static readonly IBrush ChipBg = NotaPalette.Panel;
@@ -1662,14 +1662,14 @@ public sealed class AudioClipEditorView : UserControl
return (f0 * TotalBeats, f1 * TotalBeats);
}
private double _monoCharW;
- private int _monoCharWStep; // the Text size step _monoCharW was measured at
+ private (int Step, int Face) _monoCharWKey; // the Text size step and face _monoCharW was measured at
private double MonoCharW
{
get
{
- if (_monoCharW <= 0 || _monoCharWStep != NotaTextSize.Step) // re-measure when Text size changes
+ if (_monoCharW <= 0 || _monoCharWKey != (NotaTextSize.Step, NotaFonts.FaceStamp)) // re-measure when Text size or the face changes
{
- _monoCharWStep = NotaTextSize.Step;
+ _monoCharWKey = (NotaTextSize.Step, NotaFonts.FaceStamp);
_monoCharW = new NotaFormattedText("0000000000", NotaNum.Culture, FlowDirection.LeftToRight, GridFace, 9, RulerBar).Width / 10;
}
return _monoCharW;
diff --git a/src/managed/Nota.App/ClipEditorKit.cs b/src/managed/Nota.App/ClipEditorKit.cs
index f0a259c4..367d8b71 100644
--- a/src/managed/Nota.App/ClipEditorKit.cs
+++ b/src/managed/Nota.App/ClipEditorKit.cs
@@ -59,7 +59,7 @@ internal static class ClipEditorKit
var badge = new TextBlock
{
Text = kind.Length > 4 ? char.ToUpperInvariant(kind[0]) + kind[1..].ToLowerInvariant() : kind,
- FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Caption,
+ FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.Caption,
Foreground = NotaPalette.TextTertiary, VerticalAlignment = VerticalAlignment.Center,
};
cell.Children.Add(nameText);
@@ -236,7 +236,7 @@ internal static class ClipEditorKit
public static TextBlock Mono(string text, double size = 11, IBrush? fg = null) => new()
{
- Text = text, FontFamily = NotaFonts.UiFamily, FontSize = size, Foreground = fg ?? NotaPalette.TextPrimary,
+ Text = text, FontFamily = NotaFonts.ValuesFamily, FontSize = size, Foreground = fg ?? NotaPalette.TextPrimary,
VerticalAlignment = VerticalAlignment.Center,
};
diff --git a/src/managed/Nota.App/CommandPaletteView.cs b/src/managed/Nota.App/CommandPaletteView.cs
index b35cd235..eed05057 100644
--- a/src/managed/Nota.App/CommandPaletteView.cs
+++ b/src/managed/Nota.App/CommandPaletteView.cs
@@ -208,7 +208,7 @@ internal sealed class CommandPaletteView : UserControl
_layoutText.Inlines = new InlineCollection
{
new Run(Loc.T("command_palette.showing_results_for")),
- new Run(_results.LayoutHint) { FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextPrimary },
+ new Run(_results.LayoutHint) { FontFamily = NotaFonts.MeasureFamily, Foreground = NotaPalette.TextPrimary },
new Run(Loc.T("command_palette.typed_in_the_other_keyboard")),
};
}
@@ -510,14 +510,14 @@ internal sealed class CommandPaletteView : UserControl
BorderBrush = NotaPalette.BorderStrong, BorderThickness = new Thickness(1, 1, 1, 2), VerticalAlignment = VerticalAlignment.Center,
Child = new TextBlock
{
- Text = label, FontSize = fontSize, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextStrong,
+ Text = label, FontSize = fontSize, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextStrong,
HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
},
};
private static TextBlock Mono(double size, IBrush ink, string text = "") => new()
{
- Text = text, FontSize = size, FontFamily = NotaFonts.UiFamily, Foreground = ink, VerticalAlignment = VerticalAlignment.Center,
+ Text = text, FontSize = size, FontFamily = NotaFonts.ValuesFamily, Foreground = ink, VerticalAlignment = VerticalAlignment.Center,
};
// A shared-set icon in a square box: the 16-unit grid scaled as a whole, so the kinds keep
@@ -551,7 +551,7 @@ internal sealed class PaletteToast : Border
Children =
{
new TextBlock { Text = Loc.T("common.undo"), FontSize = 10, Foreground = NotaPalette.Accent, VerticalAlignment = VerticalAlignment.Center },
- new TextBlock { Text = MenuKit.Keys("⌘Z"), FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextSecondary, VerticalAlignment = VerticalAlignment.Center },
+ new TextBlock { Text = MenuKit.Keys("⌘Z"), FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextSecondary, VerticalAlignment = VerticalAlignment.Center },
},
};
_undo = new Border
diff --git a/src/managed/Nota.App/Controls/ArpGrid.cs b/src/managed/Nota.App/Controls/ArpGrid.cs
index 26185d1a..a0905b49 100644
--- a/src/managed/Nota.App/Controls/ArpGrid.cs
+++ b/src/managed/Nota.App/Controls/ArpGrid.cs
@@ -110,7 +110,7 @@ internal sealed class ArpGrid : Control
private static readonly IBrush ColMajor = NotaPalette.GraphBorder;
private static readonly IBrush Head = NotaPalette.Wash(NotaPalette.Accent, 0x14);
private static readonly IBrush Zero = NotaPalette.BorderDefault;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private const double GutterW = 24, NumsH = 14;
private readonly IAudioEngine _e; private readonly int _t, _mi;
diff --git a/src/managed/Nota.App/Controls/ChamberViews.cs b/src/managed/Nota.App/Controls/ChamberViews.cs
index 516ce854..90e9e6d3 100644
--- a/src/managed/Nota.App/Controls/ChamberViews.cs
+++ b/src/managed/Nota.App/Controls/ChamberViews.cs
@@ -30,7 +30,7 @@ internal static class ChamberInk
{
public static readonly IBrush Veil = NotaPalette.Wash(NotaPalette.SurfaceAbyss, 0xB8);
public static readonly IBrush GridLine = NotaPalette.SurfaceCard;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private static readonly Typeface Sans = NotaFonts.SansSemiBold;
public static FormattedText Text(string s, double size, IBrush b) => new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NumFace, size, b, NotaTextSize.InCard);
diff --git a/src/managed/Nota.App/Controls/ChordKeysViz.cs b/src/managed/Nota.App/Controls/ChordKeysViz.cs
index 1554b28e..f0446ceb 100644
--- a/src/managed/Nota.App/Controls/ChordKeysViz.cs
+++ b/src/managed/Nota.App/Controls/ChordKeysViz.cs
@@ -93,7 +93,7 @@ internal sealed class ChordKeysViz : Control
for (int o = 0; o < 3; o++)
{
var ft = new NotaFormattedText(DeviceCardKit.NoteName(_start + o * 12), System.Globalization.CultureInfo.InvariantCulture,
- FlowDirection.LeftToRight, new Typeface(NotaFonts.UiFamily), NotaType.Axis, Label, this);
+ FlowDirection.LeftToRight, NotaFonts.Measure, NotaType.Axis, Label, this);
double x = inner.X + o * 7 * ww + (ww - ft.Width) / 2;
ctx.DrawText(ft, new Point(x + 1, inner.Bottom - ft.Height - 2));
}
diff --git a/src/managed/Nota.App/Controls/CompViews.cs b/src/managed/Nota.App/Controls/CompViews.cs
index a649cf84..56575dbb 100644
--- a/src/managed/Nota.App/Controls/CompViews.cs
+++ b/src/managed/Nota.App/Controls/CompViews.cs
@@ -22,7 +22,7 @@ namespace Nota.App;
internal static class CompDraw
{
public static FormattedText Text(string t, IBrush ink, double size = NotaGraph.AxisSize)
- => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
public static void Polyline(DrawingContext ctx, IPen pen, IReadOnlyList<Point> pts)
{
diff --git a/src/managed/Nota.App/Controls/CompViz.cs b/src/managed/Nota.App/Controls/CompViz.cs
index 0b08006d..f5841f7b 100644
--- a/src/managed/Nota.App/Controls/CompViz.cs
+++ b/src/managed/Nota.App/Controls/CompViz.cs
@@ -18,7 +18,7 @@ namespace Nota.App;
private static readonly IBrush Ink = NotaPalette.VizInk;
private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;
private static readonly IBrush Grid = NotaGraph.Grid;
- private static readonly Typeface Face = NotaFonts.Sans;
+ private static Typeface Face => NotaFonts.Measure;
private float _thr = -18f, _ratio = 3f, _makeup;
public CompViz() { MinWidth = 120; MinHeight = 70; }
public void Set(float thr, float ratio, float makeup)
diff --git a/src/managed/Nota.App/Controls/ConsortViews.cs b/src/managed/Nota.App/Controls/ConsortViews.cs
index fd4403c6..d53c00dc 100644
--- a/src/managed/Nota.App/Controls/ConsortViews.cs
+++ b/src/managed/Nota.App/Controls/ConsortViews.cs
@@ -248,7 +248,7 @@ internal sealed class ConsortFilterCurve : FilterGraphBase
// ---- BBD taps: the L lane on top, R below; bar height = level of each repeat ----
internal sealed class ConsortDelayView : Control
{
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private double _tl = 0.26, _tr = 0.39, _fb = 0.6, _mix = 0.4;
private bool _ping = true, _digital;
public ConsortDelayView() { ClipToBounds = true; }
@@ -298,7 +298,7 @@ internal sealed class ConsortDelayView : Control
// ---- the 16 step cells: type (note / ratchet / tie / rest), playhead, length. Click / drag paints ----
internal sealed class ConsortStepGrid : Control
{
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private readonly int[] _type = new int[16];
private int _len = 16, _play = -1, _ratchet = 3;
private bool _drag; private int _last = -1;
@@ -362,7 +362,7 @@ internal sealed class ConsortStepGrid : Control
internal sealed class ConsortPitchLane : Control
{
private static readonly Typeface Sans = NotaFonts.SansSemiBold;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private readonly int[] _p = new int[16], _t = new int[16];
private int _len = 16, _play = -1, _dragStep = -1;
private bool _arp;
@@ -443,7 +443,7 @@ internal sealed class ConsortPitchLane : Control
// jack to pull its cables, right-click for its cable list. ----
internal sealed class ConsortJackField : Control
{
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private static readonly Typeface Sans = NotaFonts.Sans;
private static readonly Typeface SansSemiBold = NotaFonts.SansSemiBold;
private static readonly Typeface SansMedium = NotaFonts.SansMedium;
@@ -651,7 +651,7 @@ internal sealed class ConsortJackField : Control
// double-click or the menu's Clear pulls the cable (specs/035).
internal sealed class ConsortPatchMatrix : Control, IValueEntryHost
{
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private static readonly Typeface Sans = NotaFonts.Sans;
private static readonly Typeface SansSemiBold = NotaFonts.SansSemiBold;
private static readonly Typeface SansMedium = NotaFonts.SansMedium;
diff --git a/src/managed/Nota.App/Controls/ControlExtensions.cs b/src/managed/Nota.App/Controls/ControlExtensions.cs
index 95b41b87..e98aed2c 100644
--- a/src/managed/Nota.App/Controls/ControlExtensions.cs
+++ b/src/managed/Nota.App/Controls/ControlExtensions.cs
@@ -10,7 +10,7 @@ internal static class ControlExtensions
{
/// <summary>
/// Binds <paramref name="property"/> to the dynamic theme resource
- /// <paramref name="key"/> (e.g. "Brush.TextPrimary", "Font.UI").
+ /// <paramref name="key"/> (e.g. "Brush.TextPrimary", "Font.Measure").
/// Use this in code-built views instead of <c>TryFindResource</c>: those views
/// are constructed during MainWindow's XAML load, before they attach to the
/// visual tree, so <c>TryFindResource</c> returns the magenta fallback. The
diff --git a/src/managed/Nota.App/Controls/DelayViews.cs b/src/managed/Nota.App/Controls/DelayViews.cs
index bc996ee8..8f7b7a4d 100644
--- a/src/managed/Nota.App/Controls/DelayViews.cs
+++ b/src/managed/Nota.App/Controls/DelayViews.cs
@@ -188,7 +188,7 @@ internal sealed class DelayTaps : Control
}
private static FormattedText Text(string t, IBrush ink, double size = NotaType.Axis)
- => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
public override void Render(DrawingContext ctx)
{
diff --git a/src/managed/Nota.App/Controls/DragNumber.cs b/src/managed/Nota.App/Controls/DragNumber.cs
index 49bd774c..94aa2ccf 100644
--- a/src/managed/Nota.App/Controls/DragNumber.cs
+++ b/src/managed/Nota.App/Controls/DragNumber.cs
@@ -39,7 +39,7 @@ public sealed class DragNumber : UserControl
_display.FontSize = fontSize;
if (fontSize >= NotaType.Readout) _display.FontWeight = FontWeight.Medium; // a toolbar value: 17 / 500
- _display.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _display.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
_display.BindResource(TextBlock.ForegroundProperty, "Brush.TextPrimary");
_editor = new TextBox
@@ -48,7 +48,7 @@ public sealed class DragNumber : UserControl
Background = Brushes.Transparent, BorderThickness = new Avalonia.Thickness(0),
HorizontalContentAlignment = HorizontalAlignment.Center, VerticalContentAlignment = VerticalAlignment.Center,
};
- _editor.BindResource(TextBox.FontFamilyProperty, "Font.UI");
+ _editor.BindResource(TextBox.FontFamilyProperty, "Font.Measure");
_editor.KeyDown += (_, e) => { if (e.Key == Key.Enter) CommitEditor(); else if (e.Key == Key.Escape) CancelEditor(); };
_editor.LostFocus += (_, _) => CommitEditor();
diff --git a/src/managed/Nota.App/Controls/DynamicEqCurve.cs b/src/managed/Nota.App/Controls/DynamicEqCurve.cs
index eb827e37..e9e9bd63 100644
--- a/src/managed/Nota.App/Controls/DynamicEqCurve.cs
+++ b/src/managed/Nota.App/Controls/DynamicEqCurve.cs
@@ -417,7 +417,7 @@ public sealed class DynamicEqCurve : Control, IValueEntryHost
// ---- render ----
private static FormattedText Text(string s, IBrush ink, double size, bool bold = false, bool mono = true)
=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,
- mono ? (bold ? NotaFonts.SansBold : NotaFonts.Sans) : bold ? NotaFonts.SansSemiBold : NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ mono ? (bold ? NotaFonts.MeasureBold : NotaFonts.Measure) : bold ? NotaFonts.SansSemiBold : NotaFonts.Sans, size, ink, NotaTextSize.InCard);
public override void Render(DrawingContext ctx)
{
diff --git a/src/managed/Nota.App/Controls/Eq3Views.cs b/src/managed/Nota.App/Controls/Eq3Views.cs
index b285b744..4945efa1 100644
--- a/src/managed/Nota.App/Controls/Eq3Views.cs
+++ b/src/managed/Nota.App/Controls/Eq3Views.cs
@@ -180,7 +180,7 @@ internal sealed class Eq3Fader : Control
}
void Lbl(string t, double y, int align)
{
- var ft = new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, NotaType.Axis, NotaPalette.TextTertiary, this);
+ var ft = new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, NotaType.Axis, NotaPalette.TextTertiary, this);
double ty = align < 0 ? y : align > 0 ? y - ft.Height : y - ft.Height / 2;
ctx.DrawText(ft, new Point(Math.Max(0, bx - 6 - ft.Width), Math.Clamp(ty, 0, h - ft.Height)));
}
@@ -443,7 +443,7 @@ internal sealed class Eq3Graph : Control, IValueHandles
{
names[b] = new NotaFormattedText(NotaText.Label(Eq3Math.Names[b]), CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, NotaGraph.AxisSize, NotaPalette.TextTertiary, this);
vals[b] = new NotaFormattedText(_kill[b] ? "kill" : Eq3Math.Db(_db[b]), CultureInfo.InvariantCulture, FlowDirection.LeftToRight,
- NotaFonts.Sans, NotaGraph.AxisSize, _kill[b] ? NotaPalette.TextDisabled : NotaPalette.TextPrimary, this);
+ NotaFonts.Measure, NotaGraph.AxisSize, _kill[b] ? NotaPalette.TextDisabled : NotaPalette.TextPrimary, this);
lw[b] = names[b].Width + 4 + vals[b].Width;
lx[b] = centres[b] - lw[b] / 2;
}
diff --git a/src/managed/Nota.App/Controls/Eq8Views.cs b/src/managed/Nota.App/Controls/Eq8Views.cs
index 583fa6f3..ceb8ee09 100644
--- a/src/managed/Nota.App/Controls/Eq8Views.cs
+++ b/src/managed/Nota.App/Controls/Eq8Views.cs
@@ -461,7 +461,7 @@ public sealed class Eq8Curve : Control, IValueEntryHost
// ---- render ----
private static FormattedText Text(string s, IBrush ink, double size, bool bold = false, bool mono = true)
=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,
- mono ? (bold ? NotaFonts.SansBold : NotaFonts.Sans) : bold ? NotaFonts.SansSemiBold : NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ mono ? (bold ? NotaFonts.MeasureBold : NotaFonts.Measure) : bold ? NotaFonts.SansSemiBold : NotaFonts.Sans, size, ink, NotaTextSize.InCard);
public override void Render(DrawingContext ctx)
diff --git a/src/managed/Nota.App/Controls/GroupBandsLayer.cs b/src/managed/Nota.App/Controls/GroupBandsLayer.cs
index 7ceb1daf..47b1f712 100644
--- a/src/managed/Nota.App/Controls/GroupBandsLayer.cs
+++ b/src/managed/Nota.App/Controls/GroupBandsLayer.cs
@@ -78,7 +78,7 @@ internal sealed class GroupBandsLayer : Control, ICustomHitTest
if (maxW <= 4) continue;
var count = b.Hidden > 0
? new NotaFormattedText("+" + b.Hidden.ToString(CultureInfo.CurrentCulture), CultureInfo.CurrentCulture,
- FlowDirection.LeftToRight, NotaFonts.Sans, 9, NotaPalette.TextSecondary)
+ FlowDirection.LeftToRight, NotaFonts.Measure, 9, NotaPalette.TextSecondary)
: null;
double countW = count is null ? 0 : count.Width + 4;
var name = new NotaFormattedText(b.Name, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
diff --git a/src/managed/Nota.App/Controls/KeysViews.cs b/src/managed/Nota.App/Controls/KeysViews.cs
index 87b13357..d5fec610 100644
--- a/src/managed/Nota.App/Controls/KeysViews.cs
+++ b/src/managed/Nota.App/Controls/KeysViews.cs
@@ -120,7 +120,7 @@ internal sealed class KeysPickupView : Control, IMidiLearnRegions, IValueEntryHo
}
private static FormattedText Mono(string t, IBrush ink, double size = 8)
- => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
public override void Render(DrawingContext ctx)
{
diff --git a/src/managed/Nota.App/Controls/LengthGateViz.cs b/src/managed/Nota.App/Controls/LengthGateViz.cs
index 766d9eaf..9d3c0551 100644
--- a/src/managed/Nota.App/Controls/LengthGateViz.cs
+++ b/src/managed/Nota.App/Controls/LengthGateViz.cs
@@ -148,7 +148,7 @@ internal sealed class LengthGateViz : Control
ctx.DrawRectangle(null, new Pen(Outline, 1.5), new RoundedRect(new Rect(ix + 0.75, top + 0.75, Math.Max(1, ie - ix - 1.5), Math.Max(1, hh - 1.5)), radius));
if (Full)
{
- var tag = Text(Ms(nt.Out * msPerBeat), NotaFonts.Sans, NotaType.KnobValue, lit ? FillLit : TagInk);
+ var tag = Text(Ms(nt.Out * msPerBeat), NotaFonts.Measure, NotaType.KnobValue, lit ? FillLit : TagInk);
double tx = Math.Min(Math.Max(Math.Max(oe, ie), X(nt.Start + nt.Hi)), win.X + win.Width * 0.88) + 5;
ctx.DrawText(tag, new Point(tx, top + hh / 2 - tag.Height / 2));
}
@@ -162,8 +162,8 @@ internal sealed class LengthGateViz : Control
{
var inp = Input[i];
bool lit = !_off && _now >= _notes[i].Start && _now < _notes[i].Start + _notes[i].Out;
- var name = Text(DeviceCardKit.NoteName(inp.Key), NotaFonts.Sans, NotaType.KnobValue, lit ? FillLit : Label);
- var vel = Text($"vel {inp.Vel}", NotaFonts.Sans, NotaType.RowLabel, VelInk);
+ var name = Text(DeviceCardKit.NoteName(inp.Key), NotaFonts.Measure, NotaType.KnobValue, lit ? FillLit : Label);
+ var vel = Text($"vel {inp.Vel}", NotaFonts.Measure, NotaType.RowLabel, VelInk);
double cy = win.Y + (i + 0.5) * rowH, th = name.Height + vel.Height - 2;
ctx.DrawText(name, new Point(0, cy - th / 2));
ctx.DrawText(vel, new Point(0, cy - th / 2 + name.Height - 2));
@@ -172,7 +172,7 @@ internal sealed class LengthGateViz : Control
for (int b = 0; b <= (int)Window; b++)
{
string s = b == 0 ? "0" : b * msPerBeat >= 1000 ? $"{b * msPerBeat / 1000:0.0#} s" : $"{b * msPerBeat:0} ms";
- var ft = Text(s, NotaFonts.Sans, NotaType.RowLabel, Axis);
+ var ft = Text(s, NotaFonts.Measure, NotaType.RowLabel, Axis);
double x = X(b) - (b == 0 ? 0 : b == (int)Window ? ft.Width : ft.Width / 2);
ctx.DrawText(ft, new Point(x, win.Bottom + 4));
}
diff --git a/src/managed/Nota.App/Controls/LensViews.cs b/src/managed/Nota.App/Controls/LensViews.cs
index f634e569..50938caf 100644
--- a/src/managed/Nota.App/Controls/LensViews.cs
+++ b/src/managed/Nota.App/Controls/LensViews.cs
@@ -156,11 +156,11 @@ internal static class LensInk
public static void Text(DrawingContext ctx, string s, double x, double y, IBrush ink, double size = 7, bool mono = true)
=> ctx.DrawText(new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,
- mono ? NotaFonts.Sans : NotaFonts.SansMedium, size, ink, NotaTextSize.InCard), new Point(x, y));
+ mono ? NotaFonts.Measure : NotaFonts.SansMedium, size, ink, NotaTextSize.InCard), new Point(x, y));
public static double TextW(string s, double size = 7, bool mono = true)
=> new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight,
- mono ? NotaFonts.Sans : NotaFonts.SansMedium, size, NotaPalette.TextPrimary, NotaTextSize.InCard).Width;
+ mono ? NotaFonts.Measure : NotaFonts.SansMedium, size, NotaPalette.TextPrimary, NotaTextSize.InCard).Width;
}
// ===========================================================================
diff --git a/src/managed/Nota.App/Controls/MeterFader.cs b/src/managed/Nota.App/Controls/MeterFader.cs
index f85aa316..127a2e32 100644
--- a/src/managed/Nota.App/Controls/MeterFader.cs
+++ b/src/managed/Nota.App/Controls/MeterFader.cs
@@ -131,7 +131,7 @@ internal sealed class MeterFader : Control
for (int i = 0; i < Marks.Length; i++)
{
var t = new NotaFormattedText(MarkText[i], System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
- NotaFonts.Sans, 7, NotaPalette.TextDisabled);
+ NotaFonts.Measure, 7, NotaPalette.TextDisabled);
double y = (1 - MeterScale.NormDb(Marks[i])) * h - t.Height / 2;
ctx.DrawText(t, new Point(x + ScaleW - 1 - t.Width, Math.Clamp(y, 0, h - t.Height)));
}
diff --git a/src/managed/Nota.App/Controls/NaBadge.cs b/src/managed/Nota.App/Controls/NaBadge.cs
index dfeac7e9..fc6d794d 100644
--- a/src/managed/Nota.App/Controls/NaBadge.cs
+++ b/src/managed/Nota.App/Controls/NaBadge.cs
@@ -43,7 +43,7 @@ public sealed class NaBadge : Border
Height = 16;
VerticalAlignment = VerticalAlignment.Center;
Child = _label;
- _label.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _label.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
Apply();
}
diff --git a/src/managed/Nota.App/Controls/NotaGraph.cs b/src/managed/Nota.App/Controls/NotaGraph.cs
index e9c06f0b..c48d9687 100644
--- a/src/managed/Nota.App/Controls/NotaGraph.cs
+++ b/src/managed/Nota.App/Controls/NotaGraph.cs
@@ -65,7 +65,7 @@ internal static class NotaGraph
/// <summary>An axis label at the column-head size, faint ink. Text size leaves it alone (devices'
/// graphs); a view outside a card passes itself as <paramref name="owner"/> to take the step.</summary>
public static FormattedText AxisText(string text, IBrush? ink = null, double size = AxisSize, AvaloniaObject? owner = null)
- => new NotaFormattedText(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink ?? AxisInk, owner ?? NotaTextSize.InCard);
+ => new NotaFormattedText(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink ?? AxisInk, owner ?? NotaTextSize.InCard);
public enum Corner { TopLeft, TopRight, BottomLeft, BottomRight }
@@ -137,7 +137,7 @@ internal static class NotaGraph
for (int i = items.Length - 1; i >= 0; i--)
{
var (label, ink, mark) = items[i];
- var ft = new NotaFormattedText(label, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, AxisSize, ink, NotaTextSize.InCard);
+ var ft = new NotaFormattedText(label, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, AxisSize, ink, NotaTextSize.InCard);
x -= ft.Width;
ctx.DrawText(ft, new Point(x, y));
double cy = y + ft.Height / 2;
diff --git a/src/managed/Nota.App/Controls/OperatorAlgoViz.cs b/src/managed/Nota.App/Controls/OperatorAlgoViz.cs
index caf83abf..9fa127fe 100644
--- a/src/managed/Nota.App/Controls/OperatorAlgoViz.cs
+++ b/src/managed/Nota.App/Controls/OperatorAlgoViz.cs
@@ -88,7 +88,7 @@ internal sealed class OperatorAlgoMini : Control
private static readonly IBrush AccentSubtle = NotaPalette.AccentSubtle;
private static readonly IBrush InkSubtle = NotaPalette.Wash(NotaPalette.VizInk, 0x30);
private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private readonly int _algo;
private bool _active;
@@ -151,7 +151,7 @@ internal sealed class OperatorRoutingViz : Control
private static readonly IBrush TextTertiary = NotaPalette.TextTertiary;
private static readonly IBrush TextPrimary = NotaPalette.TextPrimary;
private static readonly Typeface Semi = NotaFonts.SansSemiBold;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private int _algo;
private double[] _x = new double[4], _y = new double[4];
diff --git a/src/managed/Nota.App/Controls/PanBar.cs b/src/managed/Nota.App/Controls/PanBar.cs
index e31cc185..88526cf8 100644
--- a/src/managed/Nota.App/Controls/PanBar.cs
+++ b/src/managed/Nota.App/Controls/PanBar.cs
@@ -25,7 +25,7 @@ public sealed class PanBar : Control, IInlineReadout
private static readonly IBrush ArcLive = NotaPalette.Accent; // under the pointer or in the hand
private static readonly IBrush Pointer = NotaPalette.TextPrimary;
private static readonly IBrush TextBrush = NotaPalette.TextPrimary;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
public const double KnobD = 14;
private const double StartDeg = 135, SweepDeg = 270, Stroke = 2;
diff --git a/src/managed/Nota.App/Controls/PendulumViews.cs b/src/managed/Nota.App/Controls/PendulumViews.cs
index 311d7d62..d4fa9a36 100644
--- a/src/managed/Nota.App/Controls/PendulumViews.cs
+++ b/src/managed/Nota.App/Controls/PendulumViews.cs
@@ -27,7 +27,7 @@ namespace Nota.App;
internal static class PendulumInk
{
public static FormattedText Mono(string t, IBrush ink, double size = NotaGraph.AxisSize)
- => new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
/// <summary>Seconds as the lanes print them: 0.12 s, 1.3 s, or — when never.</summary>
public static string Secs(double s) => s < 0 || s > 99 ? "—" : s < 10 ? NotaNum.Unit(s, "0.00", "s") : NotaNum.Unit(s, "0.0", "s");
diff --git a/src/managed/Nota.App/Controls/PentadViews.cs b/src/managed/Nota.App/Controls/PentadViews.cs
index ee5f541f..e5a513e4 100644
--- a/src/managed/Nota.App/Controls/PentadViews.cs
+++ b/src/managed/Nota.App/Controls/PentadViews.cs
@@ -120,7 +120,7 @@ internal sealed class PentadFilterCurve : FilterGraphBase
// N voice cells, lit (accent) while a voice sounds, brightness following its level.
internal sealed class PentadVoiceStrip : Control
{
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private readonly float[] _lv = new float[16];
private int _n = 5;
diff --git a/src/managed/Nota.App/Controls/PrismViews.cs b/src/managed/Nota.App/Controls/PrismViews.cs
index e9f910af..811c892d 100644
--- a/src/managed/Nota.App/Controls/PrismViews.cs
+++ b/src/managed/Nota.App/Controls/PrismViews.cs
@@ -36,7 +36,7 @@ internal static class PrismInk
public static readonly string[] Names = { "Low", "Mid", "High" };
public static readonly IBrush InnerBorder = NotaPalette.GraphBorder;
public static readonly IPen InnerPen = new Pen(InnerBorder, 1);
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private static readonly Typeface Sans = NotaFonts.SansSemiBold;
public static IBrush Alpha(Color c, byte a) => new SolidColorBrush(Color.FromArgb(a, c.R, c.G, c.B));
diff --git a/src/managed/Nota.App/Controls/RandomOutputViz.cs b/src/managed/Nota.App/Controls/RandomOutputViz.cs
index 92d70406..632bee78 100644
--- a/src/managed/Nota.App/Controls/RandomOutputViz.cs
+++ b/src/managed/Nota.App/Controls/RandomOutputViz.cs
@@ -170,7 +170,7 @@ internal sealed class RandomOutputViz : Control
}
private static FormattedText Text(string s, double size, IBrush ink)
- => new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(s, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
public override void Render(DrawingContext ctx)
{
diff --git a/src/managed/Nota.App/Controls/ReverbViews.cs b/src/managed/Nota.App/Controls/ReverbViews.cs
index 000a7679..3aa972d6 100644
--- a/src/managed/Nota.App/Controls/ReverbViews.cs
+++ b/src/managed/Nota.App/Controls/ReverbViews.cs
@@ -179,7 +179,7 @@ internal sealed class ReverbTailView : Control, IValueHandles
}
private static FormattedText Text(string t, IBrush ink, double size = NotaGraph.AxisSize)
- => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
private static string SecF(double s) => s >= 1 ? NotaNum.F($"{s:0.##} s") : NotaNum.F($"{s * 1000:0} ms");
public override void Render(DrawingContext ctx)
diff --git a/src/managed/Nota.App/Controls/RhythmViews.cs b/src/managed/Nota.App/Controls/RhythmViews.cs
index 1490d54d..256f4a65 100644
--- a/src/managed/Nota.App/Controls/RhythmViews.cs
+++ b/src/managed/Nota.App/Controls/RhythmViews.cs
@@ -29,7 +29,7 @@ namespace Nota.App;
internal static class RhythmInk
{
public static FormattedText Mono(string t, IBrush ink, double size = NotaGraph.AxisSize)
- => new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
public static void TopRight(DrawingContext ctx, double w, string t, IBrush ink)
{
diff --git a/src/managed/Nota.App/Controls/ScaleNoteMap.cs b/src/managed/Nota.App/Controls/ScaleNoteMap.cs
index 14997817..1c29fc48 100644
--- a/src/managed/Nota.App/Controls/ScaleNoteMap.cs
+++ b/src/managed/Nota.App/Controls/ScaleNoteMap.cs
@@ -151,7 +151,7 @@ internal sealed class ScaleNoteMap : Control
double r = Mini ? 3 : 5;
double nameFs = Mini ? 10 : NotaType.KnobValue, subFs = Mini ? 10 : NotaType.RowLabel, padB = Mini ? 4 : 6, gapT = Mini ? 1 : 2;
var sans = NotaFonts.SansSemiBold;
- var mono = NotaFonts.Sans;
+ var mono = NotaFonts.Measure;
for (int pc = 0; pc < 12; pc++)
{
diff --git a/src/managed/Nota.App/Controls/SynthViz.cs b/src/managed/Nota.App/Controls/SynthViz.cs
index 936276e4..e21a6d28 100644
--- a/src/managed/Nota.App/Controls/SynthViz.cs
+++ b/src/managed/Nota.App/Controls/SynthViz.cs
@@ -42,7 +42,7 @@ internal sealed class SynthViz : Control, IMidiLearnRegions, IValueEntryHost
private static readonly IBrush Ink = NotaPalette.VizInk; // curves at rest: neutral ink
private static readonly IBrush Axis = NotaPalette.TextAxis;
private static readonly IBrush Ghost = NotaPalette.Wash(NotaPalette.VizInk, 0x40);
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private const double Pad = 6;
diff --git a/src/managed/Nota.App/Controls/TwinViews.cs b/src/managed/Nota.App/Controls/TwinViews.cs
index 89c240b0..d9495426 100644
--- a/src/managed/Nota.App/Controls/TwinViews.cs
+++ b/src/managed/Nota.App/Controls/TwinViews.cs
@@ -468,7 +468,7 @@ internal sealed class TwinStepGrid : Control
NotaGraph.Window(ctx, r);
if (Pattern is null) return;
double cw = CellW, top = 18, barH = r.Height - top - 16;
- var mono = NotaFonts.Sans;
+ var mono = NotaFonts.Measure;
for (int c = 0; c < 16; c++)
{
int st = Page * 16 + c;
@@ -655,7 +655,7 @@ internal sealed class TwinPatchMatrix : Control, IValueEntryHost
{
internal readonly record struct Cell(int Slot, int Src, int Dst, float Depth, float Other);
- private static readonly Typeface Mono = NotaFonts.Sans;
+ private static Typeface Mono => NotaFonts.Measure;
private static readonly Typeface Sans = NotaFonts.Sans;
private static readonly Typeface SansMedium = NotaFonts.SansMedium;
private int[] _rows = Array.Empty<int>(), _cols = Array.Empty<int>();
diff --git a/src/managed/Nota.App/Controls/ValueBar.cs b/src/managed/Nota.App/Controls/ValueBar.cs
index bc41127a..5fcb4b78 100644
--- a/src/managed/Nota.App/Controls/ValueBar.cs
+++ b/src/managed/Nota.App/Controls/ValueBar.cs
@@ -22,7 +22,7 @@ public sealed class ValueBar : Control
private static readonly IBrush FillBrass = NotaPalette.Wash(NotaPalette.VizInk, 0x40); // at rest: neutral
private static readonly IBrush FillLive = NotaPalette.Wash(NotaPalette.Accent, 0x8C); // live
private static readonly IBrush TextBrush = NotaPalette.TextPrimary;
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private double _value; // normalized 0..1
private readonly Func<double, string> _fmt; // formats the normalized value for display
diff --git a/src/managed/Nota.App/Controls/ValueEntry.cs b/src/managed/Nota.App/Controls/ValueEntry.cs
index 72290bef..ac57338f 100644
--- a/src/managed/Nota.App/Controls/ValueEntry.cs
+++ b/src/managed/Nota.App/Controls/ValueEntry.cs
@@ -374,7 +374,7 @@ internal static partial class ValueEntry
var box = new TextBox
{
Classes = { "value" },
- Text = was, FontFamily = font?.FontFamily ?? NotaFonts.UiFamily, FontSize = fontSize,
+ Text = was, FontFamily = font?.FontFamily ?? NotaFonts.ValuesFamily, FontSize = fontSize,
FontWeight = font?.FontWeight ?? FontWeight.Normal,
Height = h, Width = w,
HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top,
diff --git a/src/managed/Nota.App/Controls/VoltEnv.cs b/src/managed/Nota.App/Controls/VoltEnv.cs
index 375fa2cd..0b6a33ab 100644
--- a/src/managed/Nota.App/Controls/VoltEnv.cs
+++ b/src/managed/Nota.App/Controls/VoltEnv.cs
@@ -62,7 +62,7 @@ namespace Nota.App;
// release → R; Tab walks them), double-click resets them (specs/035-typed-value-entry).
internal sealed class VoltEnv : Control, IMidiLearnRegions, IValueEntryHost
{
- private static readonly Typeface Face = NotaFonts.Sans;
+ private static Typeface Face => NotaFonts.Measure;
private static string Letters => Loc.T("device.env.stage_letters"); // A D S R
private const double HoldFrac = 0.18; // the sustain stretch: held, not timed
private const double BarH = 11, TickH = 10, BadgeW = 36; // BadgeW: room for the sustain value
diff --git a/src/managed/Nota.App/Controls/VoltMatrix.cs b/src/managed/Nota.App/Controls/VoltMatrix.cs
index 168ce1bc..0681e01b 100644
--- a/src/managed/Nota.App/Controls/VoltMatrix.cs
+++ b/src/managed/Nota.App/Controls/VoltMatrix.cs
@@ -33,7 +33,7 @@ internal sealed class VoltMatrix : Control, IValueEntryHost
private static readonly IBrush TxtC = NotaPalette.TextPrimary;
private static readonly IBrush MutedC = NotaPalette.TextTertiary;
private static readonly IBrush CellBg = NotaPalette.BgSunken;
- private static readonly Typeface Face = NotaFonts.Sans;
+ private static Typeface Face => NotaFonts.Measure;
// How far the pointer travels for the full ±range — the knob's own feel.
private const double Travel = 140;
diff --git a/src/managed/Nota.App/DeviceCardKit.cs b/src/managed/Nota.App/DeviceCardKit.cs
index 96a016f1..22364425 100644
--- a/src/managed/Nota.App/DeviceCardKit.cs
+++ b/src/managed/Nota.App/DeviceCardKit.cs
@@ -75,7 +75,7 @@ internal static class DeviceCardKit
{
value.FontSize = NotaType.KnobValue;
value.LineHeight = 9;
- value.FontFamily = NotaFonts.UiFamily;
+ value.FontFamily = NotaFonts.ValuesFamily;
var lbl = new TextBlock
{
Text = NotaText.Label(name), FontSize = NotaType.KnobLabel,
@@ -233,7 +233,7 @@ internal static class DeviceCardKit
if (!double.IsNaN(trackWidth)) track.Width = trackWidth;
var val = new TextBlock
{
- FontFamily = NotaFonts.UiFamily, FontSize = 9, TextAlignment = TextAlignment.Right,
+ FontFamily = NotaFonts.ValuesFamily, FontSize = 9, TextAlignment = TextAlignment.Right,
VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.None,
};
if (valueWidth > 0) val.Width = valueWidth;
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs
index 66fd6c75..84198c3e 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoFilterDeviceBody.cs
@@ -135,7 +135,7 @@ internal sealed class AutoFilterDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
static T GRow<T>(T c, int row) where T : Control { Grid.SetRow(c, row); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs
index 56519af8..9ba2148c 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoGainDeviceBody.cs
@@ -85,7 +85,7 @@ internal sealed class AutoGainDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
static T GRow<T>(T c, int row) where T : Control { Grid.SetRow(c, row); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoPanDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoPanDeviceBody.cs
index 32db5736..be01413c 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoPanDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoPanDeviceBody.cs
@@ -84,7 +84,7 @@ internal sealed class AutoPanDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null) => new()
{ Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs
index 315bbb3e..29004aea 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/AutoShiftDeviceBody.cs
@@ -205,7 +205,7 @@ internal sealed class AutoShiftDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
static T GRow<T>(T c, int row) where T : Control { Grid.SetRow(c, row); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs
index 877f6cef..a76d94d8 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/BeatRepeatDeviceBody.cs
@@ -114,7 +114,7 @@ internal sealed class BeatRepeatDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
static T GRow<T>(T c, int row) where T : Control { Grid.SetRow(c, row); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs
index caba95d3..3c70e5b5 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/CeilingDeviceBody.cs
@@ -133,7 +133,7 @@ internal sealed class CeilingDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static StackPanel Row(double sp, params Control[] cs)
{ var s = new StackPanel { Orientation = Orientation.Horizontal, Spacing = sp, VerticalAlignment = VerticalAlignment.Center }; foreach (var c in cs) s.Children.Add(c); return s; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs
index 8cbff413..d0e38dae 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/ChamberDeviceBody.cs
@@ -136,7 +136,7 @@ internal sealed class ChamberDeviceBody : IDeviceBody
// ---- small builders ---------------------------------------------------------
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new() { Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? MutedC, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static StackPanel Row(double sp, params Control[] cs)
{ var s = new StackPanel { Orientation = Orientation.Horizontal, Spacing = sp, VerticalAlignment = VerticalAlignment.Center }; foreach (var c in cs) s.Children.Add(c); return s; }
static Control Docked(Control c, Dock d) { DockPanel.SetDock(c, d); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ChorusDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ChorusDeviceBody.cs
index e1036414..09469eb9 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/ChorusDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/ChorusDeviceBody.cs
@@ -92,7 +92,7 @@ internal sealed class ChorusDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null) => new()
{ Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs
index 5ef8a02e..aff26b6a 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/CompressorDeviceBody.cs
@@ -111,7 +111,7 @@ internal sealed class CompressorDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
static T GRow<T>(T c, int row) where T : Control { Grid.SetRow(c, row); return c; }
static Border Rule() => new() { Height = 1, Background = NotaPalette.GraphBorder, Margin = new Thickness(0, 1) };
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs
index 7d5e3dd7..498d9d75 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/CrushDeviceBody.cs
@@ -101,7 +101,7 @@ internal sealed class CrushDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
void Learn(Control c, int p) => MidiLearn.Bind(c, MidiTarget.DeviceParam(track, di, p), engine.DeviceParamName(track, di, p));
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs
index 1e04bc55..e3ddadeb 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/DelayDeviceBody.cs
@@ -104,7 +104,7 @@ internal sealed class DelayDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
// Gauge knob bound to a device param (automation gesture + MIDI learn + live follow).
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs
index 375df215..e6585b26 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/DynamicEqDeviceBody.cs
@@ -88,7 +88,7 @@ internal sealed class DynamicEqDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
@@ -115,7 +115,7 @@ internal sealed class DynamicEqDeviceBody : IDeviceBody
{
int bb = b;
var num = new TextBlock { FontSize = 8, FontWeight = FontWeight.SemiBold, Text = (b + 1).ToString(), VerticalAlignment = VerticalAlignment.Center };
- num.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ num.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var type = new TextBlock { FontSize = 7, FontWeight = FontWeight.SemiBold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(3, 0, 0, 0) };
var hz = Mono("", 7, TextPrimary); hz.HorizontalAlignment = HorizontalAlignment.Right;
var bar = new Border { Height = 2, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Bottom };
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs
index faed6169..51f5abc1 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/Eq3DeviceBody.cs
@@ -71,7 +71,7 @@ internal sealed class Eq3DeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static StackPanel Row(double sp, params Control[] cs)
{ var s = new StackPanel { Orientation = Orientation.Horizontal, Spacing = sp, VerticalAlignment = VerticalAlignment.Center }; foreach (var c in cs) s.Children.Add(c); return s; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/EqDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/EqDeviceBody.cs
index 6ed73f9a..396c38a2 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/EqDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/EqDeviceBody.cs
@@ -95,7 +95,7 @@ internal sealed class EqDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/FlangerDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/FlangerDeviceBody.cs
index 2d253301..f56a977a 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/FlangerDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/FlangerDeviceBody.cs
@@ -89,7 +89,7 @@ internal sealed class FlangerDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null) => new()
{ Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs
index 0a7eab84..d4440330 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/ForgeDeviceBody.cs
@@ -108,7 +108,7 @@ internal sealed class ForgeDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
static T GRow<T>(T c, int row) where T : Control { Grid.SetRow(c, row); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/LensDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/LensDeviceBody.cs
index 8c8b2d00..915547d4 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/LensDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/LensDeviceBody.cs
@@ -118,7 +118,7 @@ internal sealed class LensDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? MutedC, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static Control Docked(Control c, Dock d) { DockPanel.SetDock(c, d); return c; }
static Control Col(Control c, int col) { Grid.SetColumn(c, col); return c; }
Control Learn(Control c, int p) { MidiLearn.Bind(c, MidiTarget.DeviceParam(track, di, p), engine.DeviceParamName(track, di, p)); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/PhaserDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/PhaserDeviceBody.cs
index b246a702..f4a92693 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/PhaserDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/PhaserDeviceBody.cs
@@ -92,7 +92,7 @@ internal sealed class PhaserDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null) => new()
{ Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
@@ -205,7 +205,7 @@ internal sealed class PhaserDeviceBody : IDeviceBody
var stageSeg = Segments(PhaserMath.StageCounts.Select(n => n.ToString()).ToArray(), () => PhaserMath.StageIndex(P(Stages)),
i => { SetP(Stages, i / (double)(PhaserMath.StageCounts.Length - 1)); RefreshAll(); }, out var stageSync, padX: 5);
- foreach (var tb in stageSeg.GetLogicalDescendants().OfType<TextBlock>()) tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ foreach (var tb in stageSeg.GetLogicalDescendants().OfType<TextBlock>()) tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
readouts.Add(stageSync);
Learn(stageSeg, Stages);
ToolTip.SetTip(stageSeg, Loc.T("device.phaser.all_pass_stages_every_two"));
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs
index fc9f7907..3e2c1091 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/PrismDeviceBody.cs
@@ -122,7 +122,7 @@ internal sealed class PrismDeviceBody : IDeviceBody
// An acronym NotaText.Label does not know (OS, GR) keeps its case: the label as written.
static TextBlock Acr(string t, IBrush? c = null) { var tb = Caps(t, c); tb.Text = t; return tb; }
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static Control Docked(Control c, Dock d) { DockPanel.SetDock(c, d); return c; }
static Control Col(Control c, int col) { Grid.SetColumn(c, col); return c; }
static Control GRow(Control c, int row) { Grid.SetRow(c, row); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs
index 2a5ad183..0d6bb2e4 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/ReverbDeviceBody.cs
@@ -100,7 +100,7 @@ internal sealed class ReverbDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
// Gauge knob bound to a device param (automation gesture + MIDI learn + live follow).
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs
index 6bf44307..1d300abd 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/ShutterDeviceBody.cs
@@ -140,7 +140,7 @@ internal sealed class ShutterDeviceBody : IDeviceBody
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
// An acronym NotaText.Label does not know (OS, GR) keeps its case: the label as written.
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static StackPanel Row(double sp, params Control[] cs)
{ var s = new StackPanel { Orientation = Orientation.Horizontal, Spacing = sp, VerticalAlignment = VerticalAlignment.Center }; foreach (var c in cs) s.Children.Add(c); return s; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs
index ddc31a4f..419b1a00 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/StrataDeviceBody.cs
@@ -170,7 +170,7 @@ internal sealed class StrataDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null) => new()
{ Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static bool Left(PointerPressedEventArgs e, Control c) => e.GetCurrentPoint(c).Properties.IsLeftButtonPressed;
@@ -491,7 +491,7 @@ internal sealed class StrataDeviceBody : IDeviceBody
double lmn = log ? Math.Log(mn) : mn, lspan = (log ? Math.Log(mx) : mx) - lmn;
double NormOf(double v) { double x = log ? Math.Log(Math.Clamp(v, mn, mx)) : Math.Clamp(v, mn, mx); return (x - lmn) / Math.Max(1e-9, lspan); }
double ValOf(double n) { double x = lmn + Math.Clamp(n, 0, 1) * lspan; return log ? Math.Exp(x) : x; }
- var val = new TextBlock { Foreground = TextPrimary };
+ var val = new TextBlock { Foreground = TextPrimary, FontFamily = NotaFonts.ValuesFamily };
var knob = new Knob(NormOf(P(p)), 1.0) { Accent = true, Default = NormOf(engine.DeviceParamDefault(track, di, p)), Width = 34, Height = 34 };
knob.ValueChanged += n => { SetR(p, (float)ValOf(n)); val.Text = fmt(P(p)); };
knob.GestureBegin += () => engine.BeginAutomationWrite(track, AutomationTarget.DeviceParam, di, p, "");
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs
index a6567f12..79f2ae12 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/UtilityDeviceBody.cs
@@ -133,7 +133,7 @@ internal sealed class UtilityDeviceBody : IDeviceBody
static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? TextTertiary, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
void Learn(Control c, int p) => MidiLearn.Bind(c, MidiTarget.DeviceParam(track, di, p), engine.DeviceParamName(track, di, p));
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/ValveDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/ValveDeviceBody.cs
index 995d75da..f8549b32 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/ValveDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/ValveDeviceBody.cs
@@ -116,7 +116,7 @@ internal sealed class ValveDeviceBody : IDeviceBody
// An acronym NotaText.Label does not know (OS, GR) keeps its case: the label as written.
static TextBlock Acr(string t, IBrush? c = null) { var tb = Caps(t, c); tb.Text = t; return tb; }
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
void Learn(Control c, int p) => MidiLearn.Bind(c, MidiTarget.DeviceParam(track, di, p), engine.DeviceParamName(track, di, p));
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/VintageDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/VintageDeviceBody.cs
index f5f5a212..0116b41f 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/VintageDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/VintageDeviceBody.cs
@@ -108,7 +108,7 @@ internal sealed class VintageDeviceBody : IDeviceBody
// An acronym NotaText.Label does not know (OS, GR) keeps its case: the label as written.
static TextBlock Acr(string t, IBrush? c = null) { var tb = Caps(t, c); tb.Text = t; return tb; }
static TextBlock Mono(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static T Docked<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
void Learn(Control c, int p) => MidiLearn.Bind(c, MidiTarget.DeviceParam(track, di, p), engine.DeviceParamName(track, di, p));
diff --git a/src/managed/Nota.App/DeviceCards/Bodies/VocoderDeviceBody.cs b/src/managed/Nota.App/DeviceCards/Bodies/VocoderDeviceBody.cs
index efa01fff..507df830 100644
--- a/src/managed/Nota.App/DeviceCards/Bodies/VocoderDeviceBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Bodies/VocoderDeviceBody.cs
@@ -94,7 +94,7 @@ internal sealed class VocoderDeviceBody : IDeviceBody
// ---- small builders ---------------------------------------------------------
static TextBlock Mono(string t, double fs, IBrush c) => new()
- { Text = t, FontSize = fs, Foreground = c, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, Foreground = c, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center };
static T Col<T>(T c, int col) where T : Control { Grid.SetColumn(c, col); return c; }
Grid Slider(string label, int p, Func<double, string> fmt, string tip, Func<bool>? dim = null, bool bipolar = false, int steps = 0)
diff --git a/src/managed/Nota.App/DeviceCards/DeviceParamControls.cs b/src/managed/Nota.App/DeviceCards/DeviceParamControls.cs
index b372e3ad..e0a40b60 100644
--- a/src/managed/Nota.App/DeviceCards/DeviceParamControls.cs
+++ b/src/managed/Nota.App/DeviceCards/DeviceParamControls.cs
@@ -42,7 +42,7 @@ internal static class DeviceParamControls
double span = Math.Max(1e-6, max - min);
var value = new TextBlock { Text = Fmt(val), FontSize = 8, Foreground = TextPrimary };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var knob = new Knob((val - min) / span, 1.0) { Accent = true, Default = (engine.DeviceParamDefault(track, device, param) - min) / span };
knob.Format = frac => Fmt((float)(min + frac * span));
int d = device, pp = param;
@@ -117,7 +117,7 @@ internal static class DeviceParamControls
private static Control ScFaderRow(string name, double norm, Func<double, string> fmt, Action<double> apply)
{
var value = new TextBlock { Text = fmt(norm), FontSize = 8, Foreground = TextPrimary };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var knob = new Knob(Math.Clamp(norm, 0, 1), 1.0) { Accent = true };
knob.Format = fmt;
knob.ValueChanged += frac => { apply(frac); value.Text = fmt(frac); };
diff --git a/src/managed/Nota.App/DeviceCards/InstrumentControls.cs b/src/managed/Nota.App/DeviceCards/InstrumentControls.cs
index b1276b08..f14eb460 100644
--- a/src/managed/Nota.App/DeviceCards/InstrumentControls.cs
+++ b/src/managed/Nota.App/DeviceCards/InstrumentControls.cs
@@ -30,7 +30,7 @@ internal static class InstrumentControls
int track = ctx.TrackId;
Func<float, string> f = fmt ?? Pct;
var value = new TextBlock { Text = f(engine.PluginParamGet(track, -1, i)), FontSize = 8, Foreground = TextPrimary };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var knob = new Knob(engine.PluginParamGet(track, -1, i), 1.0) { Accent = true, ArcColor = arc, Default = engine.InstrumentParamDefault(track, i), Inline = inline, Width = knobSize, Height = knobSize };
knob.Format = v => f((float)v);
int pi = i; string pid = id;
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs
index eff80e33..7c8bdaf1 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/AuroraInstrumentCard.cs
@@ -166,7 +166,7 @@ internal sealed class AuroraInstrumentCard : IInstrumentCard
var hint = new TextBlock
{
- FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,
+ FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.ValuesFamily,
VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(0, 0, 6, 0), TextTrimming = TextTrimming.CharacterEllipsis,
};
@@ -256,7 +256,7 @@ internal sealed class AuroraInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 8) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
static TextBlock Section(string t, IBrush? c = null) => new()
{
@@ -271,7 +271,7 @@ internal sealed class AuroraInstrumentCard : IInstrumentCard
if (!idx.TryGetValue(id, out var pi)) return new Panel();
var value = new TextBlock
{
- Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,
+ Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Center,
TextAlignment = TextAlignment.Center, LineHeight = 10,
};
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs
index 9d450558..e2ad61ba 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/BassInstrumentCard.cs
@@ -107,7 +107,7 @@ internal sealed class BassInstrumentCard : IInstrumentCard
var filtEnv = new VoltEnv(engine, track) { ShowTitle = false, VerticalAlignment = VerticalAlignment.Stretch, MinWidth = 100, MinHeight = 50 };
var hint = new TextBlock
{
- FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,
+ FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.ValuesFamily,
VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(0, 0, 8, 0), TextTrimming = TextTrimming.CharacterEllipsis,
};
@@ -131,7 +131,7 @@ internal sealed class BassInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 8) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
static TextBlock Section(string t) => new()
{
@@ -152,7 +152,7 @@ internal sealed class BassInstrumentCard : IInstrumentCard
if (!idx.TryGetValue(id, out var pi)) return new Panel();
var value = new TextBlock
{
- Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,
+ Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Center,
TextAlignment = TextAlignment.Center, LineHeight = 10,
};
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs
index 0e99b270..1cc69ded 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/ConsortInstrumentCard.cs
@@ -120,7 +120,7 @@ internal sealed class ConsortInstrumentCard : IInstrumentCard
=> new() { Text = NotaText.Label(t), FontSize = fs, FontWeight = w, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Caps(string t) => new() { Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = MutedC, VerticalAlignment = VerticalAlignment.Center };
static TextBlock MonoText(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static StackPanel Row(double sp, params Control[] cs)
{ var s = new StackPanel { Orientation = Orientation.Horizontal, Spacing = sp, VerticalAlignment = VerticalAlignment.Center }; foreach (var c in cs) s.Children.Add(c); return s; }
static Control Docked(Control c, Dock d) { DockPanel.SetDock(c, d); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs
index 3d44be87..903015e0 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/FluxInstrumentCard.cs
@@ -109,7 +109,7 @@ internal sealed class FluxInstrumentCard : IInstrumentCard
};
static TextBlock Mono(string t, IBrush? c = null) => new()
{
- Text = t, FontSize = NotaType.Axis, Foreground = c ?? TextTertiary, FontFamily = NotaFonts.UiFamily,
+ Text = t, FontSize = NotaType.Axis, Foreground = c ?? TextTertiary, FontFamily = NotaFonts.ValuesFamily,
VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis,
};
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs
index 51445700..94c30140 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/GrainInstrumentCard.cs
@@ -139,7 +139,7 @@ internal sealed class GrainInstrumentCard : IInstrumentCard
var hint = new TextBlock
{
- FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,
+ FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.ValuesFamily,
VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(0, 0, 8, 0), TextTrimming = TextTrimming.CharacterEllipsis,
};
@@ -178,7 +178,7 @@ internal sealed class GrainInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 8) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
// Every knob is a table cell: a short label on the card while MIDI learn and the CV
@@ -189,7 +189,7 @@ internal sealed class GrainInstrumentCard : IInstrumentCard
if (!idx.TryGetValue(id, out var pi)) return new Panel();
var value = new TextBlock
{
- Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,
+ Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Center,
TextAlignment = TextAlignment.Center, LineHeight = 10,
};
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs
index 0c6c1421..a192437a 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/KeysInstrumentCard.cs
@@ -216,7 +216,7 @@ internal sealed class KeysInstrumentCard : IInstrumentCard
// PICKUP: the graph, with the bark readout (or, for Clav, the pickup chips) on its header.
var bark = new TextBlock { FontSize = 8, Foreground = DeviceCardKit.ModInkBright, VerticalAlignment = VerticalAlignment.Center };
- bark.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ bark.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var puChips = Chips("pupos", KeysModel.PickupPositions, padX: 4);
var puAcc = new Panel { Children = { bark, puChips } };
readouts.Add(() =>
@@ -238,7 +238,7 @@ internal sealed class KeysInstrumentCard : IInstrumentCard
// DAMPER + the pedal.
var pedalDot = new Ellipse { Width = 6, Height = 6, VerticalAlignment = VerticalAlignment.Center };
var pedalTxt = new TextBlock { Text = "CC64", FontSize = 8, VerticalAlignment = VerticalAlignment.Center };
- pedalTxt.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ pedalTxt.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var pedalPill = new Border
{
CornerRadius = NotaRadius.Cell, BorderThickness = new Thickness(1), Padding = new Thickness(5, 1),
@@ -369,7 +369,7 @@ internal sealed class KeysInstrumentCard : IInstrumentCard
var voicesChips = Chips("voices", KeysModel.VoiceNames, padX: 3);
var grid = new KeysVoiceGrid { Margin = new Thickness(0, 2, 0, 0) };
var voicesLine = new TextBlock { FontSize = 8, Foreground = TextPrimary };
- voicesLine.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ voicesLine.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var pedalLine = new TextBlock { FontSize = 7, Foreground = NotaPalette.TextAxis };
ctx.AddDeviceRefresher(() =>
{
@@ -415,7 +415,7 @@ internal sealed class KeysInstrumentCard : IInstrumentCard
var tabRow = new StackPanel { Orientation = Orientation.Horizontal };
var modelChips = ModelChips(false);
var chain = new TextBlock { FontSize = NotaType.Axis, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
- chain.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ chain.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
readouts.Add(() =>
chain.Text = $"{(On("preon") ? "preamp" : "—")} → {(On("tremon") ? "trem" : "—")} → {(On("phaseron") ? "phaser" : "—")} → "
+ $"{(On("choruson") ? "chorus" : "—")} → {KeysModel.CabNames[Sel("cab", 4)]}");
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs
index 33436dee..d5cbb9cc 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/MonolithInstrumentCard.cs
@@ -82,7 +82,7 @@ internal sealed class MonolithInstrumentCard : IInstrumentCard
{
if (I(id) is not (var i and >= 0)) return new Panel();
var value = new TextBlock { Text = fmt(G(id)), FontSize = 8, Foreground = TxtC, Width = valW, VerticalAlignment = VerticalAlignment.Center };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var knob = new Knob(G(id), 1.0) { Accent = true, Inline = true, ArcColor = mod ? TealC : null, Default = engine.InstrumentParamDefault(track, i) };
knob.Format = v => fmt((float)v);
knob.ValueChanged += v => { engine.PluginParamSet(track, -1, i, (float)v); value.Text = fmt((float)v); Refresh(); };
@@ -171,7 +171,7 @@ internal sealed class MonolithInstrumentCard : IInstrumentCard
host.PointerCaptureLost += (_, _) => { if (drag) EndDrag(); };
host.SizeChanged += (_, _) => Vis(G(id));
var valTxt = new TextBlock { FontSize = 7, Foreground = TextSecondary, HorizontalAlignment = HorizontalAlignment.Center };
- valTxt.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ valTxt.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
readouts.Add(() => { if (!drag) Vis(G(id)); valTxt.Text = fmt(G(id)); });
var col2 = new DockPanel { HorizontalAlignment = HorizontalAlignment.Center };
var nm = new TextBlock { Text = NotaText.Label(name), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = MutedC, HorizontalAlignment = HorizontalAlignment.Center };
@@ -232,7 +232,7 @@ internal sealed class MonolithInstrumentCard : IInstrumentCard
g.Children.Add(Cell(WaveChips($"{p}wave", n == 3), 3));
string modTxt = n == 3 ? "free" : "kbd";
var mt = new TextBlock { Text = modTxt, FontSize = 8, Foreground = MutedC, HorizontalAlignment = HorizontalAlignment.Right, VerticalAlignment = VerticalAlignment.Center };
- mt.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ mt.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
if (n == 3) readouts.Add(() => mt.Text = G("osc3kbd") > 0.5f ? "kbd" : "free");
g.Children.Add(Cell(mt, 4));
return new Border { BorderBrush = BorderIn, BorderThickness = new Thickness(0, 0, 0, n < 3 ? 1 : 0), Height = 40, Child = g };
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/MosaicInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/MosaicInstrumentCard.cs
index 33bde19b..98c6aabc 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/MosaicInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/MosaicInstrumentCard.cs
@@ -181,7 +181,7 @@ internal sealed class MosaicInstrumentCard : IInstrumentCard
};
static TextBlock Mono(string t, IBrush? c = null, double fs = 8) => new()
{
- Text = t, FontSize = fs, Foreground = c ?? TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ Text = t, FontSize = fs, Foreground = c ?? TextSecondary, VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
// ---- shared builders ------------------------------------------------------------------
@@ -1187,7 +1187,7 @@ internal sealed class MosaicInstrumentCard : IInstrumentCard
Children =
{
Caps("Source"),
- new TextBlock { Text = where, FontSize = 8, Foreground = TextPrimary, FontFamily = NotaFonts.UiFamily, TextWrapping = TextWrapping.Wrap },
+ new TextBlock { Text = where, FontSize = 8, Foreground = TextPrimary, FontFamily = NotaFonts.ValuesFamily, TextWrapping = TextWrapping.Wrap },
new TextBlock { Text = Loc.T("device.mosaic.samples_are_not_copied_into"), FontSize = 7.5, Foreground = TextTertiary, TextWrapping = TextWrapping.Wrap },
},
};
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs
index 59924bdc..d1f7fc71 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/OperatorInstrumentCard.cs
@@ -128,7 +128,7 @@ internal sealed class OperatorInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 8)
{
var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c ?? TextSecondary, VerticalAlignment = VerticalAlignment.Center };
- tb.FontFamily = NotaFonts.UiFamily;
+ tb.FontFamily = NotaFonts.ValuesFamily;
return tb;
}
@@ -142,7 +142,7 @@ internal sealed class OperatorInstrumentCard : IInstrumentCard
if (!idx.TryGetValue(id, out var pi)) return new Panel();
var value = new TextBlock
{
- Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,
+ Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center,
};
var knob = new Nota.App.Knob(G(id), 1.0)
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs
index b27e7c16..22ce0b9f 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/PendulumInstrumentCard.cs
@@ -100,7 +100,7 @@ internal sealed class PendulumInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 7) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
var hint = Mono("", TextTertiary);
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs
index 0acb521b..33c6f801 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/PentadInstrumentCard.cs
@@ -116,7 +116,7 @@ internal sealed class PentadInstrumentCard : IInstrumentCard
=> new() { Text = NotaText.Label(t), FontSize = fs, FontWeight = w, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
static TextBlock Caps(string t) => new() { Text = NotaText.Label(t), FontSize = NotaType.KnobLabel, FontWeight = FontWeight.Medium, Foreground = MutedC, VerticalAlignment = VerticalAlignment.Center };
static TextBlock MonoText(string t, double fs, IBrush c)
- { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ { var tb = new TextBlock { Text = t, FontSize = fs, Foreground = c, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
static StackPanel Row(double sp, params Control[] cs)
{ var s = new StackPanel { Orientation = Orientation.Horizontal, Spacing = sp, VerticalAlignment = VerticalAlignment.Center }; foreach (var c in cs) s.Children.Add(c); return s; }
static Control Docked(Control c, Dock d) { DockPanel.SetDock(c, d); return c; }
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs
index 5d1d444b..eaf049bf 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/PhysicalInstrumentCard.cs
@@ -108,7 +108,7 @@ internal sealed class PhysicalInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 8) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
var hint = Mono("", TextTertiary, NotaType.Axis);
@@ -149,7 +149,7 @@ internal sealed class PhysicalInstrumentCard : IInstrumentCard
if (!idx.TryGetValue(id, out var pi)) return new Panel();
var value = new TextBlock
{
- Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,
+ Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Center,
TextAlignment = TextAlignment.Center, LineHeight = 10,
};
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs
index ec91de68..21013403 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/RhythmInstrumentCard.cs
@@ -121,7 +121,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 7) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
@@ -325,7 +325,7 @@ internal sealed class RhythmInstrumentCard : IInstrumentCard
Text = sampleMode ? sampleName : "Load file…", FontSize = 7, FontWeight = FontWeight.SemiBold, MaxWidth = 90,
TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center,
};
- if (sampleMode) fileText.FontFamily = NotaFonts.UiFamily;
+ if (sampleMode) fileText.FontFamily = NotaFonts.ValuesFamily;
var fileBtn = SmallButton(new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4, Children = { folder, fileText } }, fileText,
() => LoadSample(kit, sel), () => sampleMode);
readouts.Add(() => folder.Foreground = sampleMode ? NotaPalette.TextPrimary : NotaPalette.TextStrong);
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs
index 1555ee3c..b66e9c0b 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/SamplerInstrumentCard.cs
@@ -95,7 +95,7 @@ internal sealed class SamplerInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 7) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
// ---- shared builders ----------------------------------------------------------
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs
index f132f802..3860a509 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/SynthInstrumentCard.cs
@@ -211,7 +211,7 @@ internal sealed class SynthInstrumentCard : IInstrumentCard
FontSize = NotaType.Axis, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center,
Margin = new Thickness(0, 0, 8, 0),
};
- hint.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ hint.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var tabStrip = new Grid
{
Height = TabH, ColumnDefinitions = new ColumnDefinitions("Auto,*"),
@@ -403,7 +403,7 @@ internal sealed class SynthInstrumentCard : IInstrumentCard
private static TextBlock Axis(string text)
{
var tb = new TextBlock { Text = text, FontSize = NotaType.Axis, Foreground = NotaPalette.TextAxis };
- tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return tb;
}
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs
index a00d0926..c3cffbd1 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/TwinInstrumentCard.cs
@@ -477,7 +477,7 @@ internal sealed class TwinInstrumentCard : IInstrumentCard
pad.Reset = () => { engine.BeginUndoGroup(); Once("padx", 0.5f); Once("pady", 0.5f); engine.EndUndoGroup(); Refresh(); };
readouts.Add(() => pad.SetValues(G("padx"), G("pady"), G("padz")));
if (I("padx") is var pi and >= 0) MidiLearn.Bind(pad, MidiTarget.PluginParam(track, -1, pi), "Pad X");
- var legendText = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, HorizontalAlignment = HorizontalAlignment.Center };
+ var legendText = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily, Foreground = TextSecondary, HorizontalAlignment = HorizontalAlignment.Center };
readouts.Add(() => legendText.Text = $"X {Bip(G("padx"))} · Y {Bip(G("pady"))} · Z {Pct(G("padz"))}");
ToolTip.SetTip(pad, Loc.T("device.twin.pad_hint"));
return legend ? new StackPanel { Spacing = 3, Children = { pad, legendText } } : pad;
@@ -577,7 +577,7 @@ internal sealed class TwinInstrumentCard : IInstrumentCard
SourceName = k => k >= 0 && k < Nota.Application.Twin.TwinMatrix.Sources.Length ? Nota.Application.Twin.TwinMatrix.Sources[k] : "",
DestinationName = k => Nota.Application.Twin.TwinMatrix.DestinationName(engine, track, k),
};
- var routeCount = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center };
+ var routeCount = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center };
var offGridText = new TextBlock { FontSize = NotaType.KnobLabel, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center };
var offGrid = new Border { Background = Brushes.Transparent, Cursor = new Cursor(StandardCursorType.Hand), Child = Glyph.WithChevron(offGridText, 7), VerticalAlignment = VerticalAlignment.Center };
List<TwinPatchMatrix.Cell> hidden = new();
@@ -739,7 +739,7 @@ internal sealed class TwinInstrumentCard : IInstrumentCard
Nota.Application.Twin.TwinPatterns.Do(engine, track, a, iarg, farg);
LoadPats(); SyncGrid(); Refresh();
}
- var stepInfo = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, Width = 130, TextTrimming = TextTrimming.CharacterEllipsis };
+ var stepInfo = new TextBlock { FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, Width = 130, TextTrimming = TextTrimming.CharacterEllipsis };
void ShowStep()
{
var p = Pat();
@@ -870,7 +870,7 @@ internal sealed class TwinInstrumentCard : IInstrumentCard
Control SeqSwing()
{
int si = I("seq.swing");
- var value = new TextBlock { Width = 30, FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center };
+ var value = new TextBlock { Width = 30, FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center };
var knob = new Knob(G("seq.swing"), 1.0) { Inline = true, Accent = true, Default = 0, Format = v => Pct((float)v) };
knob.ValueChanged += v => { SetP("seq.swing", (float)v); value.Text = Pct((float)v); };
knob.GestureBegin += () => Begin("seq.swing");
@@ -1132,7 +1132,7 @@ internal sealed class TwinInstrumentCard : IInstrumentCard
ToolTip.SetTip(strip, Loc.T("device.twin.the_morph_as_it_sounds_now"));
TextBlock End(string t, bool edited) => new()
{
- Text = t, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobValue, VerticalAlignment = VerticalAlignment.Center,
+ Text = t, FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.KnobValue, VerticalAlignment = VerticalAlignment.Center,
Foreground = edited ? Brass : NotaPalette.TextFaint,
};
var ends = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 2 };
diff --git a/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs b/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs
index 44d6eb7b..de800232 100644
--- a/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Instruments/VoltInstrumentCard.cs
@@ -146,7 +146,7 @@ internal sealed class VoltInstrumentCard : IInstrumentCard
var filtEnv = new VoltEnv(engine, track) { VerticalAlignment = VerticalAlignment.Stretch, MinHeight = 50 };
var hint = new TextBlock
{
- FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.UiFamily,
+ FontSize = NotaType.Axis, Foreground = TextTertiary, FontFamily = NotaFonts.ValuesFamily,
VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(0, 0, 6, 0), TextTrimming = TextTrimming.CharacterEllipsis,
};
@@ -171,7 +171,7 @@ internal sealed class VoltInstrumentCard : IInstrumentCard
static TextBlock Mono(string t, IBrush? c = null, double fs = 8) => new()
{
Text = t, FontSize = fs, Foreground = c ?? TextSecondary,
- VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.UiFamily,
+ VerticalAlignment = VerticalAlignment.Center, FontFamily = NotaFonts.ValuesFamily,
};
static TextBlock Section(string t, IBrush? c = null) => new()
{
@@ -188,7 +188,7 @@ internal sealed class VoltInstrumentCard : IInstrumentCard
if (!idx.TryGetValue(id, out var pi)) return new Panel();
var value = new TextBlock
{
- Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.UiFamily,
+ Text = fmt(G(id)), FontSize = NotaType.KnobValue, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Center,
TextAlignment = TextAlignment.Center, LineHeight = 10,
};
diff --git a/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs
index 86089f56..6a38967e 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/ArpMidiBody.cs
@@ -67,7 +67,7 @@ internal sealed class ArpMidiBody : IMidiDeviceBody
private static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? Cap, VerticalAlignment = VerticalAlignment.Center };
private static TextBlock Mono(string t, IBrush c, double fs = 8) => new()
- { Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, FontFamily = NotaFonts.ValuesFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
private static string RateLabel(IAudioEngine e, int t, int mi)
=> e.MidiEffectGetParam(t, mi, GSync) > 0.5f ? RateNames[Math.Clamp((int)Math.Round(e.MidiEffectGetParam(t, mi, GRate)), 0, 7)]
diff --git a/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs
index 318e650a..74b61674 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/ChordMidiBody.cs
@@ -131,7 +131,7 @@ internal sealed class ChordMidiBody : IMidiDeviceBody
private static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? Cap, VerticalAlignment = VerticalAlignment.Center };
private static TextBlock Mono(string t, IBrush c, double fs = 8) => new()
- { Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, FontFamily = NotaFonts.ValuesFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
private static T WithDock<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
// ---- body -------------------------------------------------------------------------------------
diff --git a/src/managed/Nota.App/DeviceCards/Midi/GenericMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/GenericMidiBody.cs
index 968a0b1e..5f863458 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/GenericMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/GenericMidiBody.cs
@@ -31,7 +31,7 @@ internal sealed class GenericMidiBody : IMidiDeviceBody
float v = engine.MidiEffectGetParam(track, index, i);
bool integral = max - min >= 2 && (max <= 24.5f); // small integer ranges show as whole numbers
var value = new TextBlock { Text = FmtParam(v, integral), FontSize = 9, Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Right };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
top.Children.Add(new TextBlock { Text = NotaText.Label(engine.MidiEffectParamName(track, index, i)), FontSize = 9, Foreground = TextTertiary });
Grid.SetColumn(value, 1); top.Children.Add(value);
diff --git a/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs
index 19dc61b4..476a20fd 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/LengthMidiBody.cs
@@ -113,7 +113,7 @@ internal sealed class LengthMidiBody : IMidiDeviceBody
private static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? Cap, VerticalAlignment = VerticalAlignment.Center };
private static TextBlock Mono(string t, IBrush c, double fs = 8) => new()
- { Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, FontFamily = NotaFonts.ValuesFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
private static T WithDock<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
// ---- body -------------------------------------------------------------------------------------
diff --git a/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs
index 4e086013..e9d8be95 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/RandomMidiBody.cs
@@ -90,7 +90,7 @@ internal sealed class RandomMidiBody : IMidiDeviceBody
private static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? Cap, VerticalAlignment = VerticalAlignment.Center };
private static TextBlock Mono(string t, IBrush c, double fs = 8) => new()
- { Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, FontFamily = NotaFonts.ValuesFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
private static T WithDock<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
// ---- body -------------------------------------------------------------------------------------
diff --git a/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs
index 1563740f..efdbc617 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/ScaleMidiBody.cs
@@ -92,7 +92,7 @@ internal sealed class ScaleMidiBody : IMidiDeviceBody
private static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? Cap, VerticalAlignment = VerticalAlignment.Center };
private static TextBlock Mono(string t, IBrush c, double fs = 8) => new()
- { Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, FontFamily = NotaFonts.ValuesFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
private static T WithDock<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
// ---- body -------------------------------------------------------------------------------------
diff --git a/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs b/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs
index 2771ff57..cbe721f4 100644
--- a/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs
+++ b/src/managed/Nota.App/DeviceCards/Midi/VelocityMidiBody.cs
@@ -152,7 +152,7 @@ internal sealed class VelocityMidiBody : IMidiDeviceBody
private static TextBlock Caps(string t, IBrush? c = null, double fs = NotaType.KnobLabel) => new()
{ Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = c ?? Cap, VerticalAlignment = VerticalAlignment.Center };
private static TextBlock Mono(string t, IBrush c, double fs = 8) => new()
- { Text = t, FontSize = fs, FontFamily = NotaFonts.UiFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
+ { Text = t, FontSize = fs, FontFamily = NotaFonts.ValuesFamily, Foreground = c, VerticalAlignment = VerticalAlignment.Center };
private static T WithDock<T>(T c, Dock d) where T : Control { DockPanel.SetDock(c, d); return c; }
// ---- body -------------------------------------------------------------------------------------
diff --git a/src/managed/Nota.App/DeviceCards/PluginCard.cs b/src/managed/Nota.App/DeviceCards/PluginCard.cs
index a9cb2fc0..fedd4900 100644
--- a/src/managed/Nota.App/DeviceCards/PluginCard.cs
+++ b/src/managed/Nota.App/DeviceCards/PluginCard.cs
@@ -181,7 +181,7 @@ internal static class PluginCard
};
var v = new TextBlock
{
- Text = value, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Value, Foreground = TextPrimary,
+ Text = value, FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.Value, Foreground = TextPrimary,
HorizontalAlignment = HorizontalAlignment.Right, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis,
};
Grid.SetRow(l, row); Grid.SetRow(v, row); Grid.SetColumn(v, 1);
@@ -194,7 +194,7 @@ internal static class PluginCard
Padding = new Thickness(4, 1), VerticalAlignment = VerticalAlignment.Center,
Child = new TextBlock
{
- Text = NotaText.Label(text), FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobLabel,
+ Text = NotaText.Label(text), FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.KnobLabel,
FontWeight = FontWeight.Medium, Foreground = TextSecondary,
},
};
@@ -234,7 +234,7 @@ internal static class PluginCard
Text = "Parameters", FontSize = NotaType.DeviceSection, FontWeight = FontWeight.SemiBold,
Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center,
};
- var count = new TextBlock { FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobValue, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(6, 0, 0, 0) };
+ var count = new TextBlock { FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.KnobValue, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(6, 0, 0, 0) };
var search = new TextBox { Watermark = "Filter", Text = state.Filter, FontSize = 9, Classes = { "search" }, VerticalAlignment = VerticalAlignment.Center };
var searchWrap = new Border
@@ -245,7 +245,7 @@ internal static class PluginCard
search.GotFocus += (_, _) => searchWrap.BorderBrush = NotaPalette.Accent;
search.LostFocus += (_, _) => searchWrap.BorderBrush = BorderDef;
- var pageText = new TextBlock { FontFamily = NotaFonts.UiFamily, FontSize = NotaType.KnobValue, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, MinWidth = 30, TextAlignment = TextAlignment.Center };
+ var pageText = new TextBlock { FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.KnobValue, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, MinWidth = 30, TextAlignment = TextAlignment.Center };
var host = new ContentControl();
int perPage = 1, gen = 0;
var matches = new List<int>();
diff --git a/src/managed/Nota.App/DeviceCards/Rack/MacroPanel.cs b/src/managed/Nota.App/DeviceCards/Rack/MacroPanel.cs
index 7ef34fef..151f56dd 100644
--- a/src/managed/Nota.App/DeviceCards/Rack/MacroPanel.cs
+++ b/src/managed/Nota.App/DeviceCards/Rack/MacroPanel.cs
@@ -148,7 +148,7 @@ internal static class MacroPanel
string pid = RhythmModel.MacroId(m);
var knob = new Knob(Value(e, s, m), 1.0) { Accent = true, Default = 0.5, Width = Knob.SizeSecondary, Height = Knob.SizeSecondary, IsDim = !assigned, Format = v => Pct((float)v) };
- var value = new TextBlock { Text = Pct(Value(e, s, m)), FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = assigned ? TextPrimary : TextDisabled, LineHeight = 9 };
+ var value = new TextBlock { Text = Pct(Value(e, s, m)), FontSize = 7, FontFamily = NotaFonts.ValuesFamily, Foreground = assigned ? TextPrimary : TextDisabled, LineHeight = 9 };
knob.ValueChanged += v =>
{
e.PluginParamSet(track, di, pi, (float)v);
@@ -297,7 +297,7 @@ internal static class MacroPanel
public static Control Detail(DeviceCardContext ctx, IMacroSurface s, int m, List<Action> tick)
{
var e = ctx.Engine;
- var val = new TextBlock { FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center };
+ var val = new TextBlock { FontSize = 7, FontFamily = NotaFonts.ValuesFamily, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center };
tick.Add(() => val.Text = Pct(Value(e, s, m)));
var head = new Grid { Height = 20, ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 5, Margin = new Thickness(8, 0) };
head.Children.Add(Cap($"Macro {m + 1}"));
@@ -315,7 +315,7 @@ internal static class MacroPanel
var rows = new StackPanel { Spacing = 6 };
var capRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
capRow.Children.Add(Cap("RECEIVERS"));
- var mm2 = new TextBlock { Text = "min → max", FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
+ var mm2 = new TextBlock { Text = "min → max", FontSize = 7, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
Avalonia.Controls.Grid.SetColumn(mm2, 1); capRow.Children.Add(mm2);
rows.Children.Add(capRow);
// One receiver per row. When a macro drives several params on each slot, the rows say which.
@@ -395,7 +395,7 @@ internal static class MacroPanel
Height = 9, Background = Brushes.Transparent, Cursor = new Cursor(StandardCursorType.SizeWestEast), VerticalAlignment = VerticalAlignment.Center,
Children = { new Border { Height = 3, CornerRadius = NotaRadius.Fine, Background = NotaPalette.BgSunken, VerticalAlignment = VerticalAlignment.Center }, band, now },
};
- var vals = new TextBlock { FontSize = 7, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, Width = 46, TextAlignment = TextAlignment.Right, VerticalAlignment = VerticalAlignment.Center };
+ var vals = new TextBlock { FontSize = 7, FontFamily = NotaFonts.ValuesFamily, Foreground = TextSecondary, Width = 46, TextAlignment = TextAlignment.Right, VerticalAlignment = VerticalAlignment.Center };
string unit = s.TargetUnit(mm);
void Text() => vals.Text = $"{s.FormatTarget(mm, (float)(min + fLo * span))}–{s.FormatTarget(mm, (float)(min + fHi * span))}"
+ (unit.Length > 0 ? "\u2009" + unit : "");
diff --git a/src/managed/Nota.App/DeviceCards/Rack/RackCard.cs b/src/managed/Nota.App/DeviceCards/Rack/RackCard.cs
index e3bac3e1..c143388c 100644
--- a/src/managed/Nota.App/DeviceCards/Rack/RackCard.cs
+++ b/src/managed/Nota.App/DeviceCards/Rack/RackCard.cs
@@ -242,7 +242,7 @@ internal sealed partial class RackCardView
private static TextBlock RcMono(string text, IBrush ink, double size = NotaType.KnobValue) => new()
{
- Text = text, FontFamily = NotaFonts.UiFamily, FontSize = size, Foreground = ink,
+ Text = text, FontFamily = NotaFonts.ValuesFamily, FontSize = size, Foreground = ink,
VerticalAlignment = VerticalAlignment.Center,
};
diff --git a/src/managed/Nota.App/DeviceCards/Rack/RackCardView.Drum.cs b/src/managed/Nota.App/DeviceCards/Rack/RackCardView.Drum.cs
index 61eb4cc9..48e94875 100644
--- a/src/managed/Nota.App/DeviceCards/Rack/RackCardView.Drum.cs
+++ b/src/managed/Nota.App/DeviceCards/Rack/RackCardView.Drum.cs
@@ -494,7 +494,7 @@ internal sealed partial class RackCardView
private Border MixBtn(string text, Func<bool> on, SolidColorBrush accent, Action toggle, bool choke = false)
{
var tb = new TextBlock { Text = text, FontSize = 7, FontWeight = FontWeight.Medium, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center };
- if (choke) tb.FontFamily = NotaFonts.UiFamily;
+ if (choke) tb.FontFamily = NotaFonts.ValuesFamily;
var b = new Border { Width = 13, Height = 11, CornerRadius = NotaRadius.Field, BorderThickness = new Thickness(1), Cursor = new Cursor(StandardCursorType.Hand), Child = tb };
void Paint()
{
@@ -909,7 +909,7 @@ internal sealed partial class RackCardView
private static TextBlock DrumMono(string t, IBrush ink, double fs) => new()
{
- Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center,
+ Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center,
};
// An empty state: one Ink 5 line, centred.
diff --git a/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs b/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs
index 0c3d7f31..e1104555 100644
--- a/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs
+++ b/src/managed/Nota.App/DeviceCards/Rack/RackCardView.cs
@@ -562,7 +562,7 @@ internal sealed partial class RackCardView(DeviceCardContext ctx)
int di = a.AutomationDeviceIndex;
float v = E.PluginParamGet(T, di, m);
var val = new TextBlock { Text = Pct(v), FontSize = 9, Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Right };
- val.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ val.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
top.Children.Add(new TextBlock { Text = "M" + (m + 1), FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = TextTertiary });
Grid.SetColumn(val, 1); top.Children.Add(val);
@@ -708,7 +708,7 @@ internal sealed partial class RackCardView(DeviceCardContext ctx)
float val = a.ChainDeviceParamGet(c, d, p);
double span = Math.Max(1e-6, max - min);
var value = new TextBlock { Text = DeviceParamControls.Fmt(val), FontSize = 9, Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Right, Margin = new Thickness(0, 0, 4, 0) };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto") };
top.Children.Add(new TextBlock { Text = NotaText.Label(name), FontSize = 9, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center });
Grid.SetColumn(value, 1); top.Children.Add(value);
@@ -732,7 +732,7 @@ internal sealed partial class RackCardView(DeviceCardContext ctx)
string name = a.ChainInstrumentParamName(c, p);
float val = a.ChainInstrumentParamGet(c, p);
var value = new TextBlock { Text = Pct(val), FontSize = 9, Foreground = TextPrimary, HorizontalAlignment = HorizontalAlignment.Right, Margin = new Thickness(0, 0, 4, 0) };
- value.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto") };
top.Children.Add(new TextBlock { Text = NotaText.Label(name), FontSize = 9, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center });
Grid.SetColumn(value, 1); top.Children.Add(value);
diff --git a/src/managed/Nota.App/DeviceCards/Sampler/SamplerViews.cs b/src/managed/Nota.App/DeviceCards/Sampler/SamplerViews.cs
index 13f61ac4..9a7c50b0 100644
--- a/src/managed/Nota.App/DeviceCards/Sampler/SamplerViews.cs
+++ b/src/managed/Nota.App/DeviceCards/Sampler/SamplerViews.cs
@@ -34,7 +34,7 @@ namespace Nota.App;
internal static class SamplerInk
{
public static FormattedText Mono(string t, IBrush ink, double size = 7)
- => new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Sans, size, ink, NotaTextSize.InCard);
+ => new NotaFormattedText(t, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Measure, size, ink, NotaTextSize.InCard);
public static void Corner(DrawingContext ctx, Rect r, NotaGraph.Corner c, string text, IBrush ink)
{
diff --git a/src/managed/Nota.App/DeviceChainView.Shell.cs b/src/managed/Nota.App/DeviceChainView.Shell.cs
index ed2903da..924c9102 100644
--- a/src/managed/Nota.App/DeviceChainView.Shell.cs
+++ b/src/managed/Nota.App/DeviceChainView.Shell.cs
@@ -182,7 +182,7 @@ public sealed partial class DeviceChainView
// Small tertiary caption / mono readout helpers.
private static TextBlock Caps(string t, double fs = 9) => new() { Text = NotaText.Label(t), FontSize = fs, FontWeight = FontWeight.Medium, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center };
- private static TextBlock Mono(string t, double w) { var tb = new TextBlock { Text = t, FontSize = 9, Foreground = TextSecondary, Width = w, TextAlignment = TextAlignment.Right, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI"); return tb; }
+ private static TextBlock Mono(string t, double w) { var tb = new TextBlock { Text = t, FontSize = 9, Foreground = TextSecondary, Width = w, TextAlignment = TextAlignment.Right, VerticalAlignment = VerticalAlignment.Center }; tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure"); return tb; }
private Border BuildCardShell(ShellSpec s, Control body)
{
@@ -208,7 +208,7 @@ public sealed partial class DeviceChainView
string type = NotaText.Label(s.Subtitle ?? "");
var badge = new TextBlock
{
- Text = type, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Caption,
+ Text = type, FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.Caption,
Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center,
};
if (s.IsInstrument && _engine.InstrumentVoiceCount(_trackId) >= 0)
diff --git a/src/managed/Nota.App/DeviceChainView.cs b/src/managed/Nota.App/DeviceChainView.cs
index 1e2f0a25..f89ebe12 100644
--- a/src/managed/Nota.App/DeviceChainView.cs
+++ b/src/managed/Nota.App/DeviceChainView.cs
@@ -326,6 +326,7 @@ public sealed partial class DeviceChainView : UserControl
string returnName = TrackNames.Of(_engine, ti);
var value = new TextBlock { Text = Pct(_engine.GetTrackSend(_trackId, bus)), Foreground = TextPrimary };
+ value.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var knob = new Knob(_engine.GetTrackSend(_trackId, bus), 1.0) { Accent = true, Default = 0, Format = v => Pct((float)v) };
int b = bus;
SendControl.Attach(knob, _engine, _trackId, b, v => value.Text = Pct((float)v)); // undoable, writes automation (specs/072)
diff --git a/src/managed/Nota.App/DeviceWindow.cs b/src/managed/Nota.App/DeviceWindow.cs
index d0abf4e0..d1775788 100644
--- a/src/managed/Nota.App/DeviceWindow.cs
+++ b/src/managed/Nota.App/DeviceWindow.cs
@@ -335,7 +335,7 @@ internal sealed class DeviceWindow : NotaWindow
private static TextBlock MonoText(double size, IBrush ink)
{
var tb = new TextBlock { FontSize = size, Foreground = ink, VerticalAlignment = VerticalAlignment.Center };
- tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return tb;
}
diff --git a/src/managed/Nota.App/DrumPatternView.cs b/src/managed/Nota.App/DrumPatternView.cs
index d92e1d73..02764c0b 100644
--- a/src/managed/Nota.App/DrumPatternView.cs
+++ b/src/managed/Nota.App/DrumPatternView.cs
@@ -634,7 +634,7 @@ public sealed class DrumPatternView : UserControl
private static TextBlock Mono(string text, IBrush colour, double size = 8)
{
var tb = new TextBlock { Text = text, FontSize = size, Foreground = colour, VerticalAlignment = VerticalAlignment.Center };
- tb.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ tb.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return tb;
}
diff --git a/src/managed/Nota.App/ExportWindow.cs b/src/managed/Nota.App/ExportWindow.cs
index df8b867f..976cd553 100644
--- a/src/managed/Nota.App/ExportWindow.cs
+++ b/src/managed/Nota.App/ExportWindow.cs
@@ -315,7 +315,7 @@ public sealed class ExportWindow : NotaWindow
{
var box = new TextBox { Text = BarBeatText(beats), Width = 72, FontSize = 10, PlaceholderText = "bar.beat" };
ToolTip.SetTip(box, Loc.T("export.bar_beat_sixteenth_counted_from"));
- box.BindResource(TextBox.FontFamilyProperty, "Font.UI");
+ box.BindResource(TextBox.FontFamilyProperty, "Font.Measure");
return box;
}
@@ -361,7 +361,7 @@ public sealed class ExportWindow : NotaWindow
private TextBlock Mono(string text, IBrush fg)
{
var t = new TextBlock { Text = text, FontSize = 9, Foreground = fg, VerticalAlignment = VerticalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return t;
}
diff --git a/src/managed/Nota.App/MainWindow.axaml.cs b/src/managed/Nota.App/MainWindow.axaml.cs
index d625ca46..d543fffd 100644
--- a/src/managed/Nota.App/MainWindow.axaml.cs
+++ b/src/managed/Nota.App/MainWindow.axaml.cs
@@ -424,6 +424,7 @@ public partial class MainWindow : Window
vm.Settings.Save();
};
Timeline.Waveform = (WaveformStyle)Math.Clamp(vm.Settings.Current.ArrangementWaveform, 0, 2);
+ Timeline.ClipStyle = Looks.ClipStyleOf(vm.Settings.Current);
vm.Engine.SplitFades = vm.Settings.Current.SplitFades;
ApplyHeadersRight(vm.Settings.Current.ArrangementHeadersRight);
InitSnapGrid();
@@ -431,6 +432,7 @@ public partial class MainWindow : Window
vm.Settings.Changed += () =>
{
Timeline.Waveform = (WaveformStyle)Math.Clamp(vm.Settings.Current.ArrangementWaveform, 0, 2);
+ Timeline.ClipStyle = Looks.ClipStyleOf(vm.Settings.Current); // a pick, or the look's default
vm.Engine.SplitFades = vm.Settings.Current.SplitFades;
ApplyHeadersRight(vm.Settings.Current.ArrangementHeadersRight);
};
diff --git a/src/managed/Nota.App/Mcp/ThemeAccess.cs b/src/managed/Nota.App/Mcp/ThemeAccess.cs
index 231e3160..936daba1 100644
--- a/src/managed/Nota.App/Mcp/ThemeAccess.cs
+++ b/src/managed/Nota.App/Mcp/ThemeAccess.cs
@@ -12,6 +12,7 @@ using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
using Nota.Application;
using Nota.Application.Themes;
using Nota.Mcp;
@@ -33,11 +34,30 @@ internal sealed class ThemeAccess : IThemeAccess
t.IsUser ? "user" : "built-in", t.Warnings.Count, t.Warnings.Any(w => w.Kind == ThemeWarning.FontMissing),
t.Geometry.FontFamily, t.Geometry.Roundness)).ToArray(),
worn.Id, NotaThemeService.TryOnTheme is not null,
- new ThemeChoiceInfo(c.FollowSystem, c.Single, c.Dark, c.Light),
+ new ThemeChoiceInfo(c.FollowSystem, c.Single, c.Dark, c.Light, Looks.Id(NotaThemeService.Look)),
NotaThemes.UserLoadProblems.Select(p => new ThemeFileProblem(p.FileName, p.Reason)).ToArray());
}
- public string? GetFile(string id) => NotaThemes.Find(id) is { } t ? NotaThemes.ToFile(t) : null;
+ public string? GetFile(string id, string? look = null) =>
+ NotaThemes.Find(id) is { } t ? NotaThemes.ToFile(NotaThemeService.InLook(t, ParseLook(look) ?? Look.New)) : null;
+
+ public string SetLook(string look)
+ {
+ var l = ParseLook(look) ?? NotaThemeService.Look;
+ var settings = App.Services.GetRequiredService<ISettingsService>();
+ Looks.Store(settings.Current, l);
+ settings.Save();
+ NotaThemeService.SetLook(l);
+ return NotaThemes.Find(NotaThemeService.WornTheme?.Id)?.Id ?? NotaThemeService.Choice.Single;
+ }
+
+ // "new" | "classic", or null (meaning: the default for the call); anything else is the client's mistake.
+ private static Look? ParseLook(string? look)
+ {
+ if (string.IsNullOrWhiteSpace(look)) return null;
+ return Looks.Parse(look.Trim().ToLowerInvariant())
+ ?? throw new ArgumentException($"Unknown look '{look}' — use \"{Looks.NewId}\" or \"{Looks.ClassicId}\".");
+ }
public ThemeCatalogue Catalogue()
{
@@ -53,19 +73,26 @@ internal sealed class ThemeAccess : IThemeAccess
new[] { SkinGeometry.MinRoundness, SkinGeometry.MaxRoundness },
new[] { SkinGeometry.MinStep, SkinGeometry.MaxStep },
new[] { 1, SkinGeometry.MaxFamilyLength }),
- new[] { 1, 2 });
+ new[] { 1, 2, 3 });
}
public IReadOnlyList<string> SystemFonts() => NotaThemes.SystemFontNames();
public ThemeValidation Validate(string json) => NotaThemes.Validate(json);
- public async Task<ThemePreviews> PreviewAsync(string json, IReadOnlyList<string>? surfaces, bool themeAccent)
+ public async Task<ThemePreviews> PreviewAsync(string json, IReadOnlyList<string>? surfaces, bool themeAccent, string? look = null)
{
+ var l = ParseLook(look) ?? NotaThemeService.Look;
var v = NotaThemes.Validate(json);
if (!v.IsValid) return new ThemePreviews(v, Array.Empty<ThemePreviewImage>(), Array.Empty<string>(), Array.Empty<string>());
var theme = NotaThemes.FromParsed(v, ThemeSource.Preview);
- var (images, unknown) = await SkinPreviewRenderer.RenderAsync(theme, themeAccent, surfaces);
+ // A built-in's own file, unchanged, previews as that built-in — so under Classic it shows
+ // the classic palette, as the window would (spec 091). An edited copy — other colours, or a
+ // typeface or radii added — is previewed as written.
+ if (NotaThemes.Find(theme.Id) is { Source: ThemeSource.BuiltIn } builtIn && SameColours(builtIn, theme)
+ && theme.Geometry.Equals(builtIn.Geometry))
+ theme = builtIn;
+ var (images, unknown) = await SkinPreviewRenderer.RenderAsync(theme, themeAccent, surfaces, l);
return new ThemePreviews(v,
images.Select(i => new ThemePreviewImage(i.Name, i.Description, i.Png)).ToArray(),
images.Select(i => i.Name).ToArray(), unknown.ToArray());
@@ -149,6 +176,13 @@ internal sealed class ThemeAccess : IThemeAccess
return NotaThemes.Find(NotaThemeService.WornTheme?.Id)?.Id ?? NotaThemeService.Choice.Single;
}
+ private static bool SameColours(NotaColourTheme a, NotaColourTheme b)
+ {
+ var mine = a.Colors;
+ var theirs = b.Colors;
+ return mine.Count == theirs.Count && mine.All(kv => theirs.TryGetValue(kv.Key, out var c) && c == kv.Value);
+ }
+
// What each token is for: Theme/token-roles.json, made from NotaPalette's comments.
private static IReadOnlyDictionary<string, (string, string)> Roles()
{
diff --git a/src/managed/Nota.App/MenuKit.Rows.cs b/src/managed/Nota.App/MenuKit.Rows.cs
index 81918836..8fe7dbe9 100644
--- a/src/managed/Nota.App/MenuKit.Rows.cs
+++ b/src/managed/Nota.App/MenuKit.Rows.cs
@@ -45,7 +45,7 @@ internal static partial class MenuKit
{
var tag = new TextBlock
{
- Text = badge, FontFamily = NotaFonts.UiFamily, FontSize = NotaType.Value,
+ Text = badge, FontFamily = NotaFonts.ValuesFamily, FontSize = NotaType.Value,
Foreground = NotaPalette.TextTertiary, Margin = new Thickness(12, 0, 0, 0),
VerticalAlignment = VerticalAlignment.Center,
};
diff --git a/src/managed/Nota.App/MidiMapView.cs b/src/managed/Nota.App/MidiMapView.cs
index b3e47b5f..76ff10a7 100644
--- a/src/managed/Nota.App/MidiMapView.cs
+++ b/src/managed/Nota.App/MidiMapView.cs
@@ -96,7 +96,7 @@ public sealed partial class MidiMapView : UserControl
top.Children.Add(del);
var src = new TextBlock { Text = _learn.SourceLabel(m), FontSize = 9, Foreground = NotaPalette.TextSecondary, VerticalAlignment = VerticalAlignment.Center };
- src.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ src.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
// Source on the left; the invert toggle rides the right of the same line so the
// range row below has room for just MIN / MAX.
var srcRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
diff --git a/src/managed/Nota.App/MixerView.cs b/src/managed/Nota.App/MixerView.cs
index f1c98a4f..5a80f206 100644
--- a/src/managed/Nota.App/MixerView.cs
+++ b/src/managed/Nota.App/MixerView.cs
@@ -817,7 +817,7 @@ public sealed partial class MixerView : UserControl
private static Border Tag(string text, double size, double tracking, double height, string tip)
{
var t = new TextBlock { Text = text, FontSize = size, LetterSpacing = tracking, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var b = new Border
{
Height = height, Padding = new Thickness(size >= 9 ? 6 : 3, 0), BorderBrush = BorderDef, BorderThickness = new Thickness(1),
@@ -1087,7 +1087,7 @@ public sealed partial class MixerView : UserControl
for (int i = 0; i < 4; i++)
{
var t = new TextBlock { Text = marks[i], FontSize = 7, Foreground = TextDisabled, HorizontalAlignment = HorizontalAlignment.Right, VerticalAlignment = i == 0 ? VerticalAlignment.Top : i == 3 ? VerticalAlignment.Bottom : VerticalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
Grid.SetRow(t, i);
scaleGrid.Children.Add(t);
}
@@ -1101,7 +1101,7 @@ public sealed partial class MixerView : UserControl
{
// The letter is wider than its 3px column, so it borrows room either side
// (a cell clips what it can't fit, which cut R down to an F).
- var t = new TextBlock { Text = txt, FontSize = NotaType.Axis, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextTertiary, TextAlignment = TextAlignment.Center, Margin = new Thickness(-5, 0, -5, 0) };
+ var t = new TextBlock { Text = txt, FontSize = NotaType.Axis, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextTertiary, TextAlignment = TextAlignment.Center, Margin = new Thickness(-5, 0, -5, 0) };
Grid.SetColumn(t, col); letters.Children.Add(t);
}
DockPanel.SetDock(letters, Dock.Bottom);
@@ -1169,7 +1169,7 @@ public sealed partial class MixerView : UserControl
private TextBlock Mono(string text, IBrush fg)
{
var t = new TextBlock { Text = text, FontSize = 8, Foreground = fg, VerticalAlignment = VerticalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return t;
}
diff --git a/src/managed/Nota.App/ModularView.cs b/src/managed/Nota.App/ModularView.cs
index 9d3c6712..23b872e4 100644
--- a/src/managed/Nota.App/ModularView.cs
+++ b/src/managed/Nota.App/ModularView.cs
@@ -135,11 +135,11 @@ public sealed partial class ModularView : UserControl
HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Bottom,
Margin = new Thickness(14, 0, 0, 14),
};
- hint.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ hint.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
_viewport.Children.Add(hint);
_viewport.Children.Add(_mini);
_edgeTip.Child = _edgeTipText;
- _edgeTipText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _edgeTipText.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
_viewport.Children.Add(_edgeTip);
_viewport.Children.Add(_dropGlow);
@@ -194,8 +194,8 @@ public sealed partial class ModularView : UserControl
island.BindResource(Border.BorderBrushProperty, "Brush.BorderDefault");
Content = island;
- _zoomLabel.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
- _statusRight.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _zoomLabel.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
+ _statusRight.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
_viewport.PointerPressed += OnViewportPressed;
_viewport.PointerMoved += OnViewportMoved;
@@ -631,7 +631,7 @@ public sealed partial class ModularView : UserControl
if (cv > 0)
{
var cvLabel = new TextBlock { Text = $"{cv} CV", FontSize = 9, FontWeight = FontWeight.SemiBold, Foreground = Brass, VerticalAlignment = VerticalAlignment.Center };
- cvLabel.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ cvLabel.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
DockPanel.SetDock(cvLabel, Dock.Right);
head.Children.Add(cvLabel);
}
@@ -1338,7 +1338,7 @@ public sealed partial class ModularView : UserControl
private static TextBlock MonoValue(string s)
{
var t = new TextBlock { Text = s, FontSize = 9, Foreground = Text1, HorizontalAlignment = HorizontalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return t;
}
diff --git a/src/managed/Nota.App/MosaicCreateWindow.cs b/src/managed/Nota.App/MosaicCreateWindow.cs
index 3c06be7a..e12f9a05 100644
--- a/src/managed/Nota.App/MosaicCreateWindow.cs
+++ b/src/managed/Nota.App/MosaicCreateWindow.cs
@@ -299,7 +299,7 @@ public sealed class MosaicCreateWindow : NotaWindow
}
// ---- pieces ------------------------------------------------------------------------------------
- private static TextBlock Mono(string t, IBrush ink, double fs) => new() { Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };
+ private static TextBlock Mono(string t, IBrush ink, double fs) => new() { Text = t, FontSize = fs, Foreground = ink, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center };
private static Border Box(Control child) => new()
{
diff --git a/src/managed/Nota.App/Nota.App.csproj b/src/managed/Nota.App/Nota.App.csproj
index 524f8f45..5dfcd964 100644
--- a/src/managed/Nota.App/Nota.App.csproj
+++ b/src/managed/Nota.App/Nota.App.csproj
@@ -40,8 +40,9 @@
version's notes from here and falls back to its CHANGELOG.md section without them.
English only, like the rest of the UI. -->
<AvaloniaResource Include="..\..\..\release-notes\*.en.md" Link="Assets/ReleaseNotes/%(Filename)%(Extension)" />
- <!-- Geist (SIL OFL 1.1, LICENSES/OFL-1.1-Geist.txt): the one UI typeface, for words and
- numbers, served as avares://Nota.App/Assets/Fonts#Geist. -->
+ <!-- Geist and Geist Mono (SIL OFL 1.1, LICENSES/OFL-1.1-Geist.txt): Geist for words and
+ numbers, served as avares://Nota.App/Assets/Fonts#Geist; Geist Mono for values under
+ the classic look (spec 091), #Geist Mono. -->
<AvaloniaResource Include="..\..\..\assets\fonts\*.ttf" Link="Assets/Fonts/%(Filename)%(Extension)" />
</ItemGroup>
@@ -50,6 +51,8 @@
files from disk. -->
<ItemGroup>
<EmbeddedResource Include="Theme\Themes\*.json" LogicalName="Nota.Themes.%(Filename)%(Extension)" />
+ <!-- Their classic palettes (spec 091): 0.59's colours, worn in their place under Look: Classic. -->
+ <EmbeddedResource Include="Theme\Themes\Classic\*.json" LogicalName="Nota.Themes.Classic.%(Filename)%(Extension)" />
<!-- What each colour token is for (spec 087): the MCP theme catalogue. -->
<EmbeddedResource Include="Theme\token-roles.json" LogicalName="Nota.Themes.token-roles.json" />
</ItemGroup>
diff --git a/src/managed/Nota.App/PianoRollView.cs b/src/managed/Nota.App/PianoRollView.cs
index df57b3cc..55e93465 100644
--- a/src/managed/Nota.App/PianoRollView.cs
+++ b/src/managed/Nota.App/PianoRollView.cs
@@ -410,7 +410,7 @@ public sealed partial class PianoRollView : UserControl
private static readonly IPen BendPen = new Pen(NotaPalette.TextPrimary, 1.25, lineCap: PenLineCap.Round);
private static readonly IPen BendPenOnSel = new Pen(NotaPalette.TextOnAccent, 1.25, lineCap: PenLineCap.Round);
private static readonly IBrush PressureShade = NotaPalette.Wash(NotaPalette.SurfaceAbyss, 0x66);
- private static readonly Typeface NumFace = NotaFonts.Sans;
+ private static Typeface NumFace => NotaFonts.Measure; // values role (spec 091): read live
private double RangeH => _rows.Count * RowH;
@@ -1854,9 +1854,9 @@ public sealed partial class PianoRollView : UserControl
private void RenderTime(DrawingContext ctx, double h, double ppb, double viewEnd, double origin, double bpm)
{
double pxPerSec = ppb * bpm / 60.0;
- if (_charW <= 0 || _charWStep != NotaTextSize.Step) // re-measure when Text size changes
+ if (_charW <= 0 || _charWKey != (NotaTextSize.Step, NotaFonts.FaceStamp)) // re-measure when Text size or the face changes
{
- _charWStep = NotaTextSize.Step;
+ _charWKey = (NotaTextSize.Step, NotaFonts.FaceStamp);
_charW = new NotaFormattedText("0000000000", NotaNum.Culture, FlowDirection.LeftToRight, NumFace, 9, LabelText).Width / 10;
}
double charW = _charW;
@@ -1880,7 +1880,7 @@ public sealed partial class PianoRollView : UserControl
}
}
private double _charW;
- private int _charWStep; // the Text size step _charW was measured at
+ private (int Step, int Face) _charWKey; // the Text size step and face _charW was measured at
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
diff --git a/src/managed/Nota.App/PreferencesWindow.Accent.cs b/src/managed/Nota.App/PreferencesWindow.Accent.cs
index 0b928402..dee360bc 100644
--- a/src/managed/Nota.App/PreferencesWindow.Accent.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Accent.cs
@@ -104,7 +104,7 @@ public sealed partial class PreferencesWindow
row.Children.Add(customRing);
var readout = new TextBlock { FontSize = 12, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(6, 0, 0, 0) };
- var readoutHex = new TextBlock { FontSize = 12, Foreground = TextMuted, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };
+ var readoutHex = new TextBlock { FontSize = 12, Foreground = TextMuted, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center };
row.Children.Add(new StackPanel { Orientation = Orientation.Horizontal, Children = { readout, readoutHex } });
void Show()
@@ -188,7 +188,7 @@ public sealed partial class PreferencesWindow
Height = 22, CornerRadius = NotaRadius.Field, BorderBrush = NotaPalette.Rule, BorderThickness = new Thickness(1), ClipToBounds = true,
Child = new StackPanel { Orientation = Orientation.Horizontal, Children = { oldHalf, newHalf } },
};
- var hex = new TextBox { Classes = { "field" }, FontSize = 12, FontFamily = NotaFonts.UiFamily, Height = 22, MinHeight = 22, Width = 216 - 38 - 6, MaxLength = 7 };
+ var hex = new TextBox { Classes = { "field" }, FontSize = 12, FontFamily = NotaFonts.ValuesFamily, Height = 22, MinHeight = 22, Width = 216 - 38 - 6, MaxLength = 7 };
var hexRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, Children = { chip, hex } };
var themes = NotaThemes.BuiltIn;
diff --git a/src/managed/Nota.App/PreferencesWindow.Mcp.cs b/src/managed/Nota.App/PreferencesWindow.Mcp.cs
index 47ef6f93..689d572c 100644
--- a/src/managed/Nota.App/PreferencesWindow.Mcp.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Mcp.cs
@@ -27,12 +27,12 @@ public sealed partial class PreferencesWindow
var portBox = new TextBox
{
Text = (settings?.Current.McpPort ?? 3900).ToString(), Width = 96, Classes = { "field" },
- FontSize = 11, FontFamily = NotaFonts.UiFamily, HorizontalAlignment = HorizontalAlignment.Left,
+ FontSize = 11, FontFamily = NotaFonts.ValuesFamily, HorizontalAlignment = HorizontalAlignment.Left,
};
var statusDot = Dot(BorderStrong);
var status = new TextBlock
{
- FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary,
+ FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = TextSecondary,
VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis,
};
var copyBtn = Btn(Loc.T("preferences.copy_config"));
diff --git a/src/managed/Nota.App/PreferencesWindow.Models.cs b/src/managed/Nota.App/PreferencesWindow.Models.cs
index c925fc9e..01bc7cce 100644
--- a/src/managed/Nota.App/PreferencesWindow.Models.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Models.cs
@@ -66,10 +66,10 @@ public sealed partial class PreferencesWindow
Children =
{
new TextBlock { Text = m.Name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = TextPrimary, Margin = new Thickness(0, 0, 8, 0), VerticalAlignment = VerticalAlignment.Center },
- new TextBlock { Text = m.Feature, FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center },
+ new TextBlock { Text = m.Feature, FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center },
},
},
- new TextBlock { Text = $"{m.Author} · {m.License}", FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary },
+ new TextBlock { Text = $"{m.Author} · {m.License}", FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary },
new TextBlock { Text = m.Description, FontSize = 11, LineHeight = 18, Foreground = TextSecondary, TextWrapping = TextWrapping.Wrap },
},
};
diff --git a/src/managed/Nota.App/PreferencesWindow.Remote.cs b/src/managed/Nota.App/PreferencesWindow.Remote.cs
index e87bd325..64601364 100644
--- a/src/managed/Nota.App/PreferencesWindow.Remote.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Remote.cs
@@ -36,10 +36,10 @@ public sealed partial class PreferencesWindow
var portBox = new TextBox
{
Text = settings.Current.RemotePort.ToString(), Width = 90, Classes = { "field" },
- FontSize = 11, FontFamily = NotaFonts.UiFamily, HorizontalAlignment = HorizontalAlignment.Left,
+ FontSize = 11, FontFamily = NotaFonts.ValuesFamily, HorizontalAlignment = HorizontalAlignment.Left,
};
var statusDot = Dot(BorderStrong);
- var status = new TextBlock { FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis };
+ var status = new TextBlock { FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = TextSecondary, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis };
// Phones may: play notes only, or play and control the project.
var access = new StackPanel { Spacing = 6 };
@@ -94,7 +94,7 @@ public sealed partial class PreferencesWindow
{
bool live = connected.Contains(d.Id) && remote.Running;
var name = new TextBlock { Text = d.Name, FontSize = 11, Foreground = TextPrimary, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis };
- var seen = new TextBlock { Text = live ? Loc.T("preferences.remote.now") : Ago(d.LastSeen), FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
+ var seen = new TextBlock { Text = live ? Loc.T("preferences.remote.now") : Ago(d.LastSeen), FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
var forget = Btn(Loc.T("preferences.remote.forget"));
forget.Height = 24; forget.FontSize = 10; forget.Padding = new Thickness(10, 0);
ToolTip.SetTip(forget, Loc.T("preferences.remote.disconnect_it_and_make_it"));
diff --git a/src/managed/Nota.App/PreferencesWindow.Samples.cs b/src/managed/Nota.App/PreferencesWindow.Samples.cs
index c84a51fd..cbc806d2 100644
--- a/src/managed/Nota.App/PreferencesWindow.Samples.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Samples.cs
@@ -56,7 +56,7 @@ public sealed partial class PreferencesWindow
for (int i = 0; i < PackFilters.Length; i++)
{
int idx = i;
- var count = new TextBlock { FontSize = 8.5, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };
+ var count = new TextBlock { FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center };
_packCounts[i] = count;
var b = new ToggleButton
{
@@ -253,10 +253,10 @@ public sealed partial class PreferencesWindow
Children =
{
new TextBlock { Text = p.Name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = TextPrimary, Margin = new Thickness(0, 0, 8, 0), VerticalAlignment = VerticalAlignment.Center },
- new TextBlock { Text = PackKindLabel(p.Kind), FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center },
+ new TextBlock { Text = PackKindLabel(p.Kind), FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center },
},
},
- new TextBlock { Text = $"{p.Author} · {p.Version} · {p.License}", FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary },
+ new TextBlock { Text = $"{p.Author} · {p.Version} · {p.License}", FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary },
new TextBlock { Text = p.Description, FontSize = 11, LineHeight = 18, Foreground = TextSecondary, TextWrapping = TextWrapping.Wrap },
},
};
diff --git a/src/managed/Nota.App/PreferencesWindow.Skins.cs b/src/managed/Nota.App/PreferencesWindow.Skins.cs
index e796855a..ef79edd5 100644
--- a/src/managed/Nota.App/PreferencesWindow.Skins.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Skins.cs
@@ -141,7 +141,9 @@ public sealed partial class PreferencesWindow
// A copy of any theme in the themes folder, under a free id and "<name> copy", then worn.
private static void DuplicateTheme(NotaColourTheme t)
{
- var source = NotaThemes.Find(t.Id) ?? t; // the file's own colours, not the accented ones
+ // The file's own colours, not the accented ones — in the look being worn, so a built-in
+ // duplicated under Classic starts a skin from 0.59's colours (spec 091).
+ var source = NotaThemeService.InLook(NotaThemes.Find(t.Id) ?? t, NotaThemeService.Look);
var name = Loc.F("preferences.skins.copy_name", source.Name);
if (name.Length > ThemeFile.MaxNameLength) name = name[..ThemeFile.MaxNameLength].TrimEnd();
var folder = NotaThemes.ThemesFolder;
diff --git a/src/managed/Nota.App/PreferencesWindow.Store.cs b/src/managed/Nota.App/PreferencesWindow.Store.cs
index 2fd52942..5b7e4c2e 100644
--- a/src/managed/Nota.App/PreferencesWindow.Store.cs
+++ b/src/managed/Nota.App/PreferencesWindow.Store.cs
@@ -75,7 +75,7 @@ public sealed partial class PreferencesWindow
for (int i = 0; i < StoreFilters.Length; i++)
{
int idx = i;
- var count = new TextBlock { FontSize = 8.5, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };
+ var count = new TextBlock { FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center };
_storeCounts[i] = count;
var b = new ToggleButton
{
@@ -183,7 +183,7 @@ public sealed partial class PreferencesWindow
Children =
{
new TextBlock { Text = h.Title, FontSize = 8.5, FontWeight = FontWeight.Medium, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center },
- new TextBlock { Text = h.Count.ToString(), FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextDisabled, VerticalAlignment = VerticalAlignment.Center },
+ new TextBlock { Text = h.Count.ToString(), FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, Foreground = TextDisabled, VerticalAlignment = VerticalAlignment.Center },
},
},
}),
@@ -309,7 +309,7 @@ public sealed partial class PreferencesWindow
private Control StoreDock()
{
_dockTitle = new TextBlock { FontSize = 11, FontWeight = FontWeight.Medium, Foreground = TextPrimary, TextWrapping = TextWrapping.Wrap, VerticalAlignment = VerticalAlignment.Center };
- _dockDetail = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
+ _dockDetail = new TextBlock { FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
_dockBar = new ProgressBar { Minimum = 0, Maximum = 1, Height = 4, MinWidth = 0 };
_dockCancel = StoreButton(Loc.T("common.cancel"), enabled: true, Jobs.Cancel);
_dockCancel.VerticalAlignment = VerticalAlignment.Center;
@@ -380,11 +380,11 @@ public sealed partial class PreferencesWindow
Children =
{
new TextBlock { Text = p.Name, FontSize = 12, FontWeight = FontWeight.SemiBold, Foreground = here ? TextPrimary : TextSecondary, Margin = new Thickness(0, 0, 8, 0), VerticalAlignment = VerticalAlignment.Center },
- new TextBlock { Text = KindLabel(p.Kind), FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center },
+ new TextBlock { Text = KindLabel(p.Kind), FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, Foreground = TextMuted, VerticalAlignment = VerticalAlignment.Center },
PlatformIcons(p.Platforms),
},
},
- new TextBlock { Text = $"{p.Developer} · {p.Version} · {p.License}", FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = here ? TextTertiary : TextDisabled },
+ new TextBlock { Text = $"{p.Developer} · {p.Version} · {p.License}", FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = here ? TextTertiary : TextDisabled },
new TextBlock { Text = p.Description, FontSize = 11, LineHeight = 18, Foreground = here ? TextSecondary : TextTertiary, TextWrapping = TextWrapping.Wrap },
},
};
@@ -420,7 +420,7 @@ public sealed partial class PreferencesWindow
if (inst is null && p.Asset is { Size: > 0 } asset)
actions.Children.Add(new TextBlock
{
- Text = NotaNum.Unit(asset.Size / 1048576.0, "0.0", "MB"), FontSize = 9, FontFamily = NotaFonts.UiFamily,
+ Text = NotaNum.Unit(asset.Size / 1048576.0, "0.0", "MB"), FontSize = 9, FontFamily = NotaFonts.ValuesFamily,
Foreground = TextTertiary, HorizontalAlignment = HorizontalAlignment.Right,
});
var source = StoreLink(Loc.T("preferences.source"), GlyphKind.PopOut, () => _ = Launcher.LaunchUriAsync(new Uri(p.Repo)));
diff --git a/src/managed/Nota.App/PreferencesWindow.cs b/src/managed/Nota.App/PreferencesWindow.cs
index 4882da14..3afce031 100644
--- a/src/managed/Nota.App/PreferencesWindow.cs
+++ b/src/managed/Nota.App/PreferencesWindow.cs
@@ -236,7 +236,7 @@ public sealed partial class PreferencesWindow : NotaWindow
var label = new TextBlock { Text = page.Title, FontSize = 11, VerticalAlignment = VerticalAlignment.Center };
var badge = new TextBlock
{
- FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary,
+ FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary,
VerticalAlignment = VerticalAlignment.Center, IsVisible = false,
};
var row = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto"), ColumnSpacing = 8, Margin = new Thickness(10, 0) };
@@ -354,8 +354,8 @@ public sealed partial class PreferencesWindow : NotaWindow
bufCombo.SelectedIndex = IndexOf(BufferSizes, cfg.BufferFrames);
bufCombo.SelectionChanged += (_, _) => { int i = bufCombo.SelectedIndex; if (i >= 0) { engine.SetAudioBufferFrames(BufferSizes[i]); Apply(); } };
- _latencyValue = new TextBlock { FontSize = 11, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary };
- _latencyDetail = new TextBlock { FontSize = 11, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary, TextWrapping = TextWrapping.Wrap };
+ _latencyValue = new TextBlock { FontSize = 11, FontFamily = NotaFonts.ValuesFamily, Foreground = TextPrimary };
+ _latencyDetail = new TextBlock { FontSize = 11, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary, TextWrapping = TextWrapping.Wrap };
UpdateLatency();
var latency = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, VerticalAlignment = VerticalAlignment.Center, Children = { _latencyValue, _latencyDetail } };
@@ -781,7 +781,7 @@ public sealed partial class PreferencesWindow : NotaWindow
{
var last = new TextBlock
{
- Text = "—", FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextTertiary,
+ Text = "—", FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = TextTertiary,
VerticalAlignment = VerticalAlignment.Center, MinWidth = 64, TextAlignment = TextAlignment.Right,
};
lastLabels[i] = last;
@@ -838,7 +838,7 @@ public sealed partial class PreferencesWindow : NotaWindow
{
var grid = new Grid { ColumnDefinitions = new ColumnDefinitions($"{LabelCol},*") };
grid.Children.Add(new TextBlock { Text = input, FontSize = 11, Foreground = TextSecondary, Margin = new Thickness(12, 9) });
- var a = new TextBlock { Text = action, FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary, Margin = new Thickness(12, 9), VerticalAlignment = VerticalAlignment.Center };
+ var a = new TextBlock { Text = action, FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = TextPrimary, Margin = new Thickness(12, 9), VerticalAlignment = VerticalAlignment.Center };
Grid.SetColumn(a, 1);
grid.Children.Add(a);
map.Add(grid);
@@ -882,7 +882,7 @@ public sealed partial class PreferencesWindow : NotaWindow
var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto"), ColumnSpacing = 8 };
grid.Children.Add(new TextBlock
{
- Text = path, FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = sel ? TextPrimary : TextSecondary,
+ Text = path, FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = sel ? TextPrimary : TextSecondary,
VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis,
});
var tag = new TextBlock { Text = IsDefault(path) ? Loc.T("preferences.default") : "", FontSize = 9, Foreground = TextTertiary, VerticalAlignment = VerticalAlignment.Center };
@@ -999,7 +999,7 @@ public sealed partial class PreferencesWindow : NotaWindow
bool custom = !string.IsNullOrWhiteSpace(get());
var path = new TextBlock
{
- Text = custom ? get() : resolved(), FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary,
+ Text = custom ? get() : resolved(), FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = TextPrimary,
TextTrimming = TextTrimming.CharacterEllipsis,
};
var tag = new TextBlock { Text = custom ? Loc.T("preferences.custom") : Loc.T("preferences.default"), FontSize = 9, Foreground = TextTertiary };
@@ -1155,12 +1155,13 @@ public sealed partial class PreferencesWindow : NotaWindow
public ThemePreview(NotaColourTheme theme) { _theme = theme; Width = W; Height = H; }
// The theme as it is worn with the chosen accent (spec 084), so the card previews the pair.
- private IBrush B(SolidColorBrush slot) => new ImmutableSolidColorBrush(NotaPalette.ColorIn(slot, NotaThemeService.Worn(_theme)));
+ // Under the classic look a built-in card shows its classic palette (spec 091).
+ private IBrush B(SolidColorBrush slot) => new ImmutableSolidColorBrush(NotaPalette.ColorIn(slot, NotaThemeService.WornForCard(_theme)));
public override void Render(DrawingContext ctx)
{
// The theme's own corners (spec 087): a square skin previews square.
- double fieldR = _theme.Geometry.RadiusOf(RadiusStep.Field);
+ double fieldR = Looks.Compose(_theme.Geometry, NotaThemeService.Look).RadiusOf(RadiusStep.Field);
var seam = new Pen(B(NotaPalette.Seam), 1);
void Fill(SolidColorBrush slot, double x, double y, double w, double h) => ctx.FillRectangle(B(slot), new Rect(x, y, w, h));
void Key(SolidColorBrush slot, double x, double y, double w, double h) =>
@@ -1236,6 +1237,66 @@ public sealed partial class PreferencesWindow : NotaWindow
return new Border { Classes = { "segmented" }, HorizontalAlignment = HorizontalAlignment.Left, Child = strip };
}
+ // New · Classic (spec 091): the look every theme is worn in. Applies at once, like a theme
+ // pick, and is saved; an MCP set_look elsewhere moves the buttons (NotaThemeService.Changed).
+ private static Control LookPicker()
+ {
+ var settings = App.Services.GetRequiredService<ISettingsService>();
+ var strip = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
+ var buttons = new List<(Look Look, ToggleButton Btn)>();
+ void Show() { foreach (var (l, b) in buttons) b.IsChecked = l == NotaThemeService.Look; }
+ foreach (var (look, label) in new[] { (Look.New, Loc.T("preferences.look_new")), (Look.Classic, Loc.T("preferences.look_classic")) })
+ {
+ var lk = look;
+ var btn = new ToggleButton { Classes = { "seg" }, FontSize = 11, Content = label };
+ btn.Click += (_, _) =>
+ {
+ Looks.Store(settings.Current, lk);
+ settings.Save();
+ NotaThemeService.SetLook(lk);
+ Show();
+ };
+ buttons.Add((lk, btn));
+ strip.Children.Add(btn);
+ }
+ Show();
+ var host = new Border { Classes = { "segmented" }, HorizontalAlignment = HorizontalAlignment.Left, Child = strip };
+ void OnChanged() => Dispatcher.UIThread.Post(Show);
+ host.AttachedToVisualTree += (_, _) => NotaThemeService.Changed += OnChanged;
+ host.DetachedFromVisualTree += (_, _) => NotaThemeService.Changed -= OnChanged;
+ return host;
+ }
+
+ // Solid · Tinted Arrangement clips (spec 091). Shows the style in effect — the look's default
+ // until the user picks; a pick is stored and wins over the look. Saving fires
+ // Settings.Changed, which redraws the open Arrangement.
+ private static Control ClipStylePicker()
+ {
+ var settings = App.Services.GetRequiredService<ISettingsService>();
+ var strip = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 2 };
+ var buttons = new List<(ClipStyle Style, ToggleButton Btn)>();
+ void Show() { var now = Looks.ClipStyleOf(settings.Current); foreach (var (st, b) in buttons) b.IsChecked = st == now; }
+ foreach (var (style, label) in new[] { (ClipStyle.Solid, Loc.T("preferences.clips_solid")), (ClipStyle.Tinted, Loc.T("preferences.clips_tinted")) })
+ {
+ var st = style;
+ var btn = new ToggleButton { Classes = { "seg" }, FontSize = 11, Content = label };
+ btn.Click += (_, _) =>
+ {
+ Looks.StoreClipStyle(settings.Current, st);
+ settings.Save();
+ Show();
+ };
+ buttons.Add((st, btn));
+ strip.Children.Add(btn);
+ }
+ Show();
+ var host = new Border { Classes = { "segmented" }, HorizontalAlignment = HorizontalAlignment.Left, Child = strip };
+ void OnChanged() => Dispatcher.UIThread.Post(Show); // a look switch moves the default
+ host.AttachedToVisualTree += (_, _) => NotaThemeService.Changed += OnChanged;
+ host.DetachedFromVisualTree += (_, _) => NotaThemeService.Changed -= OnChanged;
+ return host;
+ }
+
// Left / Right for the arrangement's track-header column (#72). Saving fires
// Settings.Changed, which moves the column at once and ticks the View menu item.
// The same event repaints these buttons, so a change from the View menu updates an
@@ -1344,6 +1405,10 @@ public sealed partial class PreferencesWindow : NotaWindow
private Control AppearancePane() => Sections(
Section("UI", 10,
+ Row(Loc.T("preferences.look"), LookPicker()),
+ Row("", Caption(Loc.T("preferences.look_caption"))),
+ Row(Loc.T("preferences.clips"), ClipStylePicker()),
+ Row("", Caption(Loc.T("preferences.clips_caption"))),
TopRow(Loc.T("preferences.colour_theme"), ThemePicker()),
Row("", Caption(Loc.T("preferences.skins.follow_system_hint"))),
TopRow(Loc.T("preferences.accent"), AccentPicker()),
@@ -1645,7 +1710,7 @@ public sealed partial class PreferencesWindow : NotaWindow
Children =
{
new TextBlock { Text = title, Classes = { "SectionLabel" }, VerticalAlignment = VerticalAlignment.Center },
- new TextBlock { Text = shown.Count.ToString(), FontSize = 8.5, FontFamily = NotaFonts.UiFamily, Foreground = TextDisabled, VerticalAlignment = VerticalAlignment.Center },
+ new TextBlock { Text = shown.Count.ToString(), FontSize = 8.5, FontFamily = NotaFonts.ValuesFamily, Foreground = TextDisabled, VerticalAlignment = VerticalAlignment.Center },
},
};
groups.Children.Add(new StackPanel { Spacing = 6, Children = { head, Table(shown.Select(r => ShortcutRow(r.Key, r.Action)).ToList()) } });
@@ -1726,7 +1791,7 @@ public sealed partial class PreferencesWindow : NotaWindow
{
var text = new TextBlock
{
- Text = label, FontSize = 10, FontFamily = NotaFonts.UiFamily, Foreground = TextPrimary,
+ Text = label, FontSize = 10, FontFamily = NotaFonts.ValuesFamily, Foreground = TextPrimary,
HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
};
return new Border
diff --git a/src/managed/Nota.App/PreviewPlayer.cs b/src/managed/Nota.App/PreviewPlayer.cs
index 814db573..13c7a297 100644
--- a/src/managed/Nota.App/PreviewPlayer.cs
+++ b/src/managed/Nota.App/PreviewPlayer.cs
@@ -130,8 +130,8 @@ public sealed class PreviewPlayer : UserControl
ToolTip.SetTip(_playBtn, Loc.T("common.play_stop"));
_playBtn.PointerPressed += (_, e) => { if (IsLeft(e)) { Toggle(); e.Handled = true; } };
- _timeNow = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, VerticalAlignment = VerticalAlignment.Center };
- _timeTotal = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextDisabled, VerticalAlignment = VerticalAlignment.Center };
+ _timeNow = new TextBlock { FontSize = 9, FontFamily = NotaFonts.ValuesFamily, VerticalAlignment = VerticalAlignment.Center };
+ _timeTotal = new TextBlock { FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextDisabled, VerticalAlignment = VerticalAlignment.Center };
var time = _time = new StackPanel
{
Orientation = Orientation.Horizontal, Spacing = 3, Margin = new Thickness(6, 0, 0, 0),
@@ -602,15 +602,15 @@ public sealed class PreviewPlayer : UserControl
// A lone "unsupported" (or a full set) is all-or-nothing; the rest drops from the tail.
if (n < _metaParts.Length && n > 2) continue; // full, or length · rate, or length
var m = string.Join(" · ", _metaParts, 0, n);
- if (nameW + 8 + TextW(m, NotaFonts.Sans, 9) <= avail) { meta = m; break; }
+ if (nameW + 8 + TextW(m, NotaFonts.Measure, 9) <= avail) { meta = m; break; }
}
_meta.Text = meta;
_meta.IsVisible = meta.Length > 0;
// Controls.
const double gap = 6, minMiddle = 8;
- double now = TextW(_timeNow.Text ?? "", NotaFonts.Sans, 10);
- double total = 3 + TextW(_timeTotal.Text ?? "", NotaFonts.Sans, 10);
+ double now = TextW(_timeNow.Text ?? "", NotaFonts.Measure, 10);
+ double total = 3 + TextW(_timeTotal.Text ?? "", NotaFonts.Measure, 10);
double autoFull = 2 + 7 + 6 + 5 + TextW(Loc.T("common.auto"), NotaFonts.SansSemiBold, 10) + 7, autoDot = 22;
double volFull = 12 + 5 + 46, volIcon = 22, loop = 22 + gap;
double source = _sourceBtn.IsVisible ? 2 + 14 + 5 + 6 + TextW(_sourceText.Text ?? "", NotaFonts.SansSemiBold, 10) + gap : 0;
@@ -1080,7 +1080,7 @@ public sealed class PreviewWaveform : Control
double hx = InsetX + innerW * f;
ctx.FillRectangle(NotaPalette.TextTertiary, new Rect(Math.Round(hx), 0, 1, h));
var ft = new NotaFormattedText(Fmt(f * _duration), NotaNum.Culture, FlowDirection.LeftToRight,
- NotaFonts.Sans, 8, NotaPalette.TextPrimary);
+ NotaFonts.Measure, 8, NotaPalette.TextPrimary);
double tw = ft.Width + 8, th = ft.Height + 2;
double tx = f > 0.75 ? hx - tw - 4 : hx + 4;
ctx.FillRectangle(NotaPalette.TrackOff, new Rect(tx, InsetY, tw, th), (float)NotaRadius.FineValue);
@@ -1089,7 +1089,7 @@ public sealed class PreviewWaveform : Control
if (!string.IsNullOrEmpty(hint) && (_peaks is null || _spectrum))
{
- var ht = new NotaFormattedText(hint, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Sans, 9, NotaPalette.TextTertiary)
+ var ht = new NotaFormattedText(hint, NotaNum.Culture, FlowDirection.LeftToRight, NotaFonts.Measure, 9, NotaPalette.TextTertiary)
{
MaxTextWidth = Math.Max(20, w - 16), MaxLineCount = 2, TextAlignment = TextAlignment.Center,
Trimming = TextTrimming.CharacterEllipsis,
diff --git a/src/managed/Nota.App/Remote/ConnectPhoneView.cs b/src/managed/Nota.App/Remote/ConnectPhoneView.cs
index 3b3a327e..267912d6 100644
--- a/src/managed/Nota.App/Remote/ConnectPhoneView.cs
+++ b/src/managed/Nota.App/Remote/ConnectPhoneView.cs
@@ -102,10 +102,10 @@ internal sealed class ConnectPhoneView : Border
_qr = new QrView { Width = 150, Height = 150, Text = _remote.QrText };
var info = new StackPanel { Spacing = 10 };
info.Children.Add(Field(Loc.T("remote.connect.address"), AddressRows()));
- _code = new TextBlock { FontSize = 23, FontWeight = FontWeight.Medium, LetterSpacing = 4.8, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextHeading, VerticalAlignment = VerticalAlignment.Center };
+ _code = new TextBlock { FontSize = 23, FontWeight = FontWeight.Medium, LetterSpacing = 4.8, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextHeading, VerticalAlignment = VerticalAlignment.Center };
_ring = new Arc { Width = 20, Height = 20, StrokeThickness = 2.5, Stroke = NotaPalette.VizInk, StartAngle = -90, VerticalAlignment = VerticalAlignment.Center };
var ringBack = new Ellipse { Width = 20, Height = 20, StrokeThickness = 2.5, Stroke = NotaPalette.TrackOff };
- _left = new TextBlock { FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextTertiary, VerticalAlignment = VerticalAlignment.Center };
+ _left = new TextBlock { FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextTertiary, VerticalAlignment = VerticalAlignment.Center };
var codeRow = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, Children = { _code, new Panel { Children = { ringBack, _ring } }, _left } };
info.Children.Add(Field(Loc.T("remote.connect.code"), codeRow));
bool usb = _remote.Links is { Count: > 0 } links && links[0].Usb;
@@ -145,7 +145,7 @@ internal sealed class ConnectPhoneView : Border
: Loc.F("remote.connect.ms", d.RttMs, screen);
var names = new StackPanel { Spacing = 1, VerticalAlignment = VerticalAlignment.Center };
names.Children.Add(new TextBlock { Text = d.Name, FontSize = 11, FontWeight = FontWeight.Medium, Foreground = NotaPalette.TextPrimary, TextTrimming = TextTrimming.CharacterEllipsis });
- names.Children.Add(new TextBlock { Text = sub, FontSize = 9, FontFamily = NotaFonts.UiFamily, Foreground = weak ? NotaPalette.Warning : NotaPalette.TextTertiary });
+ names.Children.Add(new TextBlock { Text = sub, FontSize = 9, FontFamily = NotaFonts.ValuesFamily, Foreground = weak ? NotaPalette.Warning : NotaPalette.TextTertiary });
var trackBar = new Border { Width = 4, Height = 18, CornerRadius = NotaRadius.Field, VerticalAlignment = VerticalAlignment.Center, Background = d.TrackId > 0 ? TrackColorBrush(d.TrackId) : NotaPalette.BorderStrong };
var trackName = new TextBlock { Text = d.TrackId > 0 ? _engine.GetTrackName(d.TrackId) : "—", FontSize = 10, Foreground = NotaPalette.TextSecondary, Width = 70, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis };
@@ -189,7 +189,7 @@ internal sealed class ConnectPhoneView : Border
var links = _remote.Links;
var host = _remote.Url!.Replace("http://", "");
var first = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 };
- first.Children.Add(new TextBlock { Text = host, FontSize = 12, FontFamily = NotaFonts.UiFamily, Foreground = NotaPalette.TextPrimary, VerticalAlignment = VerticalAlignment.Center });
+ first.Children.Add(new TextBlock { Text = host, FontSize = 12, FontFamily = NotaFonts.ValuesFamily, Foreground = NotaPalette.TextPrimary, VerticalAlignment = VerticalAlignment.Center });
if (links.Count > 0 && links[0].Usb)
first.Children.Add(new Border
{
@@ -201,7 +201,7 @@ internal sealed class ConnectPhoneView : Border
for (int i = 1; i < links.Count; i++)
rows.Children.Add(new TextBlock
{
- Text = $"{links[i].Name} {links[i].Address}:{_settings.Current.RemotePort}", FontSize = 9, FontFamily = NotaFonts.UiFamily,
+ Text = $"{links[i].Name} {links[i].Address}:{_settings.Current.RemotePort}", FontSize = 9, FontFamily = NotaFonts.ValuesFamily,
Foreground = NotaPalette.TextTertiary, Margin = new Thickness(0, 1, 0, 0),
});
return rows;
diff --git a/src/managed/Nota.App/SaveChangesWindow.cs b/src/managed/Nota.App/SaveChangesWindow.cs
index a78ba304..73f1d76c 100644
--- a/src/managed/Nota.App/SaveChangesWindow.cs
+++ b/src/managed/Nota.App/SaveChangesWindow.cs
@@ -115,7 +115,7 @@ public sealed class SaveChangesWindow : NotaWindow
var meta = new TextBlock
{
Text = detail,
- FontFamily = NotaFonts.UiFamily,
+ FontFamily = NotaFonts.ValuesFamily,
FontSize = NotaType.Value,
Foreground = NotaPalette.TextMuted,
VerticalAlignment = VerticalAlignment.Bottom,
diff --git a/src/managed/Nota.App/SessionView.Grid.cs b/src/managed/Nota.App/SessionView.Grid.cs
index 9982c15a..8340a22a 100644
--- a/src/managed/Nota.App/SessionView.Grid.cs
+++ b/src/managed/Nota.App/SessionView.Grid.cs
@@ -132,7 +132,7 @@ public sealed partial class SessionView
private static TextBlock Mono(string text, double size, IBrush ink)
{
var t = new TextBlock { Text = text, FontSize = size, Foreground = ink, VerticalAlignment = VerticalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return t;
}
@@ -255,7 +255,7 @@ public sealed partial class SessionView
if (c.Kind == ColKind.Track)
{
var arrText = new TextBlock { Text = Loc.T("session.grid.arr"), FontSize = 8, FontWeight = FontWeight.Medium, Foreground = NotaPalette.Accent };
- arrText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ arrText.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
_arr = new Border
{
BorderBrush = NotaPalette.AccentDim, BorderThickness = new Thickness(1), CornerRadius = NotaRadius.Field,
@@ -270,7 +270,7 @@ public sealed partial class SessionView
top.Children.Add(name);
var kind = new TextBlock { Text = c.KindLabel, FontSize = 8.5, FontWeight = FontWeight.Medium, Foreground = NotaPalette.TextMuted, TextTrimming = TextTrimming.CharacterEllipsis };
- kind.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ kind.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var stack = new StackPanel { Spacing = 4, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 3, 8, 0), Children = { top, kind } };
Child = new Panel { Children = { stripe, stack } };
@@ -538,7 +538,7 @@ public sealed partial class SessionView
DrawTriangle(ctx, lc, 8, 9, tri);
}
- var lenFt = Ft(_len, NotaFonts.Sans, 10, playing ? NotaPalette.TextStrong : NotaPalette.TextTertiary);
+ var lenFt = Ft(_len, NotaFonts.Measure, 10, playing ? NotaPalette.TextStrong : NotaPalette.TextTertiary);
double lenX = r.Width - 6 - lenFt.Width;
ctx.DrawText(lenFt, new Point(lenX, (TopRowH - lenFt.Height) / 2));
var nameFt = Ft(_name, NotaFonts.SansSemiBold, NotaType.ClipName, _brush, lenX - 27 - 4);
@@ -588,7 +588,7 @@ public sealed partial class SessionView
FillCell(ctx, r, NotaPalette.Wash(NotaPalette.Record, 0x33), NotaPalette.Record);
var lc = LaunchZone.Center;
ctx.DrawEllipse(waiting && !_o._blinkOn ? NotaPalette.Wash(NotaPalette.Record, 0x66) : NotaPalette.Record, null, lc, 4.5, 4.5);
- var lenFt = Ft(FormatDuration(waiting ? 0 : _o._recElapsed), NotaFonts.Sans, 9, NotaPalette.DangerBright);
+ var lenFt = Ft(FormatDuration(waiting ? 0 : _o._recElapsed), NotaFonts.Measure, 9, NotaPalette.DangerBright);
double lenX = r.Width - 6 - lenFt.Width;
ctx.DrawText(lenFt, new Point(lenX, (TopRowH - lenFt.Height) / 2));
var nameFt = Ft(waiting ? Loc.T("session.grid.rec_in") : Loc.T("session.recording"), NotaFonts.SansMedium, 11, NotaPalette.TextHeading, lenX - 31);
@@ -868,13 +868,13 @@ public sealed partial class SessionView
double right = r.Width - 8;
if (_badge.Length > 0)
{
- var b = Ft(_badge, NotaFonts.Sans, 9, NotaPalette.TextSecondary);
+ var b = Ft(_badge, NotaFonts.Measure, 9, NotaPalette.TextSecondary);
var box = new Rect(right - b.Width - 8, r.Height / 2 - 8, b.Width + 8, 16);
ctx.DrawRectangle(null, new Pen(NotaPalette.BorderDefault, 1), box.Deflate(0.5), NotaRadius.CellValue, NotaRadius.CellValue);
ctx.DrawText(b, new Point(box.X + 4, box.Y + (16 - b.Height) / 2));
right = box.X - 6;
}
- var idx = Ft((_scene + 1).ToString("00", CultureInfo.CurrentCulture), NotaFonts.Sans, 9, NotaPalette.TextDisabled);
+ var idx = Ft((_scene + 1).ToString("00", CultureInfo.CurrentCulture), NotaFonts.Measure, 9, NotaPalette.TextDisabled);
var name = Ft(_name, NotaFonts.SansSemiBold, 12, _named ? NotaPalette.TextPrimary : NotaPalette.TextTertiary, Math.Max(10, right - x - idx.Width - 6));
ctx.DrawText(name, new Point(x, (r.Height - name.Height) / 2));
ctx.DrawText(idx, new Point(x + name.Width + 6, (r.Height - name.Height) / 2 + (name.Baseline - idx.Baseline)));
diff --git a/src/managed/Nota.App/SessionView.Inspector.cs b/src/managed/Nota.App/SessionView.Inspector.cs
index 6688f930..a5aa0854 100644
--- a/src/managed/Nota.App/SessionView.Inspector.cs
+++ b/src/managed/Nota.App/SessionView.Inspector.cs
@@ -62,7 +62,7 @@ public sealed partial class SessionView
Text = MenuKit.Keys(Loc.T("session.inspector.click_selects_the_triangle_launches")),
FontSize = 8.5, LineHeight = 15, Foreground = NotaPalette.TextDisabled, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(16),
};
- hint.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ hint.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var dock = new DockPanel();
DockPanel.SetDock(hint, Dock.Bottom);
dock.Children.Add(hint);
diff --git a/src/managed/Nota.App/SessionView.Mixer.cs b/src/managed/Nota.App/SessionView.Mixer.cs
index c311ffa7..2a74380b 100644
--- a/src/managed/Nota.App/SessionView.Mixer.cs
+++ b/src/managed/Nota.App/SessionView.Mixer.cs
@@ -250,7 +250,7 @@ public sealed partial class SessionView
private static TextBlock ReadoutText()
{
var t = new TextBlock { FontSize = 8.5, Foreground = NotaPalette.TextMuted, Width = 30, TextAlignment = TextAlignment.Right, VerticalAlignment = VerticalAlignment.Center };
- t.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ t.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
return t;
}
@@ -396,7 +396,7 @@ public sealed partial class SessionView
HorizontalContentAlignment = HorizontalAlignment.Center, Padding = new Thickness(compact ? 4 : 8, 0),
FontSize = compact ? 9 : 10, Height = compact ? 16 : 20, MinWidth = 0,
};
- if (mono) tb.BindResource(ToggleButton.FontFamilyProperty, "Font.UI");
+ if (mono) tb.BindResource(ToggleButton.FontFamilyProperty, "Font.Measure");
tb.Click += (_, _) =>
{
foreach (var b in buttons) b.IsChecked = ReferenceEquals(b, tb);
diff --git a/src/managed/Nota.App/SessionView.Toolbar.cs b/src/managed/Nota.App/SessionView.Toolbar.cs
index b82a9819..8aa3876c 100644
--- a/src/managed/Nota.App/SessionView.Toolbar.cs
+++ b/src/managed/Nota.App/SessionView.Toolbar.cs
@@ -59,7 +59,7 @@ public sealed partial class SessionView
ToolTip.SetTip(fixedRow, Loc.T("session.toolbar.fixed_record_length_in_bars"));
_quantLabel = new TextBlock { FontSize = 9, Foreground = NotaPalette.TextPrimary, VerticalAlignment = VerticalAlignment.Center };
- _quantLabel.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _quantLabel.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var quant = new Button
{
Height = NotaSize.Shell, Padding = new Thickness(9, 0),
@@ -112,9 +112,9 @@ public sealed partial class SessionView
var sectionsWell = new Border { Classes = { "segmented" }, Padding = new Thickness(2), Child = sections };
_posText = new TextBlock { FontSize = 11, Foreground = NotaPalette.TextPrimary, MinWidth = 56, VerticalAlignment = VerticalAlignment.Center };
- _posText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _posText.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
_tempoText = new TextBlock { FontSize = 9, Foreground = NotaPalette.TextTertiary, VerticalAlignment = VerticalAlignment.Center };
- _tempoText.BindResource(TextBlock.FontFamilyProperty, "Font.UI");
+ _tempoText.BindResource(TextBlock.FontFamilyProperty, "Font.Measure");
var readout = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, Margin = new Thickness(8, 0), Children = { _posText, _tempoText } };
_backBtn = new Button { Content = Loc.T("session.toolbar.back_to_arrangement"), Height = NotaSize.Shell, Padding = new Thickness(10, 0), FontSize = 10 };
diff --git a/src/managed/Nota.App/Skins/SkinPreviewRenderer.cs b/src/managed/Nota.App/Skins/SkinPreviewRenderer.cs
index 5098efda..75a4b8bf 100644
--- a/src/managed/Nota.App/Skins/SkinPreviewRenderer.cs
+++ b/src/managed/Nota.App/Skins/SkinPreviewRenderer.cs
@@ -26,6 +26,7 @@ using Avalonia.Layout;
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Threading;
+using Avalonia.VisualTree;
using Microsoft.Extensions.DependencyInjection;
using Nota.Application;
using Nota.Application.Localization;
@@ -65,7 +66,8 @@ internal static class SkinPreviewRenderer
/// so Loaded handlers, posted work and virtualising lists (realised from the layout manager's
/// viewport events) settle. Then one job wears the skin, re-skins and lays out every tree,
/// draws them and puts the live theme back.</summary>
- public static async Task<(List<Image> Images, List<string> Unknown)> RenderAsync(NotaColourTheme theme, bool themeAccent, IReadOnlyList<string>? names)
+ public static async Task<(List<Image> Images, List<string> Unknown)> RenderAsync(NotaColourTheme theme, bool themeAccent, IReadOnlyList<string>? names,
+ Look? look = null)
{
var wanted = names is { Count: > 0 } ? names : Names;
var unknown = wanted.Where(n => Surfaces.All(s => s.Name != n)).Distinct().ToList();
@@ -83,21 +85,29 @@ internal static class SkinPreviewRenderer
{
foreach (var s in surfaces.Where(s => !s.Live))
{
- try { if (Host(s, scene!) is { } h) hosts.Add(h); }
+ try
+ {
+ if (Host(s, scene!) is not { } h) continue;
+ // The clips as the look being previewed draws them (spec 091).
+ var clips = ClipsIn(look);
+ foreach (var av in h.Item3.GetSelfAndVisualDescendants().OfType<ArrangementView>()) av.ClipStyle = clips;
+ if (h.Item3 is ArrangementView own) own.ClipStyle = clips; // before it is in a tree
+ hosts.Add(h);
+ }
catch (Exception e) when (e is InvalidOperationException or ArgumentException or NullReferenceException) { }
}
});
for (int i = 0; i < 4; i++) await Dispatcher.UIThread.InvokeAsync(() => { }, DispatcherPriority.Background);
var live = new List<Visual>();
- NotaThemeService.RenderScoped(theme, themeAccent, () => NotaTextSize.Scoped(0, () =>
+ NotaThemeService.RenderScoped(theme, themeAccent, look, () => NotaTextSize.Scoped(0, () =>
{
foreach (var s in surfaces)
{
byte[]? png = null;
try
{
- if (s.Live) png = RenderLive(s, live);
+ if (s.Live) png = RenderLive(s, live, ClipsIn(look));
else if (hosts.FirstOrDefault(h => h.Surface == s) is { Host: not null } h) png = Snap(h.Host, h.Content);
}
catch (Exception e) when (e is InvalidOperationException or ArgumentException or NullReferenceException)
@@ -119,7 +129,11 @@ internal static class SkinPreviewRenderer
// ── the live window's own parts ─────────────────────────────────────────────────────
- private static byte[]? RenderLive(Surface s, List<Visual> touched)
+ // The clip style the previewed look draws (spec 091): the user's pick, or that look's default.
+ private static ClipStyle ClipsIn(Look? look) =>
+ Looks.ClipStyleOf(App.Services.GetRequiredService<ISettingsService>().Current, look ?? NotaThemeService.Look);
+
+ private static byte[]? RenderLive(Surface s, List<Visual> touched, ClipStyle clips)
{
if (Avalonia.Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime { MainWindow: MainWindow main })
return null;
@@ -132,6 +146,15 @@ internal static class SkinPreviewRenderer
};
if (target is null || target.Bounds.Width < 1 || target.Bounds.Height < 1) return null;
touched.Add(target);
+ // The open arrangement wears the previewed look's clip style for the picture only.
+ var arrangements = target.GetSelfAndVisualDescendants().OfType<ArrangementView>().Select(a => (View: a, Was: a.ClipStyle)).ToList();
+ foreach (var (a, _) in arrangements) a.ClipStyle = clips;
+ try { return SnapLive(target); }
+ finally { foreach (var (a, was) in arrangements) a.ClipStyle = was; }
+ }
+
+ private static byte[]? SnapLive(Control target)
+ {
NotaSkin.Reapply(target);
NotaTextSize.Reapply(target); // built at the user's text size; the preview draws at the default
// Layout with the skin's typeface, at the size it has on screen.
diff --git a/src/managed/Nota.App/SnapChip.cs b/src/managed/Nota.App/SnapChip.cs
index 8f0ed4b4..e28412a9 100644
--- a/src/managed/Nota.App/SnapChip.cs
+++ b/src/managed/Nota.App/SnapChip.cs
@@ -52,7 +52,7 @@ internal sealed class SnapChip
{
var value = new TextBlock
{
- FontFamily = NotaFonts.UiFamily, FontSize = 10, VerticalAlignment = VerticalAlignment.Center,
+ FontFamily = NotaFonts.ValuesFamily, FontSize = 10, VerticalAlignment = VerticalAlignment.Center,
TextAlignment = TextAlignment.Center,
};
// A grid glyph names the control and a chevron says it opens a menu, like the other
diff --git a/src/managed/Nota.App/StereoMapView.cs b/src/managed/Nota.App/StereoMapView.cs
index 40a52d39..f54aaa9b 100644
--- a/src/managed/Nota.App/StereoMapView.cs
+++ b/src/managed/Nota.App/StereoMapView.cs
@@ -254,13 +254,13 @@ public sealed class StereoMapView : Control, IValueEntryHost
{
double x = Math.Round(PanX(p, pan)) + 0.5;
ctx.DrawLine(pan == 0 ? strong : weak, new Point(x, p.Top), new Point(x, p.Bottom));
- DrawText(ctx, label, NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(x, p.Bottom + 6), hCenter: true);
+ DrawText(ctx, label, NotaFonts.Measure, 8, NotaPalette.TextTertiary, new Point(x, p.Bottom + 6), hCenter: true);
}
foreach (var (db, label) in new[] { (20 * Math.Log10(FaderScale.Max), "+3.5"), (0.0, "0 dB"), (-6.0, "−6"), (-12.0, "−12"), (-24.0, "−24") })
{
double y = Math.Round(VolY(p, Math.Pow(10, db / 20))) + 0.5;
ctx.DrawLine(db == 0 ? strong : weak, new Point(p.Left, y), new Point(p.Right, y));
- DrawText(ctx, label, NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(p.Left - 6, y), vCenter: true, rightAlign: true);
+ DrawText(ctx, label, NotaFonts.Measure, 8, NotaPalette.TextTertiary, new Point(p.Left - 6, y), vCenter: true, rightAlign: true);
}
}
@@ -323,7 +323,7 @@ public sealed class StereoMapView : Control, IValueEntryHost
ctx.DrawLine(new Pen(NotaPalette.BorderDefault, 1), new Point(0, y0), new Point(b.Width, y0));
double x = 10;
x += DrawText(ctx, Loc.T("stereo_map.correlation"), NotaFonts.SansBold, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 10;
- x += DrawText(ctx, "−1", NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 6;
+ x += DrawText(ctx, "−1", NotaFonts.Measure, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 6;
var bar = new Rect(x, cy - 3, 180, 6);
ctx.DrawRectangle(NotaPalette.BgSunken, new Pen(NotaPalette.BorderDefault, 1), bar, NotaRadius.FineValue, NotaRadius.FineValue);
double mid = bar.Left + bar.Width / 2;
@@ -334,8 +334,8 @@ public sealed class StereoMapView : Control, IValueEntryHost
ctx.DrawRectangle(fill, null, new Rect(corr < 0 ? mid - w : mid, bar.Top + 1, w, bar.Height - 2));
ctx.DrawLine(new Pen(NotaPalette.BorderStrong, 1), new Point(mid, bar.Top - 2), new Point(mid, bar.Bottom + 2));
x = bar.Right + 6;
- x += DrawText(ctx, "+1", NotaFonts.Sans, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 10;
- DrawText(ctx, Signed(corr, 2), NotaFonts.Sans, 10, corr < PhaseAlarm ? NotaPalette.Danger : NotaPalette.TextSecondary, new Point(x, cy), vCenter: true);
+ x += DrawText(ctx, "+1", NotaFonts.Measure, 8, NotaPalette.TextTertiary, new Point(x, cy), vCenter: true) + 10;
+ DrawText(ctx, Signed(corr, 2), NotaFonts.Measure, 10, corr < PhaseAlarm ? NotaPalette.Danger : NotaPalette.TextSecondary, new Point(x, cy), vCenter: true);
DrawText(ctx, MenuKit.Keys(Loc.T("stereo_map.drag_pan_volume_shift_locks")),
NotaFonts.Sans, 10, NotaPalette.TextTertiary, new Point(b.Width - 10, cy), vCenter: true, rightAlign: true);
}
@@ -391,7 +391,7 @@ public sealed class StereoMapView : Control, IValueEntryHost
foreach (var (k, v, ink) in rows)
{
DrawText(ctx, k, NotaFonts.SansBold, 7, NotaPalette.TextTertiary, new Point(r.Left + Pad, ty + 6), vCenter: true);
- DrawText(ctx, v, NotaFonts.Sans, 9, ink, new Point(r.Left + Pad + 62, ty + 6), vCenter: true);
+ DrawText(ctx, v, NotaFonts.Measure, 9, ink, new Point(r.Left + Pad + 62, ty + 6), vCenter: true);
ty += RowH;
}
for (int i = 0; i < notes.Count; i++)
diff --git a/src/managed/Nota.App/Theme/NotaColourTheme.cs b/src/managed/Nota.App/Theme/NotaColourTheme.cs
index ca422b67..5f6751ad 100644
--- a/src/managed/Nota.App/Theme/NotaColourTheme.cs
+++ b/src/managed/Nota.App/Theme/NotaColourTheme.cs
@@ -69,6 +69,7 @@ internal static class NotaThemes
};
private static IReadOnlyList<NotaColourTheme>? _builtIn;
+ private static Dictionary<string, NotaColourTheme>? _classic;
private static readonly List<string> _loadErrors = new();
private static IReadOnlyList<NotaColourTheme> _user = Array.Empty<NotaColourTheme>();
private static IReadOnlyList<NotaColourTheme>? _all;
@@ -77,7 +78,7 @@ internal static class NotaThemes
private static HashSet<string>? _systemFonts;
/// <summary>Why a built-in theme file was left out, if any was. Logged at startup.</summary>
- public static IReadOnlyList<string> LoadErrors { get { _ = BuiltIn; return _loadErrors; } }
+ public static IReadOnlyList<string> LoadErrors { get { _ = BuiltIn; _ = Classic(""); return _loadErrors; } }
/// <summary>Every built-in theme that loaded and validated, in <see cref="BuiltInOrder"/>.</summary>
public static IReadOnlyList<NotaColourTheme> BuiltIn => _builtIn ??= LoadBuiltIn();
@@ -101,6 +102,28 @@ internal static class NotaThemes
public static bool IsBuiltIn(string id) => BuiltIn.Any(t => t.Id == id);
+ /// <summary>A built-in theme's classic palette (spec 091): 0.59's colours, same id, name and
+ /// kind. Never listed — the Look switch puts it on in place of the built-in. Null for a user
+ /// theme or an id without one.</summary>
+ public static NotaColourTheme? Classic(string id) =>
+ (_classic ??= LoadClassic()).TryGetValue(id, out var t) ? t : null;
+
+ private static Dictionary<string, NotaColourTheme> LoadClassic()
+ {
+ var catalogue = new HashSet<string>(Catalogue);
+ var map = new Dictionary<string, NotaColourTheme>();
+ foreach (var id in BuiltInOrder)
+ {
+ var json = ReadResource($"Classic.{id}");
+ if (json is null) { _loadErrors.Add($"{id}: no classic palette"); continue; }
+ var theme = Parse(json, catalogue, out var error);
+ if (theme is null) { _loadErrors.Add($"{id}: {error}"); continue; }
+ if (theme.Id != id) { _loadErrors.Add($"{id}: file declares id '{theme.Id}'"); continue; }
+ map[id] = theme with { Warnings = Array.Empty<ThemeWarning>() };
+ }
+ return map;
+ }
+
public static IEnumerable<NotaColourTheme> OfKind(NotaThemeKind kind) => All.Where(t => t.Kind == kind);
/// <summary>Studio Dark, the default and the last resort.</summary>
@@ -152,7 +175,7 @@ internal static class NotaThemes
/// <summary>The theme as a file (format 1 or 2), tokens in catalogue order.</summary>
public static string ToFile(NotaColourTheme theme) =>
ThemeFile.Write(new ParsedTheme(theme.Id, theme.Name, theme.IsDark,
- theme.Colors.ToDictionary(kv => kv.Key, kv => kv.Value.ToUInt32()), theme.Geometry, theme.Geometry.IsDefault ? 1 : 2),
+ theme.Colors.ToDictionary(kv => kv.Key, kv => kv.Value.ToUInt32()), theme.Geometry, ThemeFile.FormatFor(theme.Geometry)),
CatalogueList);
/// <summary>Re-read the user themes folder. Never throws; a bad file goes to
diff --git a/src/managed/Nota.App/Theme/NotaFonts.cs b/src/managed/Nota.App/Theme/NotaFonts.cs
index e19b6a6b..58cf59f9 100644
--- a/src/managed/Nota.App/Theme/NotaFonts.cs
+++ b/src/managed/Nota.App/Theme/NotaFonts.cs
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
//
-// One typeface: Geist for every word and every number (style guide, spec 038). Geist's
+// Geist for every word and every number (style guide, spec 038). Geist's
// digits are proportional by default, so the app turns on its tabular figures ("tnum")
// everywhere: TextElement.FontFeatures on every top level for controls, and
// NotaFormattedText for the custom-drawn layer. Digits then all have the same width and
@@ -16,8 +16,16 @@
// A skin may name a system typeface instead (spec 087): NotaSkin coerces controls' Geist to it
// and NotaFormattedText swaps it in when the text is built, so cached Typeface fields follow.
//
-// Geist is bundled (assets/fonts, SIL OFL 1.1). Glyphs it lacks — ■ ▾ ✓ ★ — fall back to
-// the system font per character.
+// Two roles (spec 091): words, and values and readouts — the numbers with their units, tempo,
+// position and counters that 0.59 set in Geist Mono. The values role is Font.Measure in XAML and
+// Measure* here. Under the new look it IS Geist (the same family object, so nothing renders
+// differently and a skin's typeface reaches it as before); under the classic look it is Geist
+// Mono; a skin may name its own (format 3, font.values). NotaThemeService sets it with
+// SetMeasure; read Measure* when the text is built, never into a static readonly field, or a
+// live switch passes the text by.
+//
+// Geist and Geist Mono are bundled (assets/fonts, SIL OFL 1.1). Glyphs they lack — ■ ▾ ✓ ★,
+// and Cyrillic in Geist Mono — fall back to the system font per character.
using System.Globalization;
using Avalonia;
@@ -35,6 +43,50 @@ public static class NotaFonts
public static readonly FontFamily UiFamily = new(UiUri);
+ /// <summary>Geist Mono: the values role under the classic look (spec 091).</summary>
+ public const string MeasureMonoUri = "avares://Nota.App/Assets/Fonts#Geist Mono";
+ public static readonly FontFamily MonoFamily = new(MeasureMonoUri);
+
+ /// <summary>What a code-built control names to take the values role: Geist Mono as written,
+ /// worn by NotaSkin as the look's values face — Geist under New, Geist Mono under Classic, or
+ /// a skin's font.values — and re-worn live on every switch, like a skin's typeface. (A Run is
+ /// not re-worn: give it <see cref="MeasureFamily"/> when it is built.)</summary>
+ public static FontFamily ValuesFamily => MonoFamily;
+
+ private static FontFamily _measure = UiFamily;
+ private static Typeface _measureFace = new(UiFamily),
+ _measureMedium = new(UiFamily, FontStyle.Normal, FontWeight.Medium),
+ _measureBold = new(UiFamily, FontStyle.Normal, FontWeight.Bold);
+
+ /// <summary>The family values and readouts are set in now: Geist (new look), Geist Mono
+ /// (classic) or a skin's values typeface.</summary>
+ public static FontFamily MeasureFamily => _measure;
+ public static Typeface Measure => _measureFace;
+ public static Typeface MeasureMedium => _measureMedium;
+ public static Typeface MeasureBold => _measureBold;
+
+ /// <summary>Changes whenever a typeface text is drawn in changes — the values face (a look
+ /// switch, a skin's font.values) or the words face (a skin's font.family). A view that caches
+ /// a measured text width keys it on this as well as on the Text size step.</summary>
+ public static int FaceStamp { get; private set; }
+
+ /// <summary>Mark the faces changed (NotaSkin calls it when a skin's typeface changes).</summary>
+ internal static void TouchFaces() => FaceStamp++;
+
+ /// <summary>Wear <paramref name="family"/> for values and readouts: the Measure* faces here and
+ /// the Font.Measure resource every values text style reads. Returns whether it changed.</summary>
+ public static bool SetMeasure(FontFamily family)
+ {
+ bool changed = !Equals(family, _measure) && family.ToString() != _measure.ToString();
+ if (changed) FaceStamp++;
+ _measure = family;
+ _measureFace = new Typeface(family);
+ _measureMedium = new Typeface(family, FontStyle.Normal, FontWeight.Medium);
+ _measureBold = new Typeface(family, FontStyle.Normal, FontWeight.Bold);
+ if (Avalonia.Application.Current is { } app) app.Resources["Font.Measure"] = family;
+ return changed;
+ }
+
// Geist 400 · 500 · 600 · 700
public static readonly Typeface Sans = new(UiFamily);
public static readonly Typeface SansMedium = new(UiFamily, FontStyle.Normal, FontWeight.Medium);
diff --git a/src/managed/Nota.App/Theme/NotaSkin.cs b/src/managed/Nota.App/Theme/NotaSkin.cs
index 2b63dd9e..fdeff32d 100644
--- a/src/managed/Nota.App/Theme/NotaSkin.cs
+++ b/src/managed/Nota.App/Theme/NotaSkin.cs
@@ -14,6 +14,10 @@
// the base value (GetBaseValue) whenever that changes and on every skin change, and cleared
// again — by a flag, never touching anyone else's animation — when it matches the base. The custom-drawn layer takes the
// same skin from NotaRadius.*Value and NotaFormattedText, which it reads at render time.
+//
+// The values role rides on the same overlay (spec 091): a control written with Geist Mono
+// (NotaFonts.ValuesFamily) wears the look's values face — Geist under the new look, Geist Mono
+// under the classic one, or a skin's font.values — so a look switch re-wears it like a skin.
using System;
using System.Collections.Generic;
@@ -36,6 +40,7 @@ internal static class NotaSkin
{
private static SkinGeometry _geometry = SkinGeometry.Default;
private static FontFamily? _family;
+ private static bool _ownValues; // the skin names its own values face (font.values), installed
private static bool _installed;
/// <summary>The worn skin's typeface and radii.</summary>
@@ -53,13 +58,32 @@ internal static class NotaSkin
public static CornerRadius Map(CornerRadius r) => _geometry.IsDefault ? r
: new CornerRadius(MapRadius(r.TopLeft), MapRadius(r.TopRight), MapRadius(r.BottomRight), MapRadius(r.BottomLeft));
- /// <summary>Geist (by URI, by name, or as the app's default family) becomes the skin's typeface.</summary>
- public static FontFamily MapFamily(FontFamily family) =>
- _family is not null && IsGeist(family) ? _family : family;
+ /// <summary>The values role (written as Geist Mono, spec 091) becomes the look's values face;
+ /// then Geist (by URI, by name, or as the app's default family) becomes the skin's typeface.</summary>
+ public static FontFamily MapFamily(FontFamily family)
+ {
+ if (IsValues(family)) family = NotaFonts.MeasureFamily;
+ // A values face the skin chose itself stays, even when it is Geist and the skin's words
+ // face is something else.
+ if (_ownValues && ReferenceEquals(family, NotaFonts.MeasureFamily)) return family;
+ return _family is not null && IsGeist(family) ? _family : family;
+ }
+
+ /// <summary>The same for a typeface, same weight and style — for NotaFormattedText.</summary>
+ public static Typeface Map(Typeface face)
+ {
+ var family = MapFamily(face.FontFamily);
+ return ReferenceEquals(family, face.FontFamily) ? face : new Typeface(family, face.Style, face.Weight, face.Stretch);
+ }
- /// <summary>A Geist typeface in the skin's family, same weight and style — for NotaFormattedText.</summary>
- public static Typeface Map(Typeface face) =>
- _family is not null && IsGeist(face.FontFamily) ? new Typeface(_family, face.Style, face.Weight, face.Stretch) : face;
+ // The values role as written: Geist Mono, by URI or by name.
+ private static bool IsValues(FontFamily? f)
+ {
+ if (f is null) return false;
+ if (ReferenceEquals(f, NotaFonts.MonoFamily)) return true;
+ var first = f.FamilyNames.Count > 0 ? f.FamilyNames[0] : f.Name;
+ return first == NotaFonts.MonoFamily.Name;
+ }
// Geist by any of its names: Font.UI, the app's default family, and Fluent's own default
// ("fonts:Inter#Inter, $Default"), which the window templates carry. Nota ships no Inter,
@@ -166,8 +190,12 @@ internal static class NotaSkin
{
var family = geometry.FontFamily is { } name && NotaThemes.IsFontInstalled(name) ? new FontFamily(name) : null;
bool changed = !_geometry.Equals(geometry) || _family?.Name != family?.Name;
+ bool ownValues = geometry.ValuesFamily is { } values && NotaThemes.IsFontInstalled(values);
+ changed |= ownValues != _ownValues;
+ if (_family?.Name != family?.Name || ownValues != _ownValues) NotaFonts.TouchFaces();
_geometry = geometry;
_family = family;
+ _ownValues = ownValues;
return changed;
}
diff --git a/src/managed/Nota.App/Theme/NotaTheme.axaml b/src/managed/Nota.App/Theme/NotaTheme.axaml
index 716c6b65..31894b9d 100644
--- a/src/managed/Nota.App/Theme/NotaTheme.axaml
+++ b/src/managed/Nota.App/Theme/NotaTheme.axaml
@@ -16,6 +16,9 @@
(NotaFonts.InstallTabular). Bundled from assets/fonts (SIL OFL 1.1); mirrored by
Theme/NotaFonts.cs. -->
<FontFamily x:Key="Font.UI">avares://Nota.App/Assets/Fonts#Geist</FontFamily>
+ <!-- Values and readouts (spec 091): Geist, the same face, under the new look; NotaThemeService
+ sets Geist Mono under the classic look, or a skin's font.values, over this default. -->
+ <FontFamily x:Key="Font.Measure">avares://Nota.App/Assets/Fonts#Geist</FontFamily>
<!-- ===== Geometry ========================================================
Mirrored in Theme/NotaGeometry.cs for code-built views; the smoke test
@@ -130,7 +133,7 @@
VerticalAlignment="Center" HorizontalAlignment="Right"/>
<TextBlock Name="PART_InputGestureText" Grid.Column="3"
Text="{Binding InputGesture, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static app:MenuGestureConverter.Instance}}"
- FontFamily="{StaticResource Font.UI}" FontSize="10"
+ FontFamily="{DynamicResource Font.Measure}" FontSize="10"
Foreground="{DynamicResource Brush.TextMuted}"
Margin="16,0,0,0"
VerticalAlignment="Center" HorizontalAlignment="Right"/>
@@ -1019,22 +1022,27 @@
<Setter Property="LineHeight" Value="13"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextTertiary}"/>
</Style>
- <Style Selector="TextBlock.Mono"> <!-- kept for older markup: numbers are Geist like everything else -->
- <Setter Property="FontFamily" Value="{StaticResource Font.UI}"/>
+ <Style Selector="TextBlock.Mono"> <!-- the values role, family only (spec 091) -->
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
</Style>
<Style Selector="TextBlock.Readout"> <!-- toolbar values: 16 / 500 -->
- <Setter Property="FontFamily" Value="{StaticResource Font.UI}"/>
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
<Setter Property="FontSize" Value="16"/>
<Setter Property="FontWeight" Value="Medium"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextPrimary}"/>
</Style>
<Style Selector="TextBlock.Value"> <!-- a number on a button or in a row: 10.5 / 400 -->
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
+ <Setter Property="FontSize" Value="10.5"/>
+ <Setter Property="Foreground" Value="{DynamicResource Brush.TextSecondary}"/>
+ </Style>
+ <Style Selector="TextBlock.Number"> <!-- a number added after 0.59: Geist in both looks (spec 091) -->
<Setter Property="FontFamily" Value="{StaticResource Font.UI}"/>
<Setter Property="FontSize" Value="10.5"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextSecondary}"/>
</Style>
<Style Selector="TextBlock.Eyebrow"> <!-- format badge: 9.5 / 400, muted, as written -->
- <Setter Property="FontFamily" Value="{StaticResource Font.UI}"/>
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
<Setter Property="FontSize" Value="9.5"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextMuted}"/>
@@ -1060,11 +1068,13 @@
<Setter Property="Foreground" Value="{DynamicResource Brush.TextTertiary}"/>
</Style>
<Style Selector="TextBlock.KnobValue"> <!-- parameter value: 10 / 400, ink 1 -->
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
<Setter Property="FontSize" Value="10"/>
<Setter Property="LineHeight" Value="13"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextPrimary}"/>
</Style>
<Style Selector="TextBlock.Axis"> <!-- tick label inside a graph: 10, ink 4 -->
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
<Setter Property="FontSize" Value="10"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextAxis}"/>
</Style>
@@ -1223,7 +1233,7 @@
</Style>
<!-- Row metadata on the right: the label scale, 11 / 400 in ink 3. -->
<Style Selector="TextBlock.RowTag">
- <Setter Property="FontFamily" Value="{StaticResource Font.UI}"/>
+ <Setter Property="FontFamily" Value="{DynamicResource Font.Measure}"/>
<Setter Property="FontSize" Value="10"/>
<Setter Property="Foreground" Value="{DynamicResource Brush.TextTertiary}"/>
</Style>
diff --git a/src/managed/Nota.App/Theme/NotaThemeService.cs b/src/managed/Nota.App/Theme/NotaThemeService.cs
index f4726419..5a497b36 100644
--- a/src/managed/Nota.App/Theme/NotaThemeService.cs
+++ b/src/managed/Nota.App/Theme/NotaThemeService.cs
@@ -23,6 +23,11 @@
// change re-coerces every window. User themes join the list from the themes folder; a reload
// re-wears the active one. A try-on (MCP) is worn without being stored, and RenderScoped
// wears a theme for the length of one call — the skin previews — and puts the live one back.
+//
+// Every theme is worn in a look (spec 091): New, or Classic — a built-in's classic palette in its
+// place, 0.59's corners and Geist Mono for values. ApplyActive composes theme × look × skin in
+// one place (Looks.Compose: the skin wins wherever it sets something). Nota Remote keeps the new
+// look: Worn() stays look-free, and the theme cards ask WornForCard().
using System;
using System.Collections.Generic;
@@ -34,6 +39,7 @@ using Avalonia.Media;
using Avalonia.Styling;
using Avalonia.VisualTree;
using Nota.Application;
+using Nota.Application.Themes;
namespace Nota.App;
@@ -44,6 +50,8 @@ internal static class NotaThemeService
private static AppearanceChoice _choice = new(false, Appearance.StudioDark, Appearance.StudioDark, Appearance.StudioLight);
private static AccentChoice _accent = AccentChoice.Default;
+ private static Look _look = Look.New;
+ private static Look? _wornLook;
private static NotaColourTheme? _tryOn;
/// <summary>The appearance being followed.</summary>
@@ -52,6 +60,9 @@ internal static class NotaThemeService
/// <summary>The accent every theme is worn with.</summary>
public static AccentChoice Accent => _accent;
+ /// <summary>The look every theme is worn in (spec 091).</summary>
+ public static Look Look => _look;
+
/// <summary>Raised after a theme or accent change has been applied and repainted.</summary>
public static event Action? Changed;
@@ -59,6 +70,33 @@ internal static class NotaThemeService
/// cards and Nota Remote, so they show what the window would wear.</summary>
public static NotaColourTheme Worn(NotaColourTheme theme) => NotaAccent.Wear(theme, _accent);
+ /// <summary><paramref name="theme"/> as a theme card shows it: in the worn look's colours
+ /// (a built-in's classic palette under Classic) and the user's accent.</summary>
+ public static NotaColourTheme WornForCard(NotaColourTheme theme) => Worn(InLook(theme, _look));
+
+ /// <summary>A built-in theme's colours in <paramref name="look"/>: under Classic its classic
+ /// palette; a user theme (and a try-on) keeps its own colours.</summary>
+ public static NotaColourTheme InLook(NotaColourTheme theme, Look look) =>
+ look == Look.Classic && theme.Source == ThemeSource.BuiltIn && NotaThemes.Classic(theme.Id) is { } classic
+ ? classic : theme;
+
+ /// <summary>The geometry and values typeface <paramref name="theme"/> is worn with in <paramref name="look"/>.</summary>
+ private static (SkinGeometry Geometry, FontFamily Values) WearOf(NotaColourTheme theme, Look look)
+ {
+ var g = Looks.Compose(theme.Geometry, look);
+ var values = g.ValuesFamily is { } name && NotaThemes.IsFontInstalled(name) ? new FontFamily(name)
+ : look == Look.Classic ? NotaFonts.MonoFamily : NotaFonts.UiFamily;
+ return (g, values);
+ }
+
+ /// <summary>Wear a new look in whichever theme is active. Live; saving is the caller's.</summary>
+ public static void SetLook(Look look)
+ {
+ if (look == _look) return;
+ _look = look;
+ ApplyActive();
+ }
+
/// <summary>Wear a new accent in whichever theme is active. Live; saving is the caller's.</summary>
public static void SetAccent(AccentChoice accent)
{
@@ -102,19 +140,23 @@ internal static class NotaThemeService
/// length of <paramref name="render"/>, then put the live theme back — all inside the caller's
/// UI-thread job, so the compositor never sends a frame of it to the screen. Live windows are
/// neither repainted nor re-coerced; <paramref name="render"/> re-coerces its own trees.</summary>
- public static void RenderScoped(NotaColourTheme theme, bool themeAccent, Action render)
+ public static void RenderScoped(NotaColourTheme theme, bool themeAccent, Action render, Look? look = null)
{
var app = Avalonia.Application.Current;
if (app is null) { render(); return; }
var live = NotaPalette.Theme;
var liveGeometry = NotaSkin.Geometry;
- var scoped = themeAccent ? theme : Worn(theme);
+ var liveValues = NotaFonts.MeasureFamily;
+ var inLook = InLook(theme, look ?? _look);
+ var scoped = themeAccent ? inLook : Worn(inLook);
+ var (geometry, values) = WearOf(theme, look ?? _look);
InScope = true;
try
{
NotaPalette.Apply(scoped);
ApplyResources(app, scoped);
- NotaSkin.Set(scoped.Geometry);
+ NotaSkin.Set(geometry);
+ NotaFonts.SetMeasure(values);
render();
}
finally
@@ -126,15 +168,28 @@ internal static class NotaThemeService
}
// Resource changes inside the scope make live controls re-evaluate their typeface and
// radii against the scoped skin; give every live window its own skin back.
+ NotaFonts.SetMeasure(liveValues);
if (NotaSkin.Set(liveGeometry)) NotaSkin.Reapply();
InScope = false;
}
}
+ /// <summary><see cref="RenderScoped(NotaColourTheme, bool, Action, Look?)"/> in a named look (null: the worn one).</summary>
+ public static void RenderScoped(NotaColourTheme theme, bool themeAccent, Look? look, Action render) =>
+ RenderScoped(theme, themeAccent, render, look);
+
/// <summary>True while <see cref="RenderScoped"/> wears a theme for a picture: views built
/// then must not reload or re-wear themes (that would put the live theme back mid-picture).</summary>
public static bool InScope { get; private set; }
+ /// <summary>Wear <paramref name="choice"/> in <paramref name="look"/> and keep following it — at
+ /// startup, before the first window, so the first frame is already in the stored look.</summary>
+ public static void Start(AppearanceChoice choice, Look look)
+ {
+ _look = look;
+ Set(choice);
+ }
+
/// <summary>Wear <paramref name="choice"/> and keep following it. Safe to call repeatedly.</summary>
public static void Set(AppearanceChoice choice)
{
@@ -172,17 +227,24 @@ internal static class NotaThemeService
if (app is null) return;
// With no OS signal Avalonia reports Light, which is the spec's fallback too.
bool osDark = app.ActualThemeVariant == ThemeVariant.Dark;
- var theme = _tryOn is not null ? Worn(_tryOn) : Worn(NotaThemes.Find(_choice.Active(osDark)) ?? FallbackFor(osDark));
+ var picked = _tryOn ?? NotaThemes.Find(_choice.Active(osDark)) ?? FallbackFor(osDark);
+ var theme = Worn(InLook(picked, _look));
if (!_choice.FollowSystem || _tryOn is not null)
app.RequestedThemeVariant = theme.IsDark ? ThemeVariant.Dark : ThemeVariant.Light;
else
app.RequestedThemeVariant = ThemeVariant.Default;
- if (ReferenceEquals(NotaPalette.Theme, theme)) return;
+ // A user skin keeps its colours in either look, so the same theme object can need a new
+ // geometry and values typeface: compare the look too.
+ if (ReferenceEquals(NotaPalette.Theme, theme) && _wornLook == _look) return;
+ _wornLook = _look;
NotaPalette.Apply(theme);
ApplyResources(app, theme);
- if (NotaSkin.Set(theme.Geometry)) NotaSkin.Reapply();
+ var (geometry, values) = WearOf(picked, _look);
+ bool reshaped = NotaSkin.Set(geometry);
+ reshaped |= NotaFonts.SetMeasure(values);
+ if (reshaped) NotaSkin.Reapply();
RepaintEverything();
Changed?.Invoke();
}
diff --git a/src/managed/Nota.App/Theme/Themes/Classic/ember-graphite.json b/src/managed/Nota.App/Theme/Themes/Classic/ember-graphite.json
new file mode 100644
index 00000000..efe6486e
--- /dev/null
+++ b/src/managed/Nota.App/Theme/Themes/Classic/ember-graphite.json
@@ -0,0 +1,130 @@
+{
+ "formatVersion": 1,
+ "id": "ember-graphite",
+ "name": "Ember Graphite",
+ "kind": "dark",
+ "colors": {
+ "SurfaceAbyss": "#0A0908",
+ "BgApp": "#0B0A09",
+ "Gutter": "#0C0B09",
+ "BgSunken": "#100F0D",
+ "CanvasBg": "#121110",
+ "SurfaceDeep": "#131210",
+ "LaneB": "#131210",
+ "Panel": "#141310",
+ "SurfaceCard": "#171613",
+ "SurfaceInset": "#1A1815",
+ "SurfaceRaised": "#1C1A16",
+ "SurfaceHover": "#252219",
+ "TrackOff": "#26231E",
+ "SurfaceActive": "#100F0D",
+ "GridSubBeat": "#191712",
+ "GridBeat": "#1E1C18",
+ "GridRow": "#141311",
+ "GridBar": "#2A2721",
+ "GraphBorder": "#221F1A",
+ "WellGrid": "#232019",
+ "PadGrid": "#1C1A16",
+ "TextHeading": "#F2EDE1",
+ "TextPrimary": "#E9E4D8",
+ "TextStrong": "#C7C0B0",
+ "TextSecondary": "#A39D8F",
+ "TextMuted": "#8F897C",
+ "TextTertiary": "#716D60",
+ "TextDisabled": "#646054",
+ "TextAxis": "#65614F",
+ "TextOnAccent": "#171613",
+ "TextFaint": "#646054",
+ "VizInk": "#D8D3C8",
+ "VizGrid": "#232019",
+ "BorderDefault": "#2C2923",
+ "BorderStrong": "#3A362D",
+ "BorderBrass": "#6B5326",
+ "Seam": "#0C0B09",
+ "Rule": "#3A362D",
+ "Accent": "#D8A03D",
+ "AccentBright": "#F0C060",
+ "AccentHover": "#E9BE6A",
+ "AccentDeep": "#B08536",
+ "AccentDim": "#8A6B2E",
+ "AccentEdge": "#5E4A22",
+ "AccentMute": "#7A6130",
+ "AccentPale": "#FCE5B8",
+ "AccentSubtle": "#241F17",
+ "Record": "#BE563E",
+ "RecordInk": "#FFFFFF",
+ "Success": "#58B368",
+ "SuccessInk": "#171613",
+ "SuccessDim": "#7FB069",
+ "Warning": "#D9C34C",
+ "Mute": "#D9C34C",
+ "Solo": "#6D8FB5",
+ "Danger": "#C2554A",
+ "DangerHover": "#D0685C",
+ "DangerBright": "#E08A72",
+ "DangerDeep": "#A8453B",
+ "DangerPale": "#F0928A",
+ "Teal": "#5B9E9C",
+ "TealBright": "#7FC0BE",
+ "Rose": "#B57286",
+ "RoseBright": "#D79BAB",
+ "Steel": "#6D8FB5",
+ "Sage": "#6FA383",
+ "Threshold": "#C9884F",
+ "Marker": "#7FCCE1",
+ "MarkerHot": "#CDEEF8",
+ "Frozen": "#7FC7EC",
+ "SignalIn": "#52604F",
+ "SignalInFill": "#3E4A3C",
+ "HandleSel": "#FFFFFF",
+ "SelHeaderBg": "#241F17",
+ "FrozenHeaderBg": "#1B2A33",
+ "MuteTint": "#3A2320",
+ "Veil": "#121418",
+ "TooltipBg": "#18181E",
+ "TooltipText": "#F0E4C8",
+ "KeyWhite": "#1C1A16",
+ "KeyBlack": "#0E0D0B",
+ "MiniKeyWhite": "#2A2721",
+ "MiniKeyBlack": "#151310",
+ "ShadeUp": "#FFFFFF",
+ "ShadeDown": "#141210",
+ "Well": "#1C1A16",
+ "WellTrack": "#1A1815",
+ "KnobTrack": "#3A362D",
+ "Groove": "#100F0D",
+ "DeviceSection": "#171613",
+ "DeviceSectionEdge": "#00000000",
+ "DeviceHeader": "#141310",
+ "Bevel": "#08FFFFFF",
+ "AccentSoft": "#241F17",
+ "KnobCap": "#1C1A16",
+ "MeterSafe": "#58B368",
+ "MeterHot": "#D9C34C",
+ "MeterOver": "#C2554A",
+ "TrackHeaderSelected": "#241F17",
+ "LaneSelected": "#131210",
+ "Master": "#8D8779",
+ "Track1": "#58B368",
+ "Track2": "#4E9E7A",
+ "Track3": "#3E8E8E",
+ "Track4": "#5AA0B8",
+ "Track5": "#C77F55",
+ "Track6": "#7A6FB0",
+ "Track7": "#B05A7A",
+ "Track8": "#9AA64A",
+ "Track9": "#7FA88E",
+ "ReturnA": "#7FA88E",
+ "ReturnB": "#6B907B",
+ "SystemAccent": "#D8A03D",
+ "SystemAccentLight1": "#DDAB54",
+ "SystemAccentLight2": "#E1B76C",
+ "SystemAccentLight3": "#E6C283",
+ "SystemAccentDark1": "#C29037",
+ "SystemAccentDark2": "#AD8031",
+ "SystemAccentDark3": "#97702B",
+ "ShadowBevel": "#08FFFFFF",
+ "ShadowPopover": "#6B000000",
+ "ShadowModal": "#80000000"
+ }
+}
diff --git a/src/managed/Nota.App/Theme/Themes/Classic/ember-paper.json b/src/managed/Nota.App/Theme/Themes/Classic/ember-paper.json
new file mode 100644
index 00000000..231ac322
--- /dev/null
+++ b/src/managed/Nota.App/Theme/Themes/Classic/ember-paper.json
@@ -0,0 +1,130 @@
+{
+ "formatVersion": 1,
+ "id": "ember-paper",
+ "name": "Ember Paper",
+ "kind": "light",
+ "colors": {
+ "SurfaceAbyss": "#D8D1BE",
+ "BgApp": "#DCD6C5",
+ "Gutter": "#E0DAC9",
+ "BgSunken": "#E4DFD1",
+ "CanvasBg": "#E6E1D3",
+ "SurfaceDeep": "#E7E2D4",
+ "LaneB": "#E7E2D4",
+ "Panel": "#EAE5D7",
+ "SurfaceCard": "#EFEADE",
+ "SurfaceInset": "#E9E4D6",
+ "SurfaceRaised": "#F8F5EC",
+ "SurfaceHover": "#E7E1D0",
+ "TrackOff": "#DBD4C0",
+ "SurfaceActive": "#D5CEBB",
+ "GridSubBeat": "#E5DFCE",
+ "GridBeat": "#DED8C8",
+ "GridRow": "#E6E1D2",
+ "GridBar": "#CFC8B4",
+ "GraphBorder": "#D5CFBE",
+ "WellGrid": "#DDD7C6",
+ "PadGrid": "#DED8C7",
+ "TextHeading": "#1A150E",
+ "TextPrimary": "#241F17",
+ "TextStrong": "#3E382C",
+ "TextSecondary": "#5E5849",
+ "TextMuted": "#625B50",
+ "TextTertiary": "#7E786C",
+ "TextDisabled": "#8D866F",
+ "TextAxis": "#8D8669",
+ "TextOnAccent": "#FFFBF2",
+ "TextFaint": "#8D866F",
+ "VizInk": "#332E26",
+ "VizGrid": "#DDD7C6",
+ "BorderDefault": "#D5CEBB",
+ "BorderStrong": "#BDB5A0",
+ "BorderBrass": "#C9A254",
+ "Seam": "#E0DAC9",
+ "Rule": "#BDB5A0",
+ "Accent": "#AD7716",
+ "AccentBright": "#744D07",
+ "AccentHover": "#8F6110",
+ "AccentDeep": "#7A5008",
+ "AccentDim": "#9C8034",
+ "AccentEdge": "#D3B173",
+ "AccentMute": "#C39B4F",
+ "AccentPale": "#5C3C04",
+ "AccentSubtle": "#F2E4C4",
+ "Record": "#B54A32",
+ "RecordInk": "#FFF4EE",
+ "Success": "#2C7A3E",
+ "SuccessInk": "#FFFBF2",
+ "SuccessDim": "#609548",
+ "Warning": "#837010",
+ "Mute": "#837010",
+ "Solo": "#3E6288",
+ "Danger": "#B13E33",
+ "DangerHover": "#C64A36",
+ "DangerBright": "#A3391B",
+ "DangerDeep": "#9C3221",
+ "DangerPale": "#8E2416",
+ "Teal": "#2F7472",
+ "TealBright": "#3E8A88",
+ "Rose": "#86465B",
+ "RoseBright": "#7F2D43",
+ "Steel": "#3E6288",
+ "Sage": "#42765A",
+ "Threshold": "#8A5218",
+ "Marker": "#1B6E8C",
+ "MarkerHot": "#0E5470",
+ "Frozen": "#1C6E96",
+ "SignalIn": "#6E7C68",
+ "SignalInFill": "#D3DCCF",
+ "HandleSel": "#1E1A14",
+ "SelHeaderBg": "#F2E4C4",
+ "FrozenHeaderBg": "#D8E8F0",
+ "MuteTint": "#F0D9D3",
+ "Veil": "#F2EFE6",
+ "TooltipBg": "#2A251C",
+ "TooltipText": "#F5EEDC",
+ "KeyWhite": "#F3EFE4",
+ "KeyBlack": "#DAD3C2",
+ "MiniKeyWhite": "#F5F1E4",
+ "MiniKeyBlack": "#38332A",
+ "ShadeUp": "#FFFCF2",
+ "ShadeDown": "#3A3227",
+ "Well": "#F8F5EC",
+ "WellTrack": "#E9E4D6",
+ "KnobTrack": "#BDB5A0",
+ "Groove": "#E4DFD1",
+ "DeviceSection": "#EFEADE",
+ "DeviceSectionEdge": "#00000000",
+ "DeviceHeader": "#EAE5D7",
+ "Bevel": "#66FFFFFF",
+ "AccentSoft": "#F2E4C4",
+ "KnobCap": "#F8F5EC",
+ "MeterSafe": "#2C7A3E",
+ "MeterHot": "#837010",
+ "MeterOver": "#B13E33",
+ "TrackHeaderSelected": "#F2E4C4",
+ "LaneSelected": "#E7E2D4",
+ "Master": "#746D5C",
+ "Track1": "#328140",
+ "Track2": "#306F53",
+ "Track3": "#256464",
+ "Track4": "#317187",
+ "Track5": "#985127",
+ "Track6": "#4B4082",
+ "Track7": "#7F3450",
+ "Track8": "#6C752C",
+ "Track9": "#598C69",
+ "ReturnA": "#598C69",
+ "ReturnB": "#3E6A4D",
+ "SystemAccent": "#AD7716",
+ "SystemAccentLight1": "#B78732",
+ "SystemAccentLight2": "#C1984E",
+ "SystemAccentLight3": "#CBA86A",
+ "SystemAccentDark1": "#9C6B14",
+ "SystemAccentDark2": "#8A5F12",
+ "SystemAccentDark3": "#79530F",
+ "ShadowBevel": "#66FFFFFF",
+ "ShadowPopover": "#381A150E",
+ "ShadowModal": "#401A150E"
+ }
+}
diff --git a/src/managed/Nota.App/Theme/Themes/Classic/studio-dark.json b/src/managed/Nota.App/Theme/Themes/Classic/studio-dark.json
new file mode 100644
index 00000000..027ce5a1
--- /dev/null
+++ b/src/managed/Nota.App/Theme/Themes/Classic/studio-dark.json
@@ -0,0 +1,130 @@
+{
+ "formatVersion": 1,
+ "id": "studio-dark",
+ "name": "Studio Dark",
+ "kind": "dark",
+ "colors": {
+ "SurfaceAbyss": "#17181A",
+ "BgApp": "#1E1F22",
+ "Gutter": "#141517",
+ "BgSunken": "#17181A",
+ "CanvasBg": "#1E1F22",
+ "SurfaceDeep": "#1B1C1F",
+ "LaneB": "#222326",
+ "Panel": "#2B2D31",
+ "SurfaceCard": "#2B2D31",
+ "SurfaceInset": "#232427",
+ "SurfaceRaised": "#34363B",
+ "SurfaceHover": "#393C41",
+ "TrackOff": "#17181A",
+ "SurfaceActive": "#17181A",
+ "GridSubBeat": "#242528",
+ "GridBeat": "#2A2C30",
+ "GridRow": "#1B1C1F",
+ "GridBar": "#3A3C41",
+ "GraphBorder": "#45484E",
+ "WellGrid": "#2E2F32",
+ "PadGrid": "#2A2C30",
+ "TextHeading": "#F4F5F6",
+ "TextPrimary": "#E8E9EB",
+ "TextStrong": "#D4D6DA",
+ "TextSecondary": "#C0C4C9",
+ "TextMuted": "#A4A9B0",
+ "TextTertiary": "#92969D",
+ "TextDisabled": "#82868C",
+ "TextAxis": "#82868C",
+ "TextOnAccent": "#17181A",
+ "TextFaint": "#82868C",
+ "VizInk": "#D7D8DA",
+ "VizGrid": "#2E2F32",
+ "BorderDefault": "#141517",
+ "BorderStrong": "#45484E",
+ "BorderBrass": "#BF7D22",
+ "Seam": "#141517",
+ "Rule": "#45484E",
+ "Accent": "#FF9F1C",
+ "AccentBright": "#FFB547",
+ "AccentHover": "#FFB547",
+ "AccentDeep": "#C77612",
+ "AccentDim": "#C77612",
+ "AccentEdge": "#BF7D22",
+ "AccentMute": "#7A5F3D",
+ "AccentPale": "#FFD08A",
+ "AccentSubtle": "#4D3F2E",
+ "Record": "#F06A6E",
+ "RecordInk": "#17181A",
+ "Success": "#6CC673",
+ "SuccessInk": "#17181A",
+ "SuccessDim": "#3F8A45",
+ "Warning": "#F2B53C",
+ "Mute": "#F2B53C",
+ "Solo": "#6A9FD8",
+ "Danger": "#F06A6E",
+ "DangerHover": "#F48386",
+ "DangerBright": "#F58F92",
+ "DangerDeep": "#C4474B",
+ "DangerPale": "#F7A5A7",
+ "Teal": "#5FB3A8",
+ "TealBright": "#86C9C0",
+ "Rose": "#D77A8F",
+ "RoseBright": "#E49EAE",
+ "Steel": "#6A9FD8",
+ "Sage": "#7FB08A",
+ "Threshold": "#E0A84A",
+ "Marker": "#7FC4E0",
+ "MarkerHot": "#CDEEF8",
+ "Frozen": "#7FC7EC",
+ "SignalIn": "#5A6170",
+ "SignalInFill": "#3A3E46",
+ "HandleSel": "#FFFFFF",
+ "SelHeaderBg": "#393C41",
+ "FrozenHeaderBg": "#24323B",
+ "MuteTint": "#3B3426",
+ "Veil": "#1E1F22",
+ "TooltipBg": "#34363B",
+ "TooltipText": "#E8E9EB",
+ "KeyWhite": "#2B2D31",
+ "KeyBlack": "#17181A",
+ "MiniKeyWhite": "#3A3C41",
+ "MiniKeyBlack": "#17181A",
+ "ShadeUp": "#FFFFFF",
+ "ShadeDown": "#17181A",
+ "Well": "#34363B",
+ "WellTrack": "#232427",
+ "KnobTrack": "#45484E",
+ "Groove": "#17181A",
+ "DeviceSection": "#2B2D31",
+ "DeviceSectionEdge": "#00000000",
+ "DeviceHeader": "#2B2D31",
+ "Bevel": "#12FFFFFF",
+ "AccentSoft": "#4D3F2E",
+ "KnobCap": "#34363B",
+ "MeterSafe": "#6CC673",
+ "MeterHot": "#F2B53C",
+ "MeterOver": "#F06A6E",
+ "TrackHeaderSelected": "#393C41",
+ "LaneSelected": "#222326",
+ "Master": "#A4A9B0",
+ "Track1": "#7FB87A",
+ "Track2": "#5FB3A8",
+ "Track3": "#5AA6C4",
+ "Track4": "#6A9FD8",
+ "Track5": "#E0A84A",
+ "Track6": "#9D90C9",
+ "Track7": "#D77A8F",
+ "Track8": "#B3B45E",
+ "Track9": "#8E9DB0",
+ "ReturnA": "#8E9DB0",
+ "ReturnB": "#7A889A",
+ "SystemAccent": "#FF9F1C",
+ "SystemAccentLight1": "#FFAB37",
+ "SystemAccentLight2": "#FFB652",
+ "SystemAccentLight3": "#FFC26E",
+ "SystemAccentDark1": "#E68F19",
+ "SystemAccentDark2": "#CC7F16",
+ "SystemAccentDark3": "#B26F14",
+ "ShadowBevel": "#12FFFFFF",
+ "ShadowPopover": "#6B000000",
+ "ShadowModal": "#80000000"
+ }
+}
diff --git a/src/managed/Nota.App/Theme/Themes/Classic/studio-light.json b/src/managed/Nota.App/Theme/Themes/Classic/studio-light.json
new file mode 100644
index 00000000..5e8c2e1a
--- /dev/null
+++ b/src/managed/Nota.App/Theme/Themes/Classic/studio-light.json
@@ -0,0 +1,130 @@
+{
+ "formatVersion": 1,
+ "id": "studio-light",
+ "name": "Studio Light",
+ "kind": "light",
+ "colors": {
+ "SurfaceAbyss": "#D6D8DB",
+ "BgApp": "#C9CBCF",
+ "Gutter": "#9DA0A6",
+ "BgSunken": "#D6D8DB",
+ "CanvasBg": "#C9CBCF",
+ "SurfaceDeep": "#CFD1D4",
+ "LaneB": "#C4C6CA",
+ "Panel": "#E4E5E7",
+ "SurfaceCard": "#E4E5E7",
+ "SurfaceInset": "#DCDEE0",
+ "SurfaceRaised": "#EEEFF1",
+ "SurfaceHover": "#F7F8F9",
+ "TrackOff": "#D6D8DB",
+ "SurfaceActive": "#D6D8DB",
+ "GridSubBeat": "#C3C5C9",
+ "GridBeat": "#BDC0C4",
+ "GridRow": "#C5C7CB",
+ "GridBar": "#ADB0B5",
+ "GraphBorder": "#B3B6BB",
+ "WellGrid": "#C0C3C6",
+ "PadGrid": "#C8CACD",
+ "TextHeading": "#0E0F11",
+ "TextPrimary": "#16171A",
+ "TextStrong": "#282A2E",
+ "TextSecondary": "#3A3D42",
+ "TextMuted": "#4F535A",
+ "TextTertiary": "#65696F",
+ "TextDisabled": "#797C81",
+ "TextAxis": "#797C81",
+ "TextOnAccent": "#17181A",
+ "TextFaint": "#797C81",
+ "VizInk": "#252629",
+ "VizGrid": "#C0C3C6",
+ "BorderDefault": "#9DA0A6",
+ "BorderStrong": "#B3B6BB",
+ "BorderBrass": "#ECA54E",
+ "Seam": "#9DA0A6",
+ "Rule": "#B3B6BB",
+ "Accent": "#EF8A0C",
+ "AccentBright": "#C46A00",
+ "AccentHover": "#C46A00",
+ "AccentDeep": "#D47800",
+ "AccentDim": "#F7C27A",
+ "AccentEdge": "#ECA54E",
+ "AccentMute": "#C9A77A",
+ "AccentPale": "#8A4A00",
+ "AccentSubtle": "#E6D6C4",
+ "Record": "#B3262C",
+ "RecordInk": "#FFFFFF",
+ "Success": "#22692B",
+ "SuccessInk": "#FFFFFF",
+ "SuccessDim": "#79B880",
+ "Warning": "#7A4F00",
+ "Mute": "#7A4F00",
+ "Solo": "#3F78B8",
+ "Danger": "#B3262C",
+ "DangerHover": "#C2343A",
+ "DangerBright": "#9C1F24",
+ "DangerDeep": "#8E1C21",
+ "DangerPale": "#7F161B",
+ "Teal": "#3A8A7F",
+ "TealBright": "#2E7067",
+ "Rose": "#B4566B",
+ "RoseBright": "#93404F",
+ "Steel": "#3F78B8",
+ "Sage": "#4A7F56",
+ "Threshold": "#8A5F14",
+ "Marker": "#1B6E8C",
+ "MarkerHot": "#0E5470",
+ "Frozen": "#1C6E96",
+ "SignalIn": "#7A818C",
+ "SignalInFill": "#C9CDD3",
+ "HandleSel": "#16171A",
+ "SelHeaderBg": "#F7F8F9",
+ "FrozenHeaderBg": "#D3E2EA",
+ "MuteTint": "#BDB49F",
+ "Veil": "#E4E5E7",
+ "TooltipBg": "#EEEFF1",
+ "TooltipText": "#16171A",
+ "KeyWhite": "#EEEFF1",
+ "KeyBlack": "#C9CBCF",
+ "MiniKeyWhite": "#F7F8F9",
+ "MiniKeyBlack": "#3A3D42",
+ "ShadeUp": "#FFFFFF",
+ "ShadeDown": "#16171A",
+ "Well": "#EEEFF1",
+ "WellTrack": "#DCDEE0",
+ "KnobTrack": "#B3B6BB",
+ "Groove": "#D6D8DB",
+ "DeviceSection": "#E4E5E7",
+ "DeviceSectionEdge": "#00000000",
+ "DeviceHeader": "#E4E5E7",
+ "Bevel": "#B3FFFFFF",
+ "AccentSoft": "#E6D6C4",
+ "KnobCap": "#EEEFF1",
+ "MeterSafe": "#22692B",
+ "MeterHot": "#7A4F00",
+ "MeterOver": "#B3262C",
+ "TrackHeaderSelected": "#F7F8F9",
+ "LaneSelected": "#C4C6CA",
+ "Master": "#4F535A",
+ "Track1": "#4A7F46",
+ "Track2": "#3A8A7F",
+ "Track3": "#357C99",
+ "Track4": "#3F78B8",
+ "Track5": "#B8862F",
+ "Track6": "#7363A8",
+ "Track7": "#B4566B",
+ "Track8": "#7E7F2F",
+ "Track9": "#5D6C80",
+ "ReturnA": "#5D6C80",
+ "ReturnB": "#4E5B6D",
+ "SystemAccent": "#EF8A0C",
+ "SystemAccentLight1": "#F19829",
+ "SystemAccentLight2": "#F3A646",
+ "SystemAccentLight3": "#F5B463",
+ "SystemAccentDark1": "#D77C0B",
+ "SystemAccentDark2": "#BF6E0A",
+ "SystemAccentDark3": "#A76108",
+ "ShadowBevel": "#B3FFFFFF",
+ "ShadowPopover": "#381E2024",
+ "ShadowModal": "#401E2024"
+ }
+}
diff --git a/src/managed/Nota.App/WelcomeWindow.cs b/src/managed/Nota.App/WelcomeWindow.cs
index 18632815..dd5b7371 100644
--- a/src/managed/Nota.App/WelcomeWindow.cs
+++ b/src/managed/Nota.App/WelcomeWindow.cs
@@ -80,7 +80,7 @@ public sealed class WelcomeWindow : NotaWindow
brand.Children.Add(new TextBlock
{
Text = Loc.F("welcome.version_engine_desktop_daw", AppInfo.Version, App.Services.GetRequiredService<EngineBuildInfo>().Version),
- FontFamily = NotaFonts.UiFamily,
+ FontFamily = NotaFonts.ValuesFamily,
FontSize = NotaType.Value,
Foreground = NotaPalette.TextMuted,
});
@@ -110,7 +110,7 @@ public sealed class WelcomeWindow : NotaWindow
recentHead.Children.Add(new TextBlock
{
Text = recent.Count.ToString(NotaNum.Culture),
- FontFamily = NotaFonts.UiFamily,
+ FontFamily = NotaFonts.ValuesFamily,
FontSize = NotaType.Eyebrow,
Foreground = NotaPalette.TextDisabled,
VerticalAlignment = VerticalAlignment.Bottom,
@@ -534,7 +534,7 @@ public sealed class WelcomeWindow : NotaWindow
_meta = new TextBlock
{
Text = item.Modified,
- FontFamily = NotaFonts.UiFamily,
+ FontFamily = NotaFonts.ValuesFamily,
FontSize = NotaType.Value,
VerticalAlignment = VerticalAlignment.Center,
Margin = new Thickness(12, 0, 0, 0),
diff --git a/src/managed/Nota.App/WhatsNewWindow.cs b/src/managed/Nota.App/WhatsNewWindow.cs
index a3c4209b..148598ef 100644
--- a/src/managed/Nota.App/WhatsNewWindow.cs
+++ b/src/managed/Nota.App/WhatsNewWindow.cs
@@ -227,7 +227,7 @@ public sealed class WhatsNewWindow : NotaWindow
{
Flush();
var code = new Run(text[(i + 1)..end]) { Foreground = Brush("Brush.TextPrimary") };
- if (this.TryFindResource("Font.UI", out var mono) && mono is FontFamily ff)
+ if (this.TryFindResource("Font.Measure", out var mono) && mono is FontFamily ff)
code.FontFamily = ff;
inlines.Add(code);
pos += end - i - 1;
diff --git a/src/managed/Nota.Application/Localization/en.json b/src/managed/Nota.Application/Localization/en.json
index 23162ace..d82482a0 100644
--- a/src/managed/Nota.Application/Localization/en.json
+++ b/src/managed/Nota.Application/Localization/en.json
@@ -3356,6 +3356,10 @@
"preferences.click_track_header": "⇧-click track header",
"preferences.click_wave_spec": "Click WAVE / SPEC",
"preferences.click_waveform": "Click waveform",
+ "preferences.clips": "Clips",
+ "preferences.clips_solid": "Solid",
+ "preferences.clips_tinted": "Tinted",
+ "preferences.clips_caption": "Solid draws clips as blocks of the track colour, as in Nota 0.59. With no pick, it follows the look.",
"preferences.close_and_go_back_where": "Close and go back where you were",
"preferences.close_to_the_limit_consider": "close to the limit — consider a larger buffer",
"preferences.cmd_1_5_act_on_the_arrangement": "⌘1–⌘5 act on the Arrangement · that view follows no grid",
@@ -3522,6 +3526,10 @@
"preferences.inputs_pairs": "Stereo pairs",
"preferences.inputs_subtitle": "What Nota records from, and what each input is called",
"preferences.inputs_switch_tip": "Off: tracks can't pick this input, and a track set to it records nothing",
+ "preferences.look": "Look",
+ "preferences.look_new": "New",
+ "preferences.look_classic": "Classic",
+ "preferences.look_caption": "Classic brings back the colours, corners and monospaced values of Nota 0.59, over any theme.",
"preferences.outputs_pairs": "Output pairs",
"preferences.outputs_click": "Click",
"preferences.outputs_click_both": "Both",
@@ -4182,13 +4190,15 @@
"themes.problem.file_unreadable": "the file cannot be read: {0}",
"themes.problem.folder_unreadable": "the folder cannot be read: {0}",
"themes.problem.font_family": "font.family must be a font name of 1–{0} characters",
+ "themes.problem.font_values": "font.values must be a font name of 1–{0} characters",
"themes.problem.font_object": "font must be an object with a “family”: the name of an installed font",
- "themes.problem.format_version": "formatVersion must be 1 or 2",
+ "themes.problem.format_version": "formatVersion must be 1, 2 or 3",
"themes.problem.id": "invalid id “{0}”: use lower-case letters, digits and single hyphens (not “system”)",
"themes.problem.kind": "kind must be dark or light, not “{0}”",
"themes.problem.missing_token": "missing token “{0}”",
"themes.problem.name": "name must be 1–{0} characters",
"themes.problem.needs_v2": "“{0}” needs formatVersion 2",
+ "themes.problem.needs_v3": "“{0}” needs formatVersion 3",
"themes.problem.not_json": "not valid JSON: {0}",
"themes.problem.not_object": "the file must hold one JSON object",
"themes.problem.opaque": "token “{0}” must be opaque",
@@ -4203,6 +4213,7 @@
"themes.warning.contrast": "{0}: contrast {1}, needs {2}",
"themes.warning.distance": "{0}: colour distance {1}, needs {2} (hard to tell apart)",
"themes.warning.font_missing": "font “{0}” is not installed — Geist is used instead",
+ "themes.warning.values_font_missing": "values font “{0}” is not installed — the look’s own is used instead",
"themes.warning.on": "{0} on {1}",
"themes.warning.text_on": "text on {0}",
"themes.warning.vs": "{0} vs {1}",
diff --git a/src/managed/Nota.Application/Looks.cs b/src/managed/Nota.Application/Looks.cs
new file mode 100644
index 00000000..541f4865
--- /dev/null
+++ b/src/managed/Nota.Application/Looks.cs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
+//
+// The look (spec 091, #572): the new look of the style guide (spec 038), or the classic one —
+// 0.59's colours, corners and Geist Mono for values. One user-wide choice worn over any theme,
+// stored like the accent. Pure: no UI, so the smoke test walks Resolve and Compose. Compose is
+// the one rule for a skin under either look — the skin wins wherever it sets something, the
+// look fills in what it leaves open (research R3).
+
+using Nota.Application.Themes;
+
+namespace Nota.Application;
+
+public enum Look { New, Classic }
+
+/// <summary>Arrangement clips: a tint of the track colour (the new look) or a solid block of it
+/// with a title band (0.59, the classic look's default).</summary>
+public enum ClipStyle { Tinted, Solid }
+
+public static class Looks
+{
+ public const string NewId = "new", ClassicId = "classic";
+
+ /// <summary>What settings.json says, or New: an empty or unknown value falls back without
+ /// throwing, and nothing is written.</summary>
+ public static Look Resolve(Settings s) => Parse(s.Look) ?? Look.New;
+
+ /// <summary>Write a choice (empty for New, so a settings file without the key means New).</summary>
+ public static void Store(Settings s, Look look) => s.Look = look == Look.Classic ? ClassicId : "";
+
+ /// <summary>The id MCP and settings use.</summary>
+ public static string Id(Look look) => look == Look.Classic ? ClassicId : NewId;
+
+ /// <summary>An id back to a look; "" reads as New, anything unknown as null.</summary>
+ public static Look? Parse(string? id) => id switch
+ {
+ null or "" or NewId => Look.New,
+ ClassicId => Look.Classic,
+ _ => null,
+ };
+
+ public const string SolidId = "solid", TintedId = "tinted";
+
+ /// <summary>The clip style in effect: the user's pick, or the look's default (Classic → Solid).</summary>
+ public static ClipStyle ClipStyleOf(Settings s) => ClipStyleOf(s, Resolve(s));
+
+ /// <summary>The same in a given look (a preview in a look the user is not wearing).</summary>
+ public static ClipStyle ClipStyleOf(Settings s, Look look) => s.ClipStyle switch
+ {
+ SolidId => ClipStyle.Solid,
+ TintedId => ClipStyle.Tinted,
+ _ => look == Look.Classic ? ClipStyle.Solid : ClipStyle.Tinted,
+ };
+
+ /// <summary>Store a pick; it wins over the look from then on.</summary>
+ public static void StoreClipStyle(Settings s, ClipStyle style) => s.ClipStyle = style == ClipStyle.Solid ? SolidId : TintedId;
+
+ /// <summary>0.59's corner scale (3 for controls and cards, 2 for keys, rows and badges) laid
+ /// on today's steps. Modal windows and clips share a step with cards and fields now, so they
+ /// take 3; radii off the scale shrink by 0.4, near 3/9, and pills stay round (research R4).</summary>
+ public static readonly SkinGeometry ClassicGeometry = new(null, 0.4, new Dictionary<RadiusStep, double>
+ {
+ [RadiusStep.Card] = 3,
+ [RadiusStep.Group] = 3,
+ [RadiusStep.Field] = 3,
+ [RadiusStep.Cell] = 2,
+ [RadiusStep.ValueBar] = 2,
+ [RadiusStep.Switch] = 2,
+ [RadiusStep.Fine] = 2,
+ }, null, true);
+
+ /// <summary>The typeface and radii worn for <paramref name="skin"/> under <paramref name="look"/>:
+ /// the skin's typefaces as they are (null = the look's own); the skin's radii when its file set
+ /// any, else the classic scale under Classic and the design scale under New.</summary>
+ public static SkinGeometry Compose(SkinGeometry skin, Look look)
+ {
+ if (skin.HasRadius || look == Look.New) return skin;
+ return new SkinGeometry(skin.FontFamily, ClassicGeometry.Roundness, ClassicGeometry.StepOverrides,
+ skin.ValuesFamily, true);
+ }
+}
diff --git a/src/managed/Nota.Application/Settings.cs b/src/managed/Nota.Application/Settings.cs
index 47795c56..e0fac88a 100644
--- a/src/managed/Nota.Application/Settings.cs
+++ b/src/managed/Nota.Application/Settings.cs
@@ -38,6 +38,14 @@ public sealed class Settings
/// <summary>The last custom accent, #RRGGBB — kept while a preset is worn, so Custom
/// offers it again.</summary>
public string CustomAccent { get; set; } = "";
+ /// <summary>The look (spec 091, Settings → Appearance): empty or "new" for the current look,
+ /// "classic" for 0.59's colours, corners and Geist Mono values. Worn over every theme. An
+ /// unknown value reads as New and is never rewritten on read (<see cref="Nota.Application.Looks.Resolve"/>).</summary>
+ public string Look { get; set; } = "";
+ /// <summary>How Arrangement clips are drawn (spec 091, Settings → Appearance → Clips): empty to
+ /// follow the look (Classic → solid, New → tinted), or the user's pick, "solid" or "tinted",
+ /// which wins over the look (<see cref="Nota.Application.Looks.ClipStyleOf"/>).</summary>
+ public string ClipStyle { get; set; } = "";
/// <summary>Whether Session view shows its inspector column (toolbar toggle). On by default;
/// folding it gives the clip grid its width back on small windows.</summary>
public bool SessionInspectorOpen { get; set; } = true;
diff --git a/src/managed/Nota.Application/Themes/SkinGeometry.cs b/src/managed/Nota.Application/Themes/SkinGeometry.cs
index bcd912f2..f5378992 100644
--- a/src/managed/Nota.Application/Themes/SkinGeometry.cs
+++ b/src/managed/Nota.Application/Themes/SkinGeometry.cs
@@ -4,7 +4,9 @@
// What a skin does to type and corners (spec 087): an optional system typeface and a corner
// roundness over the style guide's radius scale (spec 038). The design scale stays the base
// every control is written against; MapRadius turns a design value into the skin's value, so
-// mapping never compounds and the default geometry is an exact no-op.
+// mapping never compounds and the default geometry is an exact no-op. Format 3 (spec 091) adds
+// a typeface for values and readouts, and remembers whether the file set its radii at all —
+// a skin that did keeps them under the classic look; one that did not takes the classic scale.
namespace Nota.Application.Themes;
@@ -12,7 +14,12 @@ namespace Nota.Application.Themes;
/// not a step: they meet their neighbours on a seam and never round.</summary>
public enum RadiusStep { Card, Group, Field, Cell, ValueBar, Switch, Fine }
-public sealed record SkinGeometry(string? FontFamily, double Roundness, IReadOnlyDictionary<RadiusStep, double> StepOverrides)
+/// <param name="ValuesFamily">The typeface for values and readouts (format 3 <c>font.values</c>), or null
+/// for the look's own (Geist under New, Geist Mono under Classic).</param>
+/// <param name="HasRadius">The file carried a <c>radius</c> object — even one equal to the design
+/// scale — so its radii are worn under both looks.</param>
+public sealed record SkinGeometry(string? FontFamily, double Roundness, IReadOnlyDictionary<RadiusStep, double> StepOverrides,
+ string? ValuesFamily = null, bool HasRadius = false)
{
public const double MinRoundness = 0, MaxRoundness = 2, MinStep = 0, MaxStep = 24;
public const int MaxFamilyLength = 100;
@@ -42,7 +49,11 @@ public sealed record SkinGeometry(string? FontFamily, double Roundness, IReadOnl
public static RadiusStep? FromKey(string key) =>
Enum.GetValues<RadiusStep>().Cast<RadiusStep?>().FirstOrDefault(s => Key(s!.Value) == key);
- public bool IsDefault => FontFamily is null && Roundness == 1 && StepOverrides.Count == 0;
+ public bool IsDefault => FontFamily is null && Roundness == 1 && StepOverrides.Count == 0
+ && ValuesFamily is null && !HasRadius;
+
+ /// <summary>The radii are the design scale (whatever the typefaces): mapping a radius is a no-op.</summary>
+ public bool IsDesignScale => Roundness == 1 && StepOverrides.Count == 0;
/// <summary>The radius this skin gives <paramref name="step"/>, in whole pixels.</summary>
public double RadiusOf(RadiusStep step) =>
@@ -52,7 +63,7 @@ public sealed record SkinGeometry(string? FontFamily, double Roundness, IReadOnl
/// square, a value on the scale takes its step's radius, any other is scaled by roundness.</summary>
public double MapRadius(double designValue)
{
- if (designValue <= 0 || IsDefault) return designValue;
+ if (designValue <= 0 || IsDesignScale) return designValue;
foreach (var step in Enum.GetValues<RadiusStep>())
if (designValue == Design(step)) return RadiusOf(step);
return Math.Round(designValue * Roundness, MidpointRounding.AwayFromZero);
@@ -62,8 +73,9 @@ public sealed record SkinGeometry(string? FontFamily, double Roundness, IReadOnl
// values are.
public bool Equals(SkinGeometry? other) =>
other is not null && FontFamily == other.FontFamily && Roundness == other.Roundness
+ && ValuesFamily == other.ValuesFamily && HasRadius == other.HasRadius
&& StepOverrides.Count == other.StepOverrides.Count
&& StepOverrides.All(kv => other.StepOverrides.TryGetValue(kv.Key, out var v) && v == kv.Value);
- public override int GetHashCode() => HashCode.Combine(FontFamily, Roundness, StepOverrides.Count);
+ public override int GetHashCode() => HashCode.Combine(FontFamily, Roundness, StepOverrides.Count, ValuesFamily, HasRadius);
}
diff --git a/src/managed/Nota.Application/Themes/ThemeFile.cs b/src/managed/Nota.Application/Themes/ThemeFile.cs
index edea2c13..233ffdba 100644
--- a/src/managed/Nota.Application/Themes/ThemeFile.cs
+++ b/src/managed/Nota.Application/Themes/ThemeFile.cs
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
//
-// The theme file (spec 011, format 1; spec 087, format 2) as data: one validator for the
+// The theme file (spec 011, format 1; spec 087, format 2; spec 091, format 3) as data: one validator for the
// built-in loader, the user themes folder, the MCP tools and the smoke test. It never throws
// and reports every problem it finds, so a hand-written file can be fixed in one pass. The
// readability pairings of spec 011 (T3) are warnings here: a user may choose a low-contrast
@@ -72,10 +72,10 @@ public static class ThemeFile
return new(problems, warnings, null);
}
- // F1′ — format version 1 (colours) or 2 (colours + typeface + radius).
+ // F1″ — format version 1 (colours), 2 (+ typeface + radius) or 3 (+ values typeface).
int version = 0;
if (!root.TryGetProperty("formatVersion", out var fv) || fv.ValueKind != JsonValueKind.Number
- || !fv.TryGetInt32(out version) || version is not (1 or 2))
+ || !fv.TryGetInt32(out version) || version is not (1 or 2 or 3))
P("F1", "formatVersion", Loc.T("themes.problem.format_version"));
static string? Str(JsonElement root, string key) =>
@@ -121,7 +121,7 @@ public static class ThemeFile
foreach (var t in missing) P("F5", $"colors.{t}", Loc.F("themes.problem.missing_token", t));
}
- // V1–V4 — the format-2 parts.
+ // V1–V4 — the format-2 and format-3 parts.
var geometry = ReadGeometry(root, version, P);
if (problems.Count > 0) return new(problems, warnings, null);
@@ -131,6 +131,9 @@ public static class ThemeFile
if (geometry.FontFamily is { } family && fontInstalled is not null && !fontInstalled(family))
warnings.Add(new(ThemeWarning.FontMissing, null, new[] { family }, 0, 0,
Loc.F("themes.warning.font_missing", family)));
+ if (geometry.ValuesFamily is { } values && fontInstalled is not null && !fontInstalled(values))
+ warnings.Add(new(ThemeWarning.FontMissing, null, new[] { values }, 0, 0,
+ Loc.F("themes.warning.values_font_missing", values)));
return new(problems, warnings, theme);
}
}
@@ -146,7 +149,7 @@ public static class ThemeFile
return SkinGeometry.Default;
}
- string? family = null;
+ string? family = null, values = null;
if (hasFont)
{
if (fontEl.ValueKind != JsonValueKind.Object)
@@ -154,11 +157,32 @@ public static class ThemeFile
else
{
foreach (var p in fontEl.EnumerateObject())
- if (p.Name != "family") P("V2", $"font.{p.Name}", Loc.F("themes.problem.unknown_key", $"font.{p.Name}"));
- var f = fontEl.TryGetProperty("family", out var fe) && fe.ValueKind == JsonValueKind.String ? fe.GetString()?.Trim() : null;
- if (string.IsNullOrEmpty(f) || f.Length > SkinGeometry.MaxFamilyLength)
- P("V2", "font.family", Loc.F("themes.problem.font_family", SkinGeometry.MaxFamilyLength));
- else family = f;
+ {
+ if (p.Name == "family") continue;
+ if (p.Name == "values" && version < 3) P("V1", "font.values", Loc.F("themes.problem.needs_v3", "font.values"));
+ else if (p.Name != "values") P("V2", $"font.{p.Name}", Loc.F("themes.problem.unknown_key", $"font.{p.Name}"));
+ }
+ // V2′ — each name 1–100 characters after trimming; format 3 may name only the values face.
+ string? Name(string key, out bool present)
+ {
+ present = fontEl.TryGetProperty(key, out var e);
+ return present && e.ValueKind == JsonValueKind.String ? e.GetString()?.Trim() : null;
+ }
+ var f = Name("family", out var hasFamily);
+ var v = Name("values", out var hasValues);
+ hasValues &= version >= 3;
+ if (hasFamily || !hasValues)
+ {
+ if (string.IsNullOrEmpty(f) || f.Length > SkinGeometry.MaxFamilyLength)
+ P("V2", "font.family", Loc.F("themes.problem.font_family", SkinGeometry.MaxFamilyLength));
+ else family = f;
+ }
+ if (hasValues)
+ {
+ if (string.IsNullOrEmpty(v) || v.Length > SkinGeometry.MaxFamilyLength)
+ P("V2", "font.values", Loc.F("themes.problem.font_values", SkinGeometry.MaxFamilyLength));
+ else values = v;
+ }
}
}
@@ -206,9 +230,15 @@ public static class ThemeFile
}
}
- return family is null && scale == 1 && steps.Count == 0 ? SkinGeometry.Default : new SkinGeometry(family, scale, steps);
+ bool radiusSet = hasRadius && radiusEl.ValueKind == JsonValueKind.Object;
+ return family is null && values is null && !radiusSet ? SkinGeometry.Default
+ : new SkinGeometry(family, scale, steps, values, radiusSet);
}
+ /// <summary>The lowest format that holds <paramref name="g"/>: 3 with a values typeface, 2 with
+ /// a typeface or radii, else 1.</summary>
+ public static int FormatFor(SkinGeometry g) => g.ValuesFamily is not null ? 3 : g.IsDefault ? 1 : 2;
+
/// <summary>The file text for <paramref name="theme"/>: tokens in catalogue order, 2-space
/// indent, format 1 when it only has colours.</summary>
public static string Write(ParsedTheme theme, IReadOnlyList<string> catalogue)
@@ -218,17 +248,18 @@ public static class ThemeFile
{
var g = theme.Geometry;
w.WriteStartObject();
- w.WriteNumber("formatVersion", g.IsDefault ? 1 : 2);
+ w.WriteNumber("formatVersion", FormatFor(g));
w.WriteString("id", theme.Id);
w.WriteString("name", theme.Name);
w.WriteString("kind", theme.IsDark ? "dark" : "light");
- if (g.FontFamily is { } family)
+ if (g.FontFamily is not null || g.ValuesFamily is not null)
{
w.WriteStartObject("font");
- w.WriteString("family", family);
+ if (g.FontFamily is { } family) w.WriteString("family", family);
+ if (g.ValuesFamily is { } values) w.WriteString("values", values);
w.WriteEndObject();
}
- if (g.Roundness != 1 || g.StepOverrides.Count > 0)
+ if (g.HasRadius || g.Roundness != 1 || g.StepOverrides.Count > 0)
{
w.WriteStartObject("radius");
if (g.Roundness != 1) w.WriteNumber("scale", g.Roundness);
diff --git a/src/managed/Nota.Mcp/Abstractions.cs b/src/managed/Nota.Mcp/Abstractions.cs
index 3868f9c4..6b21a5f1 100644
--- a/src/managed/Nota.Mcp/Abstractions.cs
+++ b/src/managed/Nota.Mcp/Abstractions.cs
@@ -78,14 +78,15 @@ public interface IProjectKeyAccess
public interface IThemeAccess
{
ThemeListing List();
- /// <summary>A listed theme's file text (format 1 or 2), or null for an unknown id.</summary>
- string? GetFile(string id);
+ /// <summary>A listed theme's file text (format 1–3), or null for an unknown id. With
+ /// <paramref name="look"/> "classic", a built-in's classic palette (spec 091).</summary>
+ string? GetFile(string id, string? look = null);
ThemeCatalogue Catalogue();
IReadOnlyList<string> SystemFonts();
Nota.Application.Themes.ThemeValidation Validate(string json);
/// <summary>Images of <paramref name="json"/> worn on the named surfaces (all when null),
/// rendered offscreen; the live window does not change. Nothing is rendered for an invalid theme.</summary>
- Task<ThemePreviews> PreviewAsync(string json, IReadOnlyList<string>? surfaces, bool themeAccent);
+ Task<ThemePreviews> PreviewAsync(string json, IReadOnlyList<string>? surfaces, bool themeAccent, string? look = null);
ThemeSaveResult Save(string json, bool overwrite);
/// <summary>Wear a listed theme and store it, as a pick in Preferences. Null, or why not.</summary>
string? Apply(string id);
@@ -93,12 +94,15 @@ public interface IThemeAccess
bool TryOn(string json, out Nota.Application.Themes.ThemeValidation validation);
/// <summary>End a try-on; the id worn afterwards.</summary>
string RevertTryOn();
+ /// <summary>Wear and store a look ("new" | "classic", spec 091), as Preferences does; the id
+ /// worn afterwards. An unknown look throws ArgumentException naming the allowed ones.</summary>
+ string SetLook(string look);
}
public sealed record ThemeListing(ThemeListEntry[] Themes, string Worn, bool TryOn, ThemeChoiceInfo Choice, ThemeFileProblem[] Problems);
public sealed record ThemeListEntry(string Id, string Name, string Kind, string Source, int Warnings, bool FontMissing,
string? FontFamily, double Roundness);
-public sealed record ThemeChoiceInfo(bool FollowSystem, string Single, string Dark, string Light);
+public sealed record ThemeChoiceInfo(bool FollowSystem, string Single, string Dark, string Light, string Look);
public sealed record ThemeFileProblem(string File, string Reason);
public sealed record ThemeTokenInfo(string Name, string Group, string Role, bool Translucent);
public sealed record ThemeRadiusStepInfo(string Name, double Design);
diff --git a/src/managed/Nota.Mcp/Tools/ThemeTools.cs b/src/managed/Nota.Mcp/Tools/ThemeTools.cs
index 0360bfbb..a8ee3380 100644
--- a/src/managed/Nota.Mcp/Tools/ThemeTools.cs
+++ b/src/managed/Nota.Mcp/Tools/ThemeTools.cs
@@ -21,9 +21,11 @@ public sealed class ThemeTools(IAudioEngine engine, IEngineDispatch dispatch, IA
: EngineTools(engine, dispatch, refresh)
{
private const string Format =
- "A theme is the JSON text of a theme file: { \"formatVersion\": 1 or 2, \"id\": \"lower-case-hyphenated\", \"name\": \"1–40 chars\", "
+ "A theme is the JSON text of a theme file: { \"formatVersion\": 1, 2 or 3, \"id\": \"lower-case-hyphenated\", \"name\": \"1–40 chars\", "
+ "\"kind\": \"dark\"|\"light\", \"colors\": { every token: \"#RRGGBB\" (or #AARRGGBB where the catalogue allows translucency) } }. "
- + "Format 2 may add \"font\": { \"family\": \"<installed font>\" } and \"radius\": { \"scale\": 0–2, \"steps\": { \"card\": px, … } }.";
+ + "Format 2 may add \"font\": { \"family\": \"<installed font>\" } and \"radius\": { \"scale\": 0–2, \"steps\": { \"card\": px, … } }; "
+ + "format 3 also \"font\": { \"values\": \"<installed font>\" } for values and readouts (family then optional). "
+ + "A skin that sets radius keeps its corners under the classic look; one that doesn't takes the classic corners.";
public sealed record Problem(
[property: Description("Rule broken: F1–F6 (format, id, name, kind, tokens, colours), V1–V4 (font/radius), JSON")] string Rule,
@@ -47,6 +49,7 @@ public sealed class ThemeTools(IAudioEngine engine, IEngineDispatch dispatch, IA
public sealed record TryOnResult(ValidationResult Validation, bool Wearing);
public sealed record WornResult(string Worn);
+ public sealed record LookResult(string Look, string Worn);
private static ValidationResult Result(ThemeValidation v) => new(
v.IsValid,
@@ -55,15 +58,29 @@ public sealed class ThemeTools(IAudioEngine engine, IEngineDispatch dispatch, IA
[McpServerTool(Name = "list_themes"), Description(
"List Nota's colour themes (skins): the built-ins and the user themes in the themes folder, with kind, warnings, "
- + "typeface and roundness; which one is worn now (and whether it is a try-on); the stored Appearance choice; and "
+ + "typeface and roundness; which one is worn now (and whether it is a try-on); the stored Appearance choice, with "
+ + "the look (\"new\" or \"classic\"); and "
+ "the theme files that could not be loaded, with the reason.")]
public Task<ThemeListing> ListThemes() => Read(themes.List);
[McpServerTool(Name = "get_theme"), Description(
"Read one theme's file (JSON text, tokens in catalogue order). Use a built-in as the template for a new skin: "
- + "change the id and name, then the colours (and, in formatVersion 2, font and radius).")]
- public async Task<string> GetTheme([Description("Theme id from list_themes, e.g. studio-dark")] string id) =>
- await Read(() => themes.GetFile(id)) ?? throw new ArgumentException($"No theme '{id}' — see list_themes.");
+ + "change the id and name, then the colours (and, in formatVersion 2, font and radius). With look \"classic\" a "
+ + "built-in comes back in its classic palette (Nota 0.59's colours) — a start for a classic skin.")]
+ public async Task<string> GetTheme(
+ [Description("Theme id from list_themes, e.g. studio-dark")] string id,
+ [Description("\"new\" (default): the file as it is; \"classic\": a built-in's classic palette")] string? look = null) =>
+ await Read(() => themes.GetFile(id, look)) ?? throw new ArgumentException($"No theme '{id}' — see list_themes.");
+
+ [McpServerTool(Name = "set_look"), Description(
+ "Switch Nota's look and store it, as Preferences → Appearance → Look does: \"new\" (the current look) or "
+ + "\"classic\" (Nota 0.59's colours, tighter corners and values in Geist Mono, over any theme; a user skin keeps "
+ + "what it sets). Live, no restart. Returns the look and the theme worn.")]
+ public async Task<LookResult> SetLook([Description("\"new\" or \"classic\"")] string look)
+ {
+ var worn = await Read(() => themes.SetLook(look));
+ return new LookResult(look.Trim().ToLowerInvariant(), worn);
+ }
[McpServerTool(Name = "get_theme_catalogue"), Description(
"The colour tokens every theme must define, in file order, each with its group, what it colours, and whether it may "
@@ -92,9 +109,10 @@ public sealed class ThemeTools(IAudioEngine engine, IEngineDispatch dispatch, IA
[Description("The theme file's JSON text")] string theme,
[Description("Only these parts (names as listed above); all when omitted")] string[]? surfaces = null,
[Description("\"user\" (default): with the accent colour the user picked, as the skin would really look; "
- + "\"theme\": with the theme's own accent")] string? accent = null)
+ + "\"theme\": with the theme's own accent")] string? accent = null,
+ [Description("\"new\" or \"classic\"; the look the user wears when omitted")] string? look = null)
{
- var result = await await Read(() => themes.PreviewAsync(theme, surfaces, string.Equals(accent, "theme", StringComparison.OrdinalIgnoreCase)));
+ var result = await await Read(() => themes.PreviewAsync(theme, surfaces, string.Equals(accent, "theme", StringComparison.OrdinalIgnoreCase), look));
var head = new
{
validation = Result(result.Validation),
diff --git a/tests/Nota.SmokeTest/DesignTokenCheck.Accent.cs b/tests/Nota.SmokeTest/DesignTokenCheck.Accent.cs
index 26f34278..327f01a4 100644
--- a/tests/Nota.SmokeTest/DesignTokenCheck.Accent.cs
+++ b/tests/Nota.SmokeTest/DesignTokenCheck.Accent.cs
@@ -84,14 +84,14 @@ internal static partial class DesignTokenCheck
// Wiring: everything a theme reaches wears the accent.
var service = File.ReadAllText(Path.Combine(app, "Theme/NotaThemeService.cs"));
- yield return (service.Contains("Worn(NotaThemes.Find(_choice.Active(osDark))"), "the theme service wears the accented theme");
+ yield return (service.Contains("var theme = Worn(InLook(picked, _look))"), "the theme service wears the accented theme");
var startup = File.ReadAllText(Path.Combine(app, "App.axaml.cs"));
yield return (startup.Contains("Accent.Resolve("), "the accent is resolved before the first window paints");
var remote = File.ReadAllText(Path.Combine(app, "MainWindow.Remote.cs"));
yield return (remote.Contains("NotaThemeService.Worn(") && remote.Contains("NotaThemeService.Accent"),
"Nota Remote is sent the accented themes and re-sent on an accent change");
var prefs = string.Concat(Directory.EnumerateFiles(app, "PreferencesWindow*.cs").Select(File.ReadAllText));
- yield return (prefs.Contains("NotaThemeService.Worn("), "the theme cards preview each theme with the chosen accent");
+ yield return (prefs.Contains("NotaThemeService.WornForCard("), "the theme cards preview each theme with the chosen accent");
}
private static Dictionary<string, uint> ReadRgb(string json)
diff --git a/tests/Nota.SmokeTest/DesignTokenCheck.Classic.cs b/tests/Nota.SmokeTest/DesignTokenCheck.Classic.cs
new file mode 100644
index 00000000..f050d9cd
--- /dev/null
+++ b/tests/Nota.SmokeTest/DesignTokenCheck.Classic.cs
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
+//
+// The classic palettes (spec 091): one per built-in, the whole catalogue, 0.59.2's colour for
+// every token 0.59.2 had — checked against a committed snapshot of the tag, since CI clones are
+// shallow. Readability may warn only where 0.59.2 itself did (clarified: keep 0.59.2 exactly);
+// a pairing that involves a token added since must pass.
+
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using Nota.Application.Themes;
+
+namespace Nota.SmokeTest;
+
+internal static partial class DesignTokenCheck
+{
+ public static IEnumerable<(bool Ok, string Label)> RunClassicPalettes()
+ {
+ var root = RepoRoot();
+ if (root is null) { yield return (false, "repo root located"); yield break; }
+ var app = Path.Combine(root, "src/managed/Nota.App");
+ var palette = File.ReadAllText(Path.Combine(app, "Theme/NotaPalette.cs"));
+ var catalogue = Regex.Matches(palette, @"\bT\((?:nameof\((?<n>\w+)\)|""(?<n>\w+)"")\)").Select(m => m.Groups["n"].Value)
+ .Concat(ExtraTokens).ToList();
+ var snapshot = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string>>>(
+ File.ReadAllText(Path.Combine(root, "tests/Nota.SmokeTest/Fixtures/classic-0.59.2.json")))!;
+
+ var builtIns = Directory.EnumerateFiles(Path.Combine(app, "Theme/Themes"), "*.json")
+ .Select(Path.GetFileNameWithoutExtension).OrderBy(n => n).ToList();
+ foreach (var id in builtIns)
+ {
+ var path = Path.Combine(app, "Theme/Themes/Classic", id + ".json");
+ if (!File.Exists(path)) { yield return (false, $"classic: {id} has a classic palette"); continue; }
+ var v = ThemeFile.Validate(File.ReadAllText(path), catalogue, AlphaTokens);
+ yield return (v.IsValid && v.Theme!.Id == id && v.Theme.FormatVersion == 1,
+ v.IsValid ? $"classic: {id} validates with the full catalogue (format 1, same id)"
+ : $"classic: {id} — {ThemeFolder.Describe(v.Problems)}");
+ if (!v.IsValid || !snapshot.TryGetValue(id!, out var old)) continue;
+
+ var colours = v.Theme!.Colors;
+ var off = old.Where(kv => !colours.TryGetValue(kv.Key, out var c) || c != ThemeFile.ParseHex(kv.Value))
+ .Select(kv => kv.Key).ToList();
+ yield return (off.Count == 0, off.Count == 0 ? $"classic: {id} has 0.59.2's value for all {old.Count} of its tokens"
+ : $"classic: {id} differs from 0.59.2 in {string.Join(", ", off)}");
+
+ // Readability: a warning stands only if every token in the pairing is 0.59.2's own.
+ var since = v.Warnings.Where(w => w.Kind == ThemeWarning.Readability && w.Tokens.Any(t => !old.ContainsKey(t)))
+ .Select(w => $"{w.Pairing} {string.Join("/", w.Tokens)}").ToList();
+ yield return (since.Count == 0, since.Count == 0
+ ? $"classic: {id} warns only where 0.59.2 did ({v.Warnings.Count(w => w.Kind == ThemeWarning.Readability)} inherited)"
+ : $"classic: {id} fails readability with a new token: {string.Join(", ", since)}");
+ }
+ var stray = Directory.EnumerateFiles(Path.Combine(app, "Theme/Themes/Classic"), "*.json")
+ .Select(Path.GetFileNameWithoutExtension).Except(builtIns).ToList();
+ yield return (stray.Count == 0, stray.Count == 0 ? "classic: no palette without a built-in" : $"classic: stray palettes {string.Join(", ", stray)}");
+ }
+}
diff --git a/tests/Nota.SmokeTest/DesignTokenCheck.Skins.cs b/tests/Nota.SmokeTest/DesignTokenCheck.Skins.cs
index 429ef596..4a564a3c 100644
--- a/tests/Nota.SmokeTest/DesignTokenCheck.Skins.cs
+++ b/tests/Nota.SmokeTest/DesignTokenCheck.Skins.cs
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
//
-// User skins (spec 087): the shared theme-file validator (format 1 and 2), the skin
+// User skins (spec 087, 091): the shared theme-file validator (formats 1–3), the skin
// geometry's radius mapping, and the user themes folder — as data, with no UI. The
// validator must agree with the independent spec-011 checks above on the built-ins, report
// every problem in a broken file naming its field, and never throw.
@@ -75,7 +75,7 @@ internal static partial class DesignTokenCheck
("system id", With(n => n["id"] = "system"), "id"),
("bad kind", With(n => n["kind"] = "dusk"), "kind"),
("long name", With(n => n["name"] = new string('x', 41)), "name"),
- ("format 3", With(n => n["formatVersion"] = 3), "formatVersion"),
+ ("format 4", With(n => n["formatVersion"] = 4), "formatVersion"),
("v1 with font", With(n => n["font"] = new JsonObject { ["family"] = "Helvetica" }), "font"),
("scale 3", With(n => { n["formatVersion"] = 2; n["radius"] = new JsonObject { ["scale"] = 3 }; }), "radius.scale"),
("unknown step", With(n => { n["formatVersion"] = 2; n["radius"] = new JsonObject { ["steps"] = new JsonObject { ["huge"] = 4 } }; }), "radius.steps.huge"),
diff --git a/tests/Nota.SmokeTest/DesignTokenCheck.cs b/tests/Nota.SmokeTest/DesignTokenCheck.cs
index 75d2abb9..0104a2b6 100644
--- a/tests/Nota.SmokeTest/DesignTokenCheck.cs
+++ b/tests/Nota.SmokeTest/DesignTokenCheck.cs
@@ -173,8 +173,10 @@ internal static partial class DesignTokenCheck
yield return (true, $"radius allow-list: {list.Distinct().Count()} entries (ratchet: may only shrink)");
}
- /// <summary>Type: the theme and NotaFonts point at the same bundled Geist files, and no
- /// view names a font of its own or sets text below the 7px floor. See DESIGN.md § Type.</summary>
+ /// <summary>Type: the theme and NotaFonts point at the same bundled Geist files; two roles —
+ /// words and values — where values are Geist under the new look and Geist Mono only by the
+ /// classic look's choice (spec 091); no view names a font of its own or sets text below the
+ /// 7px floor. See DESIGN.md § Type.</summary>
public static IEnumerable<(bool Ok, string Label)> RunType()
{
var root = RepoRoot();
@@ -188,19 +190,26 @@ internal static partial class DesignTokenCheck
var ui = XamlFont("Font.UI");
yield return (ui.Length > 0 && ui == CsFont("UiUri"), $"Font.UI matches NotaFonts ({ui})");
- // One typeface (spec 038): Geist with tabular figures; no monospace family anywhere.
+ // Two roles (specs 038, 091): words (Font.UI) and values (Font.Measure). The theme's
+ // Font.Measure is Geist itself, so the new look is still one typeface; Geist Mono is
+ // named once, in NotaFonts, for the classic look to choose.
var families = Regex.Matches(theme, """<FontFamily x:Key="(?<k>[^"]+)">""").Select(m => m.Groups["k"].Value).ToArray();
- yield return (families.SequenceEqual(new[] { "Font.UI" }) && !Regex.IsMatch(fonts, @"const string \w+Uri\s*=\s*""[^""]*Mono"),
- $"one typeface: Font.UI is the only family ({string.Join(", ", families)})");
+ yield return (families.SequenceEqual(new[] { "Font.UI", "Font.Measure" }),
+ $"two roles: Font.UI and Font.Measure are the only families ({string.Join(", ", families)})");
+ yield return (XamlFont("Font.Measure") == ui, $"the new look is one typeface: Font.Measure defaults to Geist ({XamlFont("Font.Measure")})");
+ var monoUris = Regex.Matches(fonts, @"const string (?<n>\w+Uri)\s*=\s*""(?<v>[^""]*Mono[^""]*)""")
+ .Select(m => m.Groups["n"].Value + "=" + m.Groups["v"].Value).ToArray();
+ yield return (monoUris.SequenceEqual(new[] { "MeasureMonoUri=avares://Nota.App/Assets/Fonts#Geist Mono" }),
+ $"Geist Mono is named once, as NotaFonts.MeasureMonoUri ({string.Join(", ", monoUris)})");
yield return (fonts.Contains("\"+tnum\""), "tabular figures are on (NotaFonts.Tabular)");
var weights = new[] { "Regular", "Medium", "SemiBold", "Bold" };
- var files = weights.Select(w => $"Geist-{w}.ttf")
- .Where(f => !File.Exists(Path.Combine(root, "assets/fonts", f))).ToArray();
+ var expected = weights.SelectMany(w => new[] { $"Geist-{w}.ttf", $"GeistMono-{w}.ttf" }).ToHashSet();
+ var files = expected.Where(f => !File.Exists(Path.Combine(root, "assets/fonts", f))).ToArray();
yield return (files.Length == 0,
- files.Length == 0 ? "all four Geist weights are bundled" : $"missing font files: {string.Join(", ", files)}");
+ files.Length == 0 ? "all four Geist and Geist Mono weights are bundled" : $"missing font files: {string.Join(", ", files)}");
var stray = Directory.GetFiles(Path.Combine(root, "assets/fonts"), "*.ttf")
- .Select(Path.GetFileName).Where(f => !f!.StartsWith("Geist-")).ToArray();
+ .Select(Path.GetFileName).Where(f => !expected.Contains(f!)).ToArray();
yield return (stray.Length == 0,
stray.Length == 0 ? "no other typeface is bundled" : $"other font files bundled: {string.Join(", ", stray)}");
yield return (File.Exists(Path.Combine(root, "LICENSES/OFL-1.1-Geist.txt")), "the Geist OFL licence ships with the fonts");
diff --git a/tests/Nota.SmokeTest/Fixtures/classic-0.59.2.json b/tests/Nota.SmokeTest/Fixtures/classic-0.59.2.json
new file mode 100644
index 00000000..54695eec
--- /dev/null
+++ b/tests/Nota.SmokeTest/Fixtures/classic-0.59.2.json
@@ -0,0 +1,438 @@
+{
+ "studio-dark": {
+ "SurfaceAbyss": "#17181A",
+ "BgApp": "#1E1F22",
+ "Gutter": "#141517",
+ "BgSunken": "#17181A",
+ "CanvasBg": "#1E1F22",
+ "SurfaceDeep": "#1B1C1F",
+ "LaneB": "#222326",
+ "Panel": "#2B2D31",
+ "SurfaceCard": "#2B2D31",
+ "SurfaceInset": "#232427",
+ "SurfaceRaised": "#34363B",
+ "SurfaceHover": "#393C41",
+ "TrackOff": "#17181A",
+ "SurfaceActive": "#17181A",
+ "GridSubBeat": "#242528",
+ "GridBeat": "#2A2C30",
+ "GridRow": "#1B1C1F",
+ "GridBar": "#3A3C41",
+ "GraphBorder": "#45484E",
+ "WellGrid": "#2E2F32",
+ "PadGrid": "#2A2C30",
+ "TextHeading": "#F4F5F6",
+ "TextPrimary": "#E8E9EB",
+ "TextStrong": "#D4D6DA",
+ "TextSecondary": "#C0C4C9",
+ "TextMuted": "#A4A9B0",
+ "TextTertiary": "#92969D",
+ "TextDisabled": "#82868C",
+ "TextAxis": "#82868C",
+ "TextOnAccent": "#17181A",
+ "TextFaint": "#82868C",
+ "VizInk": "#D7D8DA",
+ "VizGrid": "#2E2F32",
+ "BorderDefault": "#141517",
+ "BorderStrong": "#45484E",
+ "BorderBrass": "#BF7D22",
+ "Seam": "#141517",
+ "Rule": "#45484E",
+ "Accent": "#FF9F1C",
+ "AccentBright": "#FFB547",
+ "AccentHover": "#FFB547",
+ "AccentDeep": "#C77612",
+ "AccentDim": "#C77612",
+ "AccentEdge": "#BF7D22",
+ "AccentMute": "#7A5F3D",
+ "AccentPale": "#FFD08A",
+ "AccentSubtle": "#4D3F2E",
+ "Record": "#F06A6E",
+ "RecordInk": "#17181A",
+ "Success": "#6CC673",
+ "SuccessInk": "#17181A",
+ "SuccessDim": "#3F8A45",
+ "Warning": "#F2B53C",
+ "Mute": "#F2B53C",
+ "Solo": "#6A9FD8",
+ "Danger": "#F06A6E",
+ "DangerHover": "#F48386",
+ "DangerBright": "#F58F92",
+ "DangerDeep": "#C4474B",
+ "DangerPale": "#F7A5A7",
+ "Teal": "#5FB3A8",
+ "TealBright": "#86C9C0",
+ "Rose": "#D77A8F",
+ "RoseBright": "#E49EAE",
+ "Steel": "#6A9FD8",
+ "Sage": "#7FB08A",
+ "Threshold": "#E0A84A",
+ "Marker": "#7FC4E0",
+ "MarkerHot": "#CDEEF8",
+ "Frozen": "#7FC7EC",
+ "SignalIn": "#5A6170",
+ "SignalInFill": "#3A3E46",
+ "HandleSel": "#FFFFFF",
+ "SelHeaderBg": "#393C41",
+ "FrozenHeaderBg": "#24323B",
+ "MuteTint": "#3B3426",
+ "Veil": "#1E1F22",
+ "TooltipBg": "#34363B",
+ "TooltipText": "#E8E9EB",
+ "KeyWhite": "#2B2D31",
+ "KeyBlack": "#17181A",
+ "MiniKeyWhite": "#3A3C41",
+ "MiniKeyBlack": "#17181A",
+ "ShadeUp": "#FFFFFF",
+ "ShadeDown": "#17181A",
+ "Master": "#A4A9B0",
+ "Track1": "#7FB87A",
+ "Track2": "#5FB3A8",
+ "Track3": "#5AA6C4",
+ "Track4": "#6A9FD8",
+ "Track5": "#E0A84A",
+ "Track6": "#9D90C9",
+ "Track7": "#D77A8F",
+ "Track8": "#B3B45E",
+ "Track9": "#8E9DB0",
+ "ReturnA": "#8E9DB0",
+ "ReturnB": "#7A889A",
+ "SystemAccent": "#FF9F1C",
+ "SystemAccentLight1": "#FFAB37",
+ "SystemAccentLight2": "#FFB652",
+ "SystemAccentLight3": "#FFC26E",
+ "SystemAccentDark1": "#E68F19",
+ "SystemAccentDark2": "#CC7F16",
+ "SystemAccentDark3": "#B26F14",
+ "ShadowBevel": "#12FFFFFF",
+ "ShadowPopover": "#6B000000",
+ "ShadowModal": "#80000000"
+ },
+ "studio-light": {
+ "SurfaceAbyss": "#D6D8DB",
+ "BgApp": "#C9CBCF",
+ "Gutter": "#9DA0A6",
+ "BgSunken": "#D6D8DB",
+ "CanvasBg": "#C9CBCF",
+ "SurfaceDeep": "#CFD1D4",
+ "LaneB": "#C4C6CA",
+ "Panel": "#E4E5E7",
+ "SurfaceCard": "#E4E5E7",
+ "SurfaceInset": "#DCDEE0",
+ "SurfaceRaised": "#EEEFF1",
+ "SurfaceHover": "#F7F8F9",
+ "TrackOff": "#D6D8DB",
+ "SurfaceActive": "#D6D8DB",
+ "GridSubBeat": "#C3C5C9",
+ "GridBeat": "#BDC0C4",
+ "GridRow": "#C5C7CB",
+ "GridBar": "#ADB0B5",
+ "GraphBorder": "#B3B6BB",
+ "WellGrid": "#C0C3C6",
+ "PadGrid": "#C8CACD",
+ "TextHeading": "#0E0F11",
+ "TextPrimary": "#16171A",
+ "TextStrong": "#282A2E",
+ "TextSecondary": "#3A3D42",
+ "TextMuted": "#4F535A",
+ "TextTertiary": "#65696F",
+ "TextDisabled": "#797C81",
+ "TextAxis": "#797C81",
+ "TextOnAccent": "#17181A",
+ "TextFaint": "#797C81",
+ "VizInk": "#252629",
+ "VizGrid": "#C0C3C6",
+ "BorderDefault": "#9DA0A6",
+ "BorderStrong": "#B3B6BB",
+ "BorderBrass": "#ECA54E",
+ "Seam": "#9DA0A6",
+ "Rule": "#B3B6BB",
+ "Accent": "#EF8A0C",
+ "AccentBright": "#C46A00",
+ "AccentHover": "#C46A00",
+ "AccentDeep": "#D47800",
+ "AccentDim": "#F7C27A",
+ "AccentEdge": "#ECA54E",
+ "AccentMute": "#C9A77A",
+ "AccentPale": "#8A4A00",
+ "AccentSubtle": "#E6D6C4",
+ "Record": "#B3262C",
+ "RecordInk": "#FFFFFF",
+ "Success": "#22692B",
+ "SuccessInk": "#FFFFFF",
+ "SuccessDim": "#79B880",
+ "Warning": "#7A4F00",
+ "Mute": "#7A4F00",
+ "Solo": "#3F78B8",
+ "Danger": "#B3262C",
+ "DangerHover": "#C2343A",
+ "DangerBright": "#9C1F24",
+ "DangerDeep": "#8E1C21",
+ "DangerPale": "#7F161B",
+ "Teal": "#3A8A7F",
+ "TealBright": "#2E7067",
+ "Rose": "#B4566B",
+ "RoseBright": "#93404F",
+ "Steel": "#3F78B8",
+ "Sage": "#4A7F56",
+ "Threshold": "#8A5F14",
+ "Marker": "#1B6E8C",
+ "MarkerHot": "#0E5470",
+ "Frozen": "#1C6E96",
+ "SignalIn": "#7A818C",
+ "SignalInFill": "#C9CDD3",
+ "HandleSel": "#16171A",
+ "SelHeaderBg": "#F7F8F9",
+ "FrozenHeaderBg": "#D3E2EA",
+ "MuteTint": "#BDB49F",
+ "Veil": "#E4E5E7",
+ "TooltipBg": "#EEEFF1",
+ "TooltipText": "#16171A",
+ "KeyWhite": "#EEEFF1",
+ "KeyBlack": "#C9CBCF",
+ "MiniKeyWhite": "#F7F8F9",
+ "MiniKeyBlack": "#3A3D42",
+ "ShadeUp": "#FFFFFF",
+ "ShadeDown": "#16171A",
+ "Master": "#4F535A",
+ "Track1": "#4A7F46",
+ "Track2": "#3A8A7F",
+ "Track3": "#357C99",
+ "Track4": "#3F78B8",
+ "Track5": "#B8862F",
+ "Track6": "#7363A8",
+ "Track7": "#B4566B",
+ "Track8": "#7E7F2F",
+ "Track9": "#5D6C80",
+ "ReturnA": "#5D6C80",
+ "ReturnB": "#4E5B6D",
+ "SystemAccent": "#EF8A0C",
+ "SystemAccentLight1": "#F19829",
+ "SystemAccentLight2": "#F3A646",
+ "SystemAccentLight3": "#F5B463",
+ "SystemAccentDark1": "#D77C0B",
+ "SystemAccentDark2": "#BF6E0A",
+ "SystemAccentDark3": "#A76108",
+ "ShadowBevel": "#B3FFFFFF",
+ "ShadowPopover": "#381E2024",
+ "ShadowModal": "#401E2024"
+ },
+ "ember-graphite": {
+ "SurfaceAbyss": "#0A0908",
+ "BgApp": "#0B0A09",
+ "Gutter": "#0C0B09",
+ "BgSunken": "#100F0D",
+ "CanvasBg": "#121110",
+ "SurfaceDeep": "#131210",
+ "LaneB": "#131210",
+ "Panel": "#141310",
+ "SurfaceCard": "#171613",
+ "SurfaceInset": "#1A1815",
+ "SurfaceRaised": "#1C1A16",
+ "SurfaceHover": "#252219",
+ "TrackOff": "#26231E",
+ "SurfaceActive": "#100F0D",
+ "GridSubBeat": "#191712",
+ "GridBeat": "#1E1C18",
+ "GridRow": "#141311",
+ "GridBar": "#2A2721",
+ "GraphBorder": "#221F1A",
+ "WellGrid": "#232019",
+ "PadGrid": "#1C1A16",
+ "TextHeading": "#F2EDE1",
+ "TextPrimary": "#E9E4D8",
+ "TextStrong": "#C7C0B0",
+ "TextSecondary": "#A39D8F",
+ "TextMuted": "#8F897C",
+ "TextTertiary": "#716D60",
+ "TextDisabled": "#646054",
+ "TextAxis": "#65614F",
+ "TextOnAccent": "#171613",
+ "TextFaint": "#646054",
+ "VizInk": "#D8D3C8",
+ "VizGrid": "#232019",
+ "BorderDefault": "#2C2923",
+ "BorderStrong": "#3A362D",
+ "BorderBrass": "#6B5326",
+ "Seam": "#0C0B09",
+ "Rule": "#3A362D",
+ "Accent": "#D8A03D",
+ "AccentBright": "#F0C060",
+ "AccentHover": "#E9BE6A",
+ "AccentDeep": "#B08536",
+ "AccentDim": "#8A6B2E",
+ "AccentEdge": "#5E4A22",
+ "AccentMute": "#7A6130",
+ "AccentPale": "#FCE5B8",
+ "AccentSubtle": "#241F17",
+ "Record": "#BE563E",
+ "RecordInk": "#FFFFFF",
+ "Success": "#58B368",
+ "SuccessInk": "#171613",
+ "SuccessDim": "#7FB069",
+ "Warning": "#D9C34C",
+ "Mute": "#D9C34C",
+ "Solo": "#6D8FB5",
+ "Danger": "#C2554A",
+ "DangerHover": "#D0685C",
+ "DangerBright": "#E08A72",
+ "DangerDeep": "#A8453B",
+ "DangerPale": "#F0928A",
+ "Teal": "#5B9E9C",
+ "TealBright": "#7FC0BE",
+ "Rose": "#B57286",
+ "RoseBright": "#D79BAB",
+ "Steel": "#6D8FB5",
+ "Sage": "#6FA383",
+ "Threshold": "#C9884F",
+ "Marker": "#7FCCE1",
+ "MarkerHot": "#CDEEF8",
+ "Frozen": "#7FC7EC",
+ "SignalIn": "#52604F",
+ "SignalInFill": "#3E4A3C",
+ "HandleSel": "#FFFFFF",
+ "SelHeaderBg": "#241F17",
+ "FrozenHeaderBg": "#1B2A33",
+ "MuteTint": "#3A2320",
+ "Veil": "#121418",
+ "TooltipBg": "#18181E",
+ "TooltipText": "#F0E4C8",
+ "KeyWhite": "#1C1A16",
+ "KeyBlack": "#0E0D0B",
+ "MiniKeyWhite": "#2A2721",
+ "MiniKeyBlack": "#151310",
+ "ShadeUp": "#FFFFFF",
+ "ShadeDown": "#141210",
+ "Master": "#8D8779",
+ "Track1": "#58B368",
+ "Track2": "#4E9E7A",
+ "Track3": "#3E8E8E",
+ "Track4": "#5AA0B8",
+ "Track5": "#C77F55",
+ "Track6": "#7A6FB0",
+ "Track7": "#B05A7A",
+ "Track8": "#9AA64A",
+ "Track9": "#7FA88E",
+ "ReturnA": "#7FA88E",
+ "ReturnB": "#6B907B",
+ "SystemAccent": "#D8A03D",
+ "SystemAccentLight1": "#DDAB54",
+ "SystemAccentLight2": "#E1B76C",
+ "SystemAccentLight3": "#E6C283",
+ "SystemAccentDark1": "#C29037",
+ "SystemAccentDark2": "#AD8031",
+ "SystemAccentDark3": "#97702B",
+ "ShadowBevel": "#08FFFFFF",
+ "ShadowPopover": "#6B000000",
+ "ShadowModal": "#80000000"
+ },
+ "ember-paper": {
+ "SurfaceAbyss": "#D8D1BE",
+ "BgApp": "#DCD6C5",
+ "Gutter": "#E0DAC9",
+ "BgSunken": "#E4DFD1",
+ "CanvasBg": "#E6E1D3",
+ "SurfaceDeep": "#E7E2D4",
+ "LaneB": "#E7E2D4",
+ "Panel": "#EAE5D7",
+ "SurfaceCard": "#EFEADE",
+ "SurfaceInset": "#E9E4D6",
+ "SurfaceRaised": "#F8F5EC",
+ "SurfaceHover": "#E7E1D0",
+ "TrackOff": "#DBD4C0",
+ "SurfaceActive": "#D5CEBB",
+ "GridSubBeat": "#E5DFCE",
+ "GridBeat": "#DED8C8",
+ "GridRow": "#E6E1D2",
+ "GridBar": "#CFC8B4",
+ "GraphBorder": "#D5CFBE",
+ "WellGrid": "#DDD7C6",
+ "PadGrid": "#DED8C7",
+ "TextHeading": "#1A150E",
+ "TextPrimary": "#241F17",
+ "TextStrong": "#3E382C",
+ "TextSecondary": "#5E5849",
+ "TextMuted": "#625B50",
+ "TextTertiary": "#7E786C",
+ "TextDisabled": "#8D866F",
+ "TextAxis": "#8D8669",
+ "TextOnAccent": "#FFFBF2",
+ "TextFaint": "#8D866F",
+ "VizInk": "#332E26",
+ "VizGrid": "#DDD7C6",
+ "BorderDefault": "#D5CEBB",
+ "BorderStrong": "#BDB5A0",
+ "BorderBrass": "#C9A254",
+ "Seam": "#E0DAC9",
+ "Rule": "#BDB5A0",
+ "Accent": "#AD7716",
+ "AccentBright": "#744D07",
+ "AccentHover": "#8F6110",
+ "AccentDeep": "#7A5008",
+ "AccentDim": "#9C8034",
+ "AccentEdge": "#D3B173",
+ "AccentMute": "#C39B4F",
+ "AccentPale": "#5C3C04",
+ "AccentSubtle": "#F2E4C4",
+ "Record": "#B54A32",
+ "RecordInk": "#FFF4EE",
+ "Success": "#2C7A3E",
+ "SuccessInk": "#FFFBF2",
+ "SuccessDim": "#609548",
+ "Warning": "#837010",
+ "Mute": "#837010",
+ "Solo": "#3E6288",
+ "Danger": "#B13E33",
+ "DangerHover": "#C64A36",
+ "DangerBright": "#A3391B",
+ "DangerDeep": "#9C3221",
+ "DangerPale": "#8E2416",
+ "Teal": "#2F7472",
+ "TealBright": "#3E8A88",
+ "Rose": "#86465B",
+ "RoseBright": "#7F2D43",
+ "Steel": "#3E6288",
+ "Sage": "#42765A",
+ "Threshold": "#8A5218",
+ "Marker": "#1B6E8C",
+ "MarkerHot": "#0E5470",
+ "Frozen": "#1C6E96",
+ "SignalIn": "#6E7C68",
+ "SignalInFill": "#D3DCCF",
+ "HandleSel": "#1E1A14",
+ "SelHeaderBg": "#F2E4C4",
+ "FrozenHeaderBg": "#D8E8F0",
+ "MuteTint": "#F0D9D3",
+ "Veil": "#F2EFE6",
+ "TooltipBg": "#2A251C",
+ "TooltipText": "#F5EEDC",
+ "KeyWhite": "#F3EFE4",
+ "KeyBlack": "#DAD3C2",
+ "MiniKeyWhite": "#F5F1E4",
+ "MiniKeyBlack": "#38332A",
+ "ShadeUp": "#FFFCF2",
+ "ShadeDown": "#3A3227",
+ "Master": "#746D5C",
+ "Track1": "#328140",
+ "Track2": "#306F53",
+ "Track3": "#256464",
+ "Track4": "#317187",
+ "Track5": "#985127",
+ "Track6": "#4B4082",
+ "Track7": "#7F3450",
+ "Track8": "#6C752C",
+ "Track9": "#598C69",
+ "ReturnA": "#598C69",
+ "ReturnB": "#3E6A4D",
+ "SystemAccent": "#AD7716",
+ "SystemAccentLight1": "#B78732",
+ "SystemAccentLight2": "#C1984E",
+ "SystemAccentLight3": "#CBA86A",
+ "SystemAccentDark1": "#9C6B14",
+ "SystemAccentDark2": "#8A5F12",
+ "SystemAccentDark3": "#79530F",
+ "ShadowBevel": "#66FFFFFF",
+ "ShadowPopover": "#381A150E",
+ "ShadowModal": "#401A150E"
+ }
+}
diff --git a/tests/Nota.SmokeTest/LocalizationAllowList.txt b/tests/Nota.SmokeTest/LocalizationAllowList.txt
index a1965fbc..e3e9a069 100644
--- a/tests/Nota.SmokeTest/LocalizationAllowList.txt
+++ b/tests/Nota.SmokeTest/LocalizationAllowList.txt
@@ -2133,6 +2133,7 @@ Nota.App/PreferencesWindow.cs Updates # data: stable page id (Page.Id); the show
Nota.App/SessionView.Mixer.cs Ext Out 1/2 # data: hardware output name
Nota.App/Theme/NotaColourTheme.cs $"{id}: file declares id '{theme.Id}'" # data: diagnostics for people writing a theme file
Nota.App/Theme/NotaColourTheme.cs $"{id}: no theme file" # data: diagnostics for people writing a theme file
+Nota.App/Theme/NotaColourTheme.cs $"{id}: no classic palette" # data: diagnostics for people writing a theme file
Nota.App/Theme/NotaColourTheme.cs Bevel # data: theme token name
Nota.App/Theme/NotaColourTheme.cs Well # data: theme token name
Nota.App/Theme/NotaTextSize.cs Fixed # data: attached property name
diff --git a/tests/Nota.SmokeTest/LooksCheck.cs b/tests/Nota.SmokeTest/LooksCheck.cs
new file mode 100644
index 00000000..92551f96
--- /dev/null
+++ b/tests/Nota.SmokeTest/LooksCheck.cs
@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright (c) 2026 Egor Khindikaynen (Nota). See LICENSES/ for license terms.
+//
+// The classic look (spec 091) as data: reading and storing the choice, the classic corner
+// scale, how a skin composes with either look, and the format-3 theme file that adds a
+// typeface for values. No UI — the wearing is the app's; these are the rules it follows.
+
+using Nota.Application;
+using Nota.Application.Themes;
+
+namespace Nota.SmokeTest;
+
+internal static class LooksCheck
+{
+ public static IEnumerable<(bool Ok, string Label)> Run()
+ {
+ // ---- Resolve / Store ----------------------------------------------------------------
+ var cases = new (string Stored, Look Want)[]
+ {
+ ("", Look.New), ("new", Look.New), ("classic", Look.Classic), ("Classic", Look.New), ("x", Look.New),
+ };
+ foreach (var (stored, want) in cases)
+ {
+ var s = new Settings { Look = stored };
+ var got = Looks.Resolve(s);
+ yield return (got == want && s.Look == stored, $"looks: \"{stored}\" reads as {want} and is not rewritten (got {got})");
+ }
+ foreach (var look in new[] { Look.New, Look.Classic })
+ {
+ var s = new Settings();
+ Looks.Store(s, look);
+ yield return (Looks.Resolve(s) == look, $"looks: {look} round-trips through settings (\"{s.Look}\")");
+ }
+ yield return (new Settings().Look == "" && Looks.Resolve(new Settings()) == Look.New, "looks: a fresh install is New");
+ yield return (Looks.Parse("classic") == Look.Classic && Looks.Parse("new") == Look.New && Looks.Parse("old") is null,
+ "looks: MCP ids parse; an unknown id is refused");
+
+ // ---- Clip style (User Story 4) --------------------------------------------------------
+ foreach (var (stored, look, want) in new (string, string, ClipStyle)[]
+ {
+ ("", "", ClipStyle.Tinted), ("", "classic", ClipStyle.Solid), ("tinted", "classic", ClipStyle.Tinted),
+ ("solid", "", ClipStyle.Solid), ("x", "classic", ClipStyle.Solid), ("x", "", ClipStyle.Tinted),
+ })
+ {
+ var s = new Settings { ClipStyle = stored, Look = look };
+ yield return (Looks.ClipStyleOf(s) == want, $"clips: \"{stored}\" under \"{look}\" is {want} (got {Looks.ClipStyleOf(s)})");
+ }
+ {
+ var s = new Settings { Look = "classic" };
+ Looks.StoreClipStyle(s, ClipStyle.Tinted);
+ Looks.Store(s, Look.New); Looks.Store(s, Look.Classic);
+ yield return (Looks.ClipStyleOf(s) == ClipStyle.Tinted, "clips: a pick survives look changes");
+ }
+
+ // ---- Compose ------------------------------------------------------------------------
+ var steps = Enum.GetValues<RadiusStep>();
+ var none = new Dictionary<RadiusStep, double>();
+
+ var newDefault = Looks.Compose(SkinGeometry.Default, Look.New);
+ yield return (newDefault.IsDefault && steps.All(st => newDefault.MapRadius(SkinGeometry.Design(st)) == SkinGeometry.Design(st)),
+ "looks: default skin under New is the design scale, an exact no-op");
+
+ var classic = Looks.Compose(SkinGeometry.Default, Look.Classic);
+ var wantSteps = new[] { 3.0, 3, 3, 2, 2, 2, 2 };
+ var gotSteps = steps.Select(st => classic.RadiusOf(st)).ToArray();
+ yield return (gotSteps.SequenceEqual(wantSteps), $"looks: Classic steps are 3/3/3/2/2/2/2 (got {string.Join("/", gotSteps)})");
+ yield return (classic.MapRadius(9) == 3 && classic.MapRadius(6) == 3 && classic.MapRadius(2) == 2
+ && classic.MapRadius(0) == 0 && classic.MapRadius(10) == 4 && classic.FontFamily is null && classic.ValuesFamily is null,
+ "looks: Classic maps card 9→3, field 6→3, fine 2→2, docked 0→0, off-scale 10→4; Geist stays");
+
+ var fontOnly = new SkinGeometry("Helvetica", 1, none);
+ var fontClassic = Looks.Compose(fontOnly, Look.Classic);
+ yield return (fontClassic.FontFamily == "Helvetica" && fontClassic.RadiusOf(RadiusStep.Card) == 3,
+ "looks: a skin with only a typeface keeps it under Classic and takes the classic corners");
+ yield return (Looks.Compose(fontOnly, Look.New).Equals(fontOnly), "looks: the same skin under New is unchanged");
+
+ var square = new SkinGeometry("Helvetica", 0, none, null, true);
+ var squareClassic = Looks.Compose(square, Look.Classic);
+ yield return (squareClassic.Equals(square) && steps.All(st => squareClassic.RadiusOf(st) == 0),
+ "looks: a skin that sets its radii (scale 0) keeps them under Classic");
+
+ var designRadius = new SkinGeometry(null, 1, none, null, true);
+ yield return (Looks.Compose(designRadius, Look.Classic).RadiusOf(RadiusStep.Card) == 9,
+ "looks: a skin whose radius object is the design scale keeps 9 under Classic");
+
+ var values = new SkinGeometry(null, 1, none, "Menlo");
+ yield return (Looks.Compose(values, Look.Classic).ValuesFamily == "Menlo" && Looks.Compose(values, Look.New).ValuesFamily == "Menlo",
+ "looks: a skin's values typeface is worn under both looks");
+
+ // ---- Format 3 -------------------------------------------------------------------------
+ foreach (var r in Format3()) yield return r;
+ }
+
+ private static IEnumerable<(bool Ok, string Label)> Format3()
+ {
+ var catalogue = new[] { "BgApp" };
+ var none = new HashSet<string>();
+ string File(int version, string font, string radius = "") =>
+ $$"""{ "formatVersion": {{version}}, "id": "t", "name": "T", "kind": "dark", {{font}}{{radius}} "colors": { "BgApp": "#101010" } }""";
+ ThemeValidation V(string json) => ThemeFile.Validate(json, catalogue, none);
+ bool Names(ThemeValidation v, string field) => !v.IsValid && v.Problems.Any(p => p.Field == field);
+
+ var both = V(File(3, """ "font": { "family": "Helvetica", "values": "Menlo" }, """));
+ yield return (both.IsValid && both.Theme!.Geometry.FontFamily == "Helvetica" && both.Theme.Geometry.ValuesFamily == "Menlo"
+ && both.Theme.FormatVersion == 3, "skins v3: family + values validate");
+ var valuesOnly = V(File(3, """ "font": { "values": "Menlo" }, """));
+ yield return (valuesOnly.IsValid && valuesOnly.Theme!.Geometry.FontFamily is null && valuesOnly.Theme.Geometry.ValuesFamily == "Menlo",
+ "skins v3: values alone validate");
+ yield return (Names(V(File(2, """ "font": { "family": "Helvetica", "values": "Menlo" }, """)), "font.values"),
+ "skins v3: font.values in format 2 is a problem naming font.values");
+ yield return (Names(V(File(3, """ "font": { "values": " " }, """)), "font.values"), "skins v3: an empty values name is a problem");
+ yield return (Names(V(File(3, $$""" "font": { "values": "{{new string('a', 101)}}" }, """)), "font.values"),
+ "skins v3: a 101-character values name is a problem");
+ yield return (Names(V(File(3, """ "font": { "values": "Menlo", "mono": "x" }, """)), "font.mono"),
+ "skins v3: an unknown font key is a problem naming it");
+ yield return (Names(V(File(3, """ "font": { }, """)), "font.family"), "skins v3: an empty font object is a problem");
+ yield return (!V(File(4, "")).IsValid, "skins v3: format 4 is refused");
+
+ var missing = ThemeFile.Validate(File(3, """ "font": { "values": "Nope Mono" }, """), catalogue, none, _ => false);
+ yield return (missing.IsValid && missing.Warnings.Any(w => w.Kind == ThemeWarning.FontMissing && w.Tokens.Contains("Nope Mono")),
+ "skins v3: a values font that is not installed warns and still loads");
+
+ var radiusOnly = V(File(2, "", """ "radius": { }, """));
+ yield return (radiusOnly.IsValid && radiusOnly.Theme!.Geometry.HasRadius, "skins: an empty radius object counts as the skin setting its radii");
+ var v1 = V(File(1, ""));
+ yield return (v1.IsValid && v1.Theme!.Geometry.IsDefault && !v1.Theme.Geometry.HasRadius, "skins: format 1 is the default geometry");
+
+ // Round trips: the writer picks the lowest format that holds the geometry.
+ foreach (var (label, json, version) in new[]
+ {
+ ("format 1", File(1, ""), 1),
+ ("format 2 font", File(2, """ "font": { "family": "Helvetica" }, """), 2),
+ ("format 2 radius", File(2, "", """ "radius": { "scale": 0.5 }, """), 2),
+ ("format 3", File(3, """ "font": { "values": "Menlo" }, """), 3),
+ })
+ {
+ var t = V(json).Theme!;
+ var again = V(ThemeFile.Write(t, catalogue));
+ yield return (again.IsValid && again.Theme!.FormatVersion == version && again.Theme.Geometry.Equals(t.Geometry),
+ $"skins: {label} writes back as format {version} with the same geometry");
+ }
+ }
+}
diff --git a/tests/Nota.SmokeTest/Program.cs b/tests/Nota.SmokeTest/Program.cs
index e441c4c6..404c32ad 100644
--- a/tests/Nota.SmokeTest/Program.cs
+++ b/tests/Nota.SmokeTest/Program.cs
@@ -99,6 +99,9 @@ if (args.Contains("--hosted-render-pool"))
foreach (var (ok, label) in Nota.SmokeTest.DesignTokenCheck.RunThemes()) Check(ok, label);
Console.WriteLine("-- design: user skins --");
foreach (var (ok, label) in Nota.SmokeTest.DesignTokenCheck.RunSkins()) Check(ok, label);
+ Console.WriteLine("-- design: classic look --");
+ foreach (var (ok, label) in Nota.SmokeTest.LooksCheck.Run()) Check(ok, label);
+ foreach (var (ok, label) in Nota.SmokeTest.DesignTokenCheck.RunClassicPalettes()) Check(ok, label);
Console.WriteLine("-- design: splash art --");
foreach (var (ok, label) in Nota.SmokeTest.SplashArtTests.Run()) Check(ok, label);
Console.WriteLine("-- design: appearance --");