fead.圆角，终于统一

LanMountainDesktop/Services/AppearanceThemeService.cs

@@ -44,7 +44,7 @@ public sealed record AppearanceThemeSnapshot(
     string ThemeColorMode,
     string? UserThemeColor,
     string? SelectedWallpaperSeed,
-    double GlobalCornerRadiusScale,
+    string CornerRadiusStyle,
     AppearanceCornerRadiusTokens CornerRadiusTokens,
     string ResolvedSeedSource,
     MonetPalette MonetPalette,
@@ -551,7 +551,7 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
         if (!refreshAll &&
             !changedKeys.Contains(nameof(AppSettingsSnapshot.IsNightMode), StringComparer.OrdinalIgnoreCase) &&
             !changedKeys.Contains(nameof(AppSettingsSnapshot.UseSystemChrome), StringComparer.OrdinalIgnoreCase) &&
-            !changedKeys.Contains(nameof(AppSettingsSnapshot.GlobalCornerRadiusScale), StringComparer.OrdinalIgnoreCase) &&
+            !changedKeys.Contains(nameof(AppSettingsSnapshot.CornerRadiusStyle), StringComparer.OrdinalIgnoreCase) &&
             !(respondsToThemeColor &&
               changedKeys.Contains(nameof(AppSettingsSnapshot.ThemeColor), StringComparer.OrdinalIgnoreCase)) &&
             !(respondsToWallpaper &&
@@ -573,8 +573,8 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
         bool queueWallpaperPaletteBuild)
     {
         var availableModes = _windowMaterialService.GetAvailableModes();
-        var globalCornerRadiusScale = GlobalAppearanceSettings.NormalizeCornerRadiusScale(themeState.GlobalCornerRadiusScale);
-        var cornerRadiusTokens = AppearanceCornerRadiusTokenFactory.Create(globalCornerRadiusScale);
+        var cornerRadiusStyle = GlobalAppearanceSettings.NormalizeCornerRadiusStyle(themeState.CornerRadiusStyle);
+        var cornerRadiusTokens = AppearanceCornerRadiusTokenFactory.Create(cornerRadiusStyle);
         MonetPalette palette;
         IReadOnlyList<Color> wallpaperSeedCandidates;
         Color effectiveSeedColor;
@@ -614,7 +614,7 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
             themeColorMode,
             themeState.ThemeColor,
             selectedWallpaperSeed,
-            globalCornerRadiusScale,
+            cornerRadiusStyle,
             cornerRadiusTokens,
             resolvedSeedSource,
             palette,

LanMountainDesktop/Services/DesktopComponentRegistryFactory.cs

@@ -129,7 +129,6 @@ public static class DesktopComponentRegistryFactory
                 settingsService);
             var appearanceSnapshot = HostAppearanceThemeProvider.GetOrCreate().GetCurrent();
             var pluginAppearance = new PluginAppearanceContext(new PluginAppearanceSnapshot(
-                GlobalCornerRadiusScale: appearanceSnapshot.GlobalCornerRadiusScale,
                 CornerRadiusTokens: PluginCornerRadiusTokens.FromShared(appearanceSnapshot.CornerRadiusTokens),
                 ThemeVariant: appearanceSnapshot.IsNightMode ? "Dark" : "Light"));
             var pluginContext = new PluginDesktopComponentContext(
@@ -157,7 +156,6 @@ public static class DesktopComponentRegistryFactory
     private static IPluginAppearanceContext CreatePluginAppearanceContext(ComponentChromeContext chromeContext)
     {
         return new PluginAppearanceContext(new PluginAppearanceSnapshot(
-            GlobalCornerRadiusScale: chromeContext.GlobalCornerRadiusScale,
             CornerRadiusTokens: PluginCornerRadiusTokens.FromShared(chromeContext.CornerRadiusTokens),
             ThemeVariant: "Unknown"));
     }

LanMountainDesktop/Services/IComponentLibraryService.cs

@@ -20,7 +20,6 @@ public sealed record ComponentLibraryCategoryEntry(
 
 public sealed record ComponentLibraryCreateContext(
     double CellSize,
-    double GlobalCornerRadiusScale,
     TimeZoneService TimeZoneService,
     IWeatherInfoService WeatherInfoService,
     IRecommendationInfoService RecommendationInfoService,

LanMountainDesktop/Services/Settings/SettingsContracts.cs

@@ -30,7 +30,7 @@ public sealed record ThemeAppearanceSettingsState(
     bool IsNightMode,
     string? ThemeColor,
     bool UseSystemChrome,
-    double GlobalCornerRadiusScale = GlobalAppearanceSettings.DefaultCornerRadiusScale,
+    string CornerRadiusStyle = GlobalAppearanceSettings.DefaultCornerRadiusStyle,
     string ThemeColorMode = ThemeAppearanceValues.ColorModeDefaultNeutral,
     string SystemMaterialMode = ThemeAppearanceValues.MaterialNone,
     string? SelectedWallpaperSeed = null);

LanMountainDesktop/Services/Settings/SettingsDomainServices.cs

@@ -254,11 +254,19 @@ internal sealed class ThemeAppearanceService : IThemeAppearanceService
     public ThemeAppearanceSettingsState Get()
     {
         var snapshot = _settingsService.Load();
+        var cornerRadiusStyle = GlobalAppearanceSettings.NormalizeCornerRadiusStyle(snapshot.CornerRadiusStyle);
+        if (string.Equals(cornerRadiusStyle, GlobalAppearanceSettings.DefaultCornerRadiusStyle, StringComparison.OrdinalIgnoreCase) &&
+            string.IsNullOrWhiteSpace(snapshot.CornerRadiusStyle) &&
+            Math.Abs(snapshot.GlobalCornerRadiusScale - GlobalAppearanceSettings.DefaultCornerRadiusScale) > 0.01)
+        {
+            cornerRadiusStyle = GlobalAppearanceSettings.MigrateScaleToStyle(snapshot.GlobalCornerRadiusScale);
+        }
+
         return new ThemeAppearanceSettingsState(
             snapshot.IsNightMode ?? false,
             snapshot.ThemeColor,
             snapshot.UseSystemChrome,
-            GlobalAppearanceSettings.NormalizeCornerRadiusScale(snapshot.GlobalCornerRadiusScale),
+            cornerRadiusStyle,
             ThemeAppearanceValues.NormalizeThemeColorMode(snapshot.ThemeColorMode, snapshot.ThemeColor),
             ThemeAppearanceValues.NormalizeSystemMaterialMode(snapshot.SystemMaterialMode),
             snapshot.SelectedWallpaperSeed);
@@ -269,7 +277,7 @@ internal sealed class ThemeAppearanceService : IThemeAppearanceService
         var snapshot = _settingsService.Load();
         var changedKeys = new List<string>();
         var normalizedThemeColor = string.IsNullOrWhiteSpace(state.ThemeColor) ? null : state.ThemeColor;
-        var normalizedCornerRadiusScale = GlobalAppearanceSettings.NormalizeCornerRadiusScale(state.GlobalCornerRadiusScale);
+        var normalizedCornerRadiusStyle = GlobalAppearanceSettings.NormalizeCornerRadiusStyle(state.CornerRadiusStyle);
         var normalizedThemeColorMode = ThemeAppearanceValues.NormalizeThemeColorMode(state.ThemeColorMode, state.ThemeColor);
         var normalizedSystemMaterialMode = ThemeAppearanceValues.NormalizeSystemMaterialMode(state.SystemMaterialMode);
         var normalizedSelectedWallpaperSeed = string.IsNullOrWhiteSpace(state.SelectedWallpaperSeed)
@@ -294,10 +302,10 @@ internal sealed class ThemeAppearanceService : IThemeAppearanceService
             changedKeys.Add(nameof(AppSettingsSnapshot.UseSystemChrome));
         }
 
-        if (Math.Abs(GlobalAppearanceSettings.NormalizeCornerRadiusScale(snapshot.GlobalCornerRadiusScale) - normalizedCornerRadiusScale) > 0.0001d)
+        if (!string.Equals(GlobalAppearanceSettings.NormalizeCornerRadiusStyle(snapshot.CornerRadiusStyle), normalizedCornerRadiusStyle, StringComparison.OrdinalIgnoreCase))
         {
-            snapshot.GlobalCornerRadiusScale = normalizedCornerRadiusScale;
-            changedKeys.Add(nameof(AppSettingsSnapshot.GlobalCornerRadiusScale));
+            snapshot.CornerRadiusStyle = normalizedCornerRadiusStyle;
+            changedKeys.Add(nameof(AppSettingsSnapshot.CornerRadiusStyle));
         }
 
         if (!string.Equals(snapshot.ThemeColorMode, normalizedThemeColorMode, StringComparison.OrdinalIgnoreCase))