Skip to content

armgit / nota

Public Imported from GitHub
0

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

(style) Fix paddings for device panel

Egor Khindikaynene864c0a5d757
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3eb34398..974dcfff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,9 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.
from the browser selects the track it landed on — a newly created track included — in
both the arrangement and the session view. Moving clips to another track, or dropping a
clip onto a Sampler / Drum Rack / Grain track, selects the destination track too.
+- **Clearer device selection:** the selected device is outlined by a ring just outside the
+ card instead of on its edge, so it no longer crowds the device name or the preset picker.
+ The Devices / Pattern / Clip tabs sit a little lower, clear of the panel's top edge.
### Fixed
- **Nota Reverb no longer fires a loud, looping metallic burst:** after a few minutes of
diff --git a/src/managed/Nota.App/DeviceChainView.Shell.cs b/src/managed/Nota.App/DeviceChainView.Shell.cs
index 4054c319..0088bee4 100644
--- a/src/managed/Nota.App/DeviceChainView.Shell.cs
+++ b/src/managed/Nota.App/DeviceChainView.Shell.cs
@@ -286,21 +286,27 @@ public sealed partial class DeviceChainView
var bodyHost = new Border { Child = body };
var root = new DockPanel { LastChildFill = true, Children = { headerBar, bodyHost } };
bool sel = IsSelected(s.Kind, di);
- // Selection is drawn as an inset overlay ring (not by thickening the card's own edge
- // border): the edge border sits on the rounded-clip boundary under the square-cornered
- // header, where a 2px stroke reads as "cut after the curve". The overlay lives safely
- // inside the clip so its rounded corners render cleanly.
+ // Selection is drawn as a focus ring outside the card, with a small gap (not by
+ // thickening the card's own edge border, nor as an inset overlay): drawn on or inside
+ // the edge it crowds the header — the title and the preset picker read as touching it.
+ // The ring hangs outside the clipped shell; the chain row's margin and spacing leave it room.
+ const double RingGap = 3;
var selRing = new Border
{
- BorderBrush = AccentBright, BorderThickness = new Thickness(1),
- CornerRadius = NotaRadius.Body, Margin = new Thickness(0.5),
+ BorderBrush = AccentBright, BorderThickness = new Thickness(1.5),
+ CornerRadius = new CornerRadius(NotaRadius.BodyValue + RingGap), Margin = new Thickness(-RingGap),
IsHitTestVisible = false, IsVisible = sel,
};
- var card = new Border
+ var shell = new Border
{
- Width = s.Width, Height = CardH, Background = ShellBg, BorderBrush = BorderDef,
+ Background = ShellBg, BorderBrush = BorderDef,
BorderThickness = new Thickness(1), CornerRadius = NotaRadius.Body, ClipToBounds = true,
- Child = new Panel { Children = { root, selRing } },
+ Child = root,
+ };
+ var card = new Border
+ {
+ Width = s.Width, Height = CardH,
+ Child = new Panel { Children = { shell, selRing } },
};
// Bypassed: the body loses its brass but stays playable (almanac: no opacity for state).
if (s.Bypassed) card.AttachedToVisualTree += (_, _) => Inactive.Set(bodyHost, true, interactive: true);
diff --git a/src/managed/Nota.App/MainWindow.Detail.cs b/src/managed/Nota.App/MainWindow.Detail.cs
index e913a1e4..026000da 100644
--- a/src/managed/Nota.App/MainWindow.Detail.cs
+++ b/src/managed/Nota.App/MainWindow.Detail.cs
@@ -345,7 +345,7 @@ public partial class MainWindow
DetailDevicesBtn.IsChecked = true;
DetailPatternBtn.IsChecked = false;
DetailClipBtn.IsChecked = false;
- ShowDetail(332, honorPersist: false); // Devices: natural card-fitting height (island: +12 gutter under it)
+ ShowDetail(338, honorPersist: false); // Devices: natural card-fitting height (island: +12 gutter under it, +6 header top inset)
}
private void OpenClipEditor(int trackId, int clipIndex)
diff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axaml
index 364b7f82..de243d2b 100644
--- a/src/managed/Nota.App/MainWindow.axaml
+++ b/src/managed/Nota.App/MainWindow.axaml
@@ -457,7 +457,7 @@
BorderThickness="1" CornerRadius="{StaticResource Radius.Panel}">
<DockPanel>
<!-- Header: mode tabs · track chip (routing/PDC) · Freeze · | · pop out · close -->
- <Grid DockPanel.Dock="Top" Height="32" Margin="8,0,10,0" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto">
+ <Grid DockPanel.Dock="Top" Height="32" Margin="8,6,10,0" ColumnDefinitions="Auto,*,Auto,Auto,Auto,Auto">
<Border Classes="segmented" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" Spacing="2">
<ToggleButton x:Name="DetailDevicesBtn" Classes="seg" Content="Devices" Click="OnDetailDevices"/>