fead.圆角，终于统一

2026-06-20 23:54:26 +08:00 · 2026-04-08 00:55:10 +08:00
parent e1d5a0c6de
commit 8583465a67
34 changed files with 514 additions and 340 deletions
--- a/LanMountainDesktop.Tests/BuiltInDesktopHostCornerRadiusBaselineTests.cs
+++ b/LanMountainDesktop.Tests/BuiltInDesktopHostCornerRadiusBaselineTests.cs
@@ -11,19 +11,19 @@ namespace LanMountainDesktop.Tests;
 public sealed class BuiltInDesktopHostCornerRadiusBaselineTests
 {
    [Theory]
-    [InlineData(80d, 0d)]
-    [InlineData(120d, 1d)]
-    [InlineData(160d, 2.5d)]
-    public void BuiltInDesktopHosts_ResolveToTheUnifiedLgBaseline(double cellSize, double globalScale)
+    [InlineData(80d, "Sharp")]
+    [InlineData(120d, "Balanced")]
+    [InlineData(160d, "Rounded")]
+    public void BuiltInDesktopHosts_ResolveToTheUnifiedLgBaseline(double cellSize, string style)
    {
        var registry = new DesktopComponentRuntimeRegistry(
            ComponentRegistry.CreateDefault(),
            DesktopComponentRuntimeRegistry.GetDefaultRegistrations());
-        var expected = AppearanceCornerRadiusTokenFactory.Create(globalScale).Component.TopLeft;
+        var expected = AppearanceCornerRadiusTokenFactory.Create(style).Component.TopLeft;

        foreach (var descriptor in registry.GetDesktopComponents())
        {
-            var resolved = descriptor.ResolveCornerRadius(CreateChromeContext(descriptor.Definition.Id, cellSize, globalScale));
+            var resolved = descriptor.ResolveCornerRadius(CreateChromeContext(descriptor.Definition.Id, cellSize, style));
            Assert.Equal(expected, resolved, 3);
        }
    }
@@ -31,13 +31,12 @@ public sealed class BuiltInDesktopHostCornerRadiusBaselineTests
    private static ComponentChromeContext CreateChromeContext(
        string componentId,
        double cellSize,
-        double globalScale)
+        string style)
    {
        return new ComponentChromeContext(
            componentId,
            null,
            cellSize,
-            globalScale,
-            AppearanceCornerRadiusTokenFactory.Create(globalScale));
+            AppearanceCornerRadiusTokenFactory.Create(style));
    }
 }
--- a/LanMountainDesktop.Tests/CornerRadiusScaleTests.cs
+++ b/LanMountainDesktop.Tests/CornerRadiusScaleTests.cs
@@ -1,93 +0,0 @@
-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 appearanceContext = new PluginAppearanceContext(new PluginAppearanceSnapshot(
-            GlobalCornerRadiusScale: 0d,
-            CornerRadiusTokens: PluginCornerRadiusTokens.FromShared(new AppearanceCornerRadiusTokens(
-                new CornerRadius(6),
-                new CornerRadius(12),
-                new CornerRadius(14),
-                new CornerRadius(20),
-                new CornerRadius(28),
-                new CornerRadius(32),
-                new CornerRadius(36),
-                new CornerRadius(8))),
-            ThemeVariant: "Unknown"));
-
-        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,
-            appearanceContext);
-
-        Assert.Equal(0d, context.GlobalCornerRadiusScale, 3);
-        Assert.Equal(0d, context.ResolveScaledCornerRadius(12d), 3);
-        Assert.Equal(0d, context.ResolveScaledCornerRadius(12d, 8d, 18d), 3);
-    }
-
-    [Fact]
-    public void PluginAppearanceContext_ResolveCornerRadius_DoesNotDoubleScalePresetTokens()
-    {
-        var context = new PluginAppearanceContext(new PluginAppearanceSnapshot(
-            GlobalCornerRadiusScale: 2d,
-            CornerRadiusTokens: new PluginCornerRadiusTokens(
-                Micro: 12d,
-                Xs: 20d,
-                Sm: 28d,
-                Md: 36d,
-                Lg: 48d,
-                Xl: 60d,
-                Island: 72d,
-                Component: 16d),
-            ThemeVariant: "Light"));
-
-        Assert.Equal(36d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md), 3);
-        Assert.Equal(36d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md, maximum: 40d), 3);
-        Assert.Equal(36d, context.ResolveScaledCornerRadius(18d), 3);
-    }
-
-    private sealed class NullServiceProvider : IServiceProvider
-    {
-        public object? GetService(Type serviceType) => null;
-    }
-}
--- a/LanMountainDesktop.Tests/CornerRadiusStyleTests.cs
+++ b/LanMountainDesktop.Tests/CornerRadiusStyleTests.cs
@@ -0,0 +1,71 @@
+using Avalonia;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Settings.Core;
+using LanMountainDesktop.Shared.Contracts;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class CornerRadiusStyleTests
+{
+    [Theory]
+    [InlineData("Sharp", "Sharp")]
+    [InlineData("Balanced", "Balanced")]
+    [InlineData("Rounded", "Rounded")]
+    [InlineData("Open", "Open")]
+    [InlineData("Unknown", "Balanced")]
+    [InlineData(null, "Balanced")]
+    public void NormalizeCornerRadiusStyle_ReturnsValidStyleOrDefault(string? input, string expected)
+    {
+        Assert.Equal(expected, GlobalAppearanceSettings.NormalizeCornerRadiusStyle(input));
+    }
+
+    [Fact]
+    public void PluginAppearanceContext_ResolveCornerRadius_ReturnsFixedTokenValues()
+    {
+        var context = new PluginAppearanceContext(new PluginAppearanceSnapshot(
+            CornerRadiusTokens: new PluginCornerRadiusTokens(
+                Micro: 6d,
+                Xs: 12d,
+                Sm: 14d,
+                Md: 20d,
+                Lg: 28d,
+                Xl: 32d,
+                Island: 36d,
+                Component: 24d),
+            ThemeVariant: "Light"));
+
+        // Preset resolution should return fixed values from tokens regardless of any legacy scale
+        Assert.Equal(20d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md), 3);
+        Assert.Equal(20d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md, maximum: 15d), 3);
+        Assert.Equal(20d, context.ResolveScaledCornerRadius(18d), 3);
+        Assert.Equal(24d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Component), 3);
+    }
+
+    [Fact]
+    public void PluginDesktopComponentContext_ProvidesDirectTokenAccess()
+    {
+        var appearanceContext = new PluginAppearanceContext(new PluginAppearanceSnapshot(
+            CornerRadiusTokens: new PluginCornerRadiusTokens(6, 12, 14, 20, 28, 32, 36, 24),
+            ThemeVariant: "Dark"));
+
+        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,
+            appearanceContext);
+
+        Assert.Equal(24d, context.ResolveScaledCornerRadius(12d), 3);
+        Assert.Equal(24d, 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
@@ -10,7 +10,7 @@ namespace LanMountainDesktop.Tests;
 public sealed class DesktopComponentRuntimeRegistrationCornerRadiusTests
 {
    [Fact]
-    public void LegacyCellSizeResolver_AppliesGlobalCornerRadiusScale()
+    public void LegacyCellSizeResolver_ReturnsUnscaledFixedValue()
    {
        var registration = new DesktopComponentRuntimeRegistration(
            componentId: "test.component",
@@ -19,41 +19,42 @@ public sealed class DesktopComponentRuntimeRegistrationCornerRadiusTests
            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));
+        // Previously: (120 * 0.30) * 2.0 = 72.0
+        // Now: (120 * 0.30) = 36.0 (No scale applied automatically by the wrapper)
+        var resolved = resolver(CreateChromeContext(cellSize: 120));

-        Assert.Equal(72.0, resolved, 3);
+        Assert.Equal(36.0, resolved, 3);
    }

    [Fact]
-    public void ChromeContextResolver_IsNotDoubleScaledByRegistrationWrapper()
+    public void ChromeContextResolver_UsesTokenValue()
    {
        var registration = new DesktopComponentRuntimeRegistration(
            componentId: "test.component",
            displayNameLocalizationKey: null,
            controlFactory: _ => new Border(),
-            cornerRadiusResolver: chromeContext => chromeContext.CellSize + chromeContext.GlobalCornerRadiusScale);
+            cornerRadiusResolver: chromeContext => chromeContext.CornerRadiusTokens.Component.TopLeft);

        var resolver = Assert.IsType<Func<ComponentChromeContext, double>>(registration.CornerRadiusResolver);
-        var resolved = resolver(CreateChromeContext(cellSize: 50, globalScale: 2.5));
+        var resolved = resolver(CreateChromeContext(cellSize: 50));

-        Assert.Equal(52.5, resolved, 3);
+        Assert.Equal(24.0, resolved, 3);
    }

-    private static ComponentChromeContext CreateChromeContext(double cellSize, double globalScale)
+    private static ComponentChromeContext CreateChromeContext(double cellSize)
    {
        return new ComponentChromeContext(
            ComponentId: "test.component",
            PlacementId: null,
            CellSize: cellSize,
-            GlobalCornerRadiusScale: globalScale,
            CornerRadiusTokens: new AppearanceCornerRadiusTokens(
-                new CornerRadius(6),
-                new CornerRadius(12),
-                new CornerRadius(14),
-                new CornerRadius(20),
-                new CornerRadius(28),
-                new CornerRadius(32),
-                new CornerRadius(36),
-                new CornerRadius(8)));
+                Micro: new CornerRadius(6),
+                Xs: new CornerRadius(12),
+                Sm: new CornerRadius(14),
+                Md: new CornerRadius(20),
+                Lg: new CornerRadius(28),
+                Xl: new CornerRadius(32),
+                Island: new CornerRadius(36),
+                Component: new CornerRadius(24)));
    }
 }
--- a/LanMountainDesktop.Tests/InfoRecommendationHostCornerRadiusTests.cs
+++ b/LanMountainDesktop.Tests/InfoRecommendationHostCornerRadiusTests.cs
@@ -48,26 +48,27 @@ public sealed class InfoRecommendationHostCornerRadiusTests
            registry.TryGetDescriptor(componentId, out var descriptor),
            $"Missing runtime registration for '{componentId}'.");

-        var zero = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, 0d));
-        var unit = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, 1d));
-        var max = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, 2.5d));
+        var sharp = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, "Sharp"));
+        var balanced = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, "Balanced"));
+        var rounded = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, "Rounded"));
+        var open = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, "Open"));

-        Assert.Equal(0d, zero, 3);
-        Assert.Equal(18d, unit, 3);
-        Assert.Equal(45d, max, 3);
-        Assert.True(zero <= unit && unit <= max);
+        // All info widgets should resolve to the Component token in the new system
+        Assert.Equal(20d, sharp, 3);
+        Assert.Equal(24d, balanced, 3);
+        Assert.Equal(28d, rounded, 3);
+        Assert.Equal(32d, open, 3);
    }

    private static ComponentChromeContext CreateChromeContext(
        string componentId,
        double cellSize,
-        double globalScale)
+        string style)
    {
        return new ComponentChromeContext(
            componentId,
            null,
            cellSize,
-            globalScale,
-            AppearanceCornerRadiusTokenFactory.Create(globalScale));
+            AppearanceCornerRadiusTokenFactory.Create(style));
    }
 }