Skip to content

armgit / nota

Public Imported from GitHub
0

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

(fix) Track headers: a wider column and a Link key in the new look (#296)

Egor Khindikaynena1181ebc9def
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae63eace..9f27d829 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -156,6 +156,9 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
notes in their articulation's colour instead of the track's.
### Changed
+- **Track headers, a little wider** (#296): the header column now starts at 252 px instead
+ of 228, so names and controls breathe in the new look. A width you dragged yourself stays.
+ A group's **Link** key now matches M and S in the new look.
- **Settings, reorganised** (#427, specs/088): every setting is on a page named for it.
- **Outputs** and **Inputs** are their own pages under Devices: the output device and the
test tone on one, the input device and the list of inputs with their switches and names
diff --git a/src/managed/Nota.App/ArrangementView.Link.cs b/src/managed/Nota.App/ArrangementView.Link.cs
index 6992dd97..ea3d251f 100644
--- a/src/managed/Nota.App/ArrangementView.Link.cs
+++ b/src/managed/Nota.App/ArrangementView.Link.cs
@@ -183,17 +183,18 @@ public sealed partial class ArrangementView
if (on) StatusMessage?.Invoke(Loc.T("arrangement.link.the_groups_tracks_are_linked"));
}
- /// <summary>The group header's Link key: a chain-link chip, accent-filled while on.</summary>
+ /// <summary>The group header's Link key: a header key like M and S (a well, no rim),
+ /// accent-filled while on.</summary>
private Control LinkToggle(TrackVM t)
{
- var glyph = new Glyph(GlyphKind.ChainLink, 10);
- var chip = new Border
+ var glyph = new Glyph(GlyphKind.ChainLink, 10)
{
- Width = 18, Height = 16, CornerRadius = NotaRadius.Field, BorderThickness = new Thickness(1),
- Child = glyph, Cursor = new Cursor(StandardCursorType.Hand),
+ HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center,
};
+ var chip = HeaderKey(glyph);
ToolTip.SetTip(chip, LinkTip);
- PaintLinkChip(chip, glyph, t.EditLink);
+ chip.Background = t.EditLink ? NotaPalette.Accent : NotaPalette.Well;
+ glyph.Foreground = t.EditLink ? NotaPalette.TextOnAccent : NotaPalette.TextSecondary;
chip.PointerPressed += (_, e) =>
{
if (!e.GetCurrentPoint(chip).Properties.IsLeftButtonPressed) return;
diff --git a/src/managed/Nota.App/ArrangementView.Sizing.cs b/src/managed/Nota.App/ArrangementView.Sizing.cs
index da28076f..81b9b20f 100644
--- a/src/managed/Nota.App/ArrangementView.Sizing.cs
+++ b/src/managed/Nota.App/ArrangementView.Sizing.cs
@@ -35,7 +35,7 @@ public sealed partial class ArrangementView
private static readonly double[] RowPresets = { CompactRowHeight, StandardRowHeight, LargeRowHeight };
// Header column: 160–480 px, and never so wide that the lanes drop under 240 px.
- internal const double DefaultHeaderW = 228;
+ internal const double DefaultHeaderW = 252;
internal const double MinHeaderW = 160;
internal const double MaxHeaderW = 480;
private const double MinLanesW = 240;