0.7.0.2

2026-06-23 01:44:26 +08:00 · 2026-03-20 18:05:42 +08:00
parent 65a3cf832a
commit 20cd6041a7
15 changed files with 170 additions and 30 deletions
--- a/LanMountainDesktop.Tests/CornerRadiusScaleTests.cs
+++ b/LanMountainDesktop.Tests/CornerRadiusScaleTests.cs
@@ -0,0 +1,67 @@
+using Avalonia;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Settings.Core;
+using LanMountainDesktop.Shared.Contracts;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class CornerRadiusScaleTests
+{
+    [Theory]
+    [InlineData(-1d, 0d)]
+    [InlineData(0d, 0d)]
+    [InlineData(0.33d, 0.33d)]
+    [InlineData(1.234d, 1.234d)]
+    [InlineData(2.5d, 2.5d)]
+    [InlineData(3d, 2.5d)]
+    public void NormalizeCornerRadiusScale_ClampsWithoutSnapping(double input, double expected)
+    {
+        Assert.Equal(expected, GlobalAppearanceSettings.NormalizeCornerRadiusScale(input), 3);
+    }
+
+    [Fact]
+    public void NormalizeCornerRadiusScale_UsesDefaultForInvalidValues()
+    {
+        Assert.Equal(
+            GlobalAppearanceSettings.DefaultCornerRadiusScale,
+            GlobalAppearanceSettings.NormalizeCornerRadiusScale(double.NaN),
+            3);
+        Assert.Equal(
+            GlobalAppearanceSettings.DefaultCornerRadiusScale,
+            GlobalAppearanceSettings.NormalizeCornerRadiusScale(double.PositiveInfinity),
+            3);
+    }
+
+    [Fact]
+    public void PluginDesktopComponentContext_AllowsZeroRadiusScaling()
+    {
+        var context = new PluginDesktopComponentContext(
+            new PluginManifest("plugin.id", "Plugin Name", "plugin.dll"),
+            "C:\\Plugins\\plugin.id",
+            "C:\\Data\\plugin.id",
+            new NullServiceProvider(),
+            new Dictionary<string, object?>(),
+            "component-1",
+            null,
+            96d,
+            0d,
+            new AppearanceCornerRadiusTokens(
+                new CornerRadius(6),
+                new CornerRadius(10),
+                new CornerRadius(14),
+                new CornerRadius(18),
+                new CornerRadius(24),
+                new CornerRadius(30),
+                new CornerRadius(36)));
+
+        Assert.Equal(0d, context.GlobalCornerRadiusScale, 3);
+        Assert.Equal(0d, context.ResolveScaledCornerRadius(12d), 3);
+        Assert.Equal(0d, context.ResolveScaledCornerRadius(12d, 8d, 18d), 3);
+    }
+
+    private sealed class NullServiceProvider : IServiceProvider
+    {
+        public object? GetService(Type serviceType) => null;
+    }
+}
--- a/LanMountainDesktop.Tests/DesktopComponentRuntimeRegistrationCornerRadiusTests.cs
+++ b/LanMountainDesktop.Tests/DesktopComponentRuntimeRegistrationCornerRadiusTests.cs
@@ -0,0 +1,58 @@
+using Avalonia;
+using Avalonia.Controls;
+using LanMountainDesktop.Host.Abstractions;
+using LanMountainDesktop.Shared.Contracts;
+using LanMountainDesktop.Views.Components;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class DesktopComponentRuntimeRegistrationCornerRadiusTests
+{
+    [Fact]
+    public void LegacyCellSizeResolver_AppliesGlobalCornerRadiusScale()
+    {
+        var registration = new DesktopComponentRuntimeRegistration(
+            componentId: "test.component",
+            displayNameLocalizationKey: null,
+            controlFactory: () => new Border(),
+            cornerRadiusResolver: cellSize => Math.Clamp(cellSize * 0.30, 10, 40));
+
+        var resolver = Assert.IsType<Func<ComponentChromeContext, double>>(registration.CornerRadiusResolver);
+        var resolved = resolver(CreateChromeContext(cellSize: 120, globalScale: 2.0));
+
+        Assert.Equal(72.0, resolved, 3);
+    }
+
+    [Fact]
+    public void ChromeContextResolver_IsNotDoubleScaledByRegistrationWrapper()
+    {
+        var registration = new DesktopComponentRuntimeRegistration(
+            componentId: "test.component",
+            displayNameLocalizationKey: null,
+            controlFactory: _ => new Border(),
+            cornerRadiusResolver: chromeContext => chromeContext.CellSize + chromeContext.GlobalCornerRadiusScale);
+
+        var resolver = Assert.IsType<Func<ComponentChromeContext, double>>(registration.CornerRadiusResolver);
+        var resolved = resolver(CreateChromeContext(cellSize: 50, globalScale: 2.5));
+
+        Assert.Equal(52.5, resolved, 3);
+    }
+
+    private static ComponentChromeContext CreateChromeContext(double cellSize, double globalScale)
+    {
+        return new ComponentChromeContext(
+            ComponentId: "test.component",
+            PlacementId: null,
+            CellSize: cellSize,
+            GlobalCornerRadiusScale: globalScale,
+            CornerRadiusTokens: new AppearanceCornerRadiusTokens(
+                new CornerRadius(6),
+                new CornerRadius(10),
+                new CornerRadius(14),
+                new CornerRadius(18),
+                new CornerRadius(24),
+                new CornerRadius(30),
+                new CornerRadius(36)));
+    }
+}