0.6.9

改变无声

LanMountainDesktop/Services/AppearanceThemeService.cs

@@ -11,9 +11,12 @@ using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using Avalonia.Media.Imaging;
+using LanMountainDesktop.Appearance;
 using LanMountainDesktop.Models;
 using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services.Settings;
+using LanMountainDesktop.Settings.Core;
+using LanMountainDesktop.Shared.Contracts;
 using LanMountainDesktop.Theme;
 using Microsoft.Win32;
 
@@ -41,6 +44,8 @@ public sealed record AppearanceThemeSnapshot(
     string ThemeColorMode,
     string? UserThemeColor,
     string? SelectedWallpaperSeed,
+    double GlobalCornerRadiusScale,
+    AppearanceCornerRadiusTokens CornerRadiusTokens,
     string ResolvedSeedSource,
     MonetPalette MonetPalette,
     Color AccentColor,
@@ -464,6 +469,13 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
         var context = CreateThemeContext(snapshot);
         ThemeColorSystemService.ApplyThemeResources(resources, context);
         GlassEffectService.ApplyGlassResources(resources, context);
+        resources["DesignCornerRadiusMicro"] = snapshot.CornerRadiusTokens.Micro;
+        resources["DesignCornerRadiusXs"] = snapshot.CornerRadiusTokens.Xs;
+        resources["DesignCornerRadiusSm"] = snapshot.CornerRadiusTokens.Sm;
+        resources["DesignCornerRadiusMd"] = snapshot.CornerRadiusTokens.Md;
+        resources["DesignCornerRadiusLg"] = snapshot.CornerRadiusTokens.Lg;
+        resources["DesignCornerRadiusXl"] = snapshot.CornerRadiusTokens.Xl;
+        resources["DesignCornerRadiusIsland"] = snapshot.CornerRadiusTokens.Island;
     }
 
     public AppearanceMaterialSurface GetMaterialSurface(MaterialSurfaceRole role)
@@ -538,6 +550,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) &&
             !(respondsToThemeColor &&
               changedKeys.Contains(nameof(AppSettingsSnapshot.ThemeColor), StringComparer.OrdinalIgnoreCase)) &&
             !(respondsToWallpaper &&
@@ -559,6 +572,8 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
         bool queueWallpaperPaletteBuild)
     {
         var availableModes = _windowMaterialService.GetAvailableModes();
+        var globalCornerRadiusScale = GlobalAppearanceSettings.NormalizeCornerRadiusScale(themeState.GlobalCornerRadiusScale);
+        var cornerRadiusTokens = AppearanceCornerRadiusTokenFactory.Create(globalCornerRadiusScale);
         MonetPalette palette;
         IReadOnlyList<Color> wallpaperSeedCandidates;
         Color effectiveSeedColor;
@@ -598,6 +613,8 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
             themeColorMode,
             themeState.ThemeColor,
             selectedWallpaperSeed,
+            globalCornerRadiusScale,
+            cornerRadiusTokens,
             resolvedSeedSource,
             palette,
             ResolveAccentColor(themeColorMode, themeState.ThemeColor, palette),

LanMountainDesktop/Services/DesktopComponentRegistryFactory.cs

@@ -122,6 +122,7 @@ public static class DesktopComponentRegistryFactory
             var pluginSettings = new PluginScopedSettingsService(
                 contribution.Plugin.Manifest.Id,
                 settingsService);
+            var appearanceSnapshot = HostAppearanceThemeProvider.GetOrCreate().GetCurrent();
             var pluginContext = new PluginDesktopComponentContext(
                 contribution.Plugin.Manifest,
                 contribution.Plugin.Context.PluginDirectory,
@@ -131,6 +132,8 @@ public static class DesktopComponentRegistryFactory
                 contribution.Registration.ComponentId,
                 context.PlacementId,
                 context.CellSize,
+                appearanceSnapshot.GlobalCornerRadiusScale,
+                appearanceSnapshot.CornerRadiusTokens,
                 pluginSettings);
 
             return contribution.Registration.ControlFactory(contribution.Plugin.Services, pluginContext);

LanMountainDesktop/Services/IComponentLibraryService.cs

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

LanMountainDesktop/Services/Settings/SettingsCatalogService.cs

@@ -17,7 +17,7 @@ internal sealed class SettingsCatalogService : ISettingsCatalog
         [
             new SettingsSectionDefinition("general", SettingsCategories.General, SettingsScope.App, "settings.general.title", iconKey: "Settings", sortOrder: 0),
             new SettingsSectionDefinition("appearance", SettingsCategories.Appearance, SettingsScope.App, "settings.appearance.title", iconKey: "DesignIdeas", sortOrder: 10),
-            new SettingsSectionDefinition("components", SettingsCategories.Components, SettingsScope.ComponentInstance, "settings.components.title", iconKey: "GridDots", sortOrder: 20),
+            new SettingsSectionDefinition("components", SettingsCategories.Components, SettingsScope.ComponentInstance, "settings.components.title", iconKey: "Apps", sortOrder: 20),
             new SettingsSectionDefinition("plugins", SettingsCategories.Plugins, SettingsScope.Plugin, "settings.plugins.title", iconKey: "PuzzlePiece", sortOrder: 30),
             new SettingsSectionDefinition("about", SettingsCategories.About, SettingsScope.App, "settings.about.title", iconKey: "Info", sortOrder: 40)
         ]);

LanMountainDesktop/Services/Settings/SettingsContracts.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using LanMountainDesktop.Models;
 using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
+using LanMountainDesktop.Settings.Core;
 
 namespace LanMountainDesktop.Services.Settings;
 
@@ -20,6 +21,7 @@ public sealed record ThemeAppearanceSettingsState(
     bool IsNightMode,
     string? ThemeColor,
     bool UseSystemChrome,
+    double GlobalCornerRadiusScale = GlobalAppearanceSettings.DefaultCornerRadiusScale,
     string ThemeColorMode = ThemeAppearanceValues.ColorModeDefaultNeutral,
     string SystemMaterialMode = ThemeAppearanceValues.MaterialNone,
     string? SelectedWallpaperSeed = null);

LanMountainDesktop/Services/Settings/SettingsDomainServices.cs

@@ -10,6 +10,7 @@ using Avalonia.Media.Imaging;
 using LanMountainDesktop.Models;
 using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
+using LanMountainDesktop.Settings.Core;
 using LanMountainDesktop.Services.PluginMarket;
 
 namespace LanMountainDesktop.Services.Settings;
@@ -242,6 +243,7 @@ internal sealed class ThemeAppearanceService : IThemeAppearanceService
             snapshot.IsNightMode ?? false,
             snapshot.ThemeColor,
             snapshot.UseSystemChrome,
+            GlobalAppearanceSettings.NormalizeCornerRadiusScale(snapshot.GlobalCornerRadiusScale),
             ThemeAppearanceValues.NormalizeThemeColorMode(snapshot.ThemeColorMode, snapshot.ThemeColor),
             ThemeAppearanceValues.NormalizeSystemMaterialMode(snapshot.SystemMaterialMode),
             snapshot.SelectedWallpaperSeed);
@@ -252,6 +254,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 normalizedThemeColorMode = ThemeAppearanceValues.NormalizeThemeColorMode(state.ThemeColorMode, state.ThemeColor);
         var normalizedSystemMaterialMode = ThemeAppearanceValues.NormalizeSystemMaterialMode(state.SystemMaterialMode);
         var normalizedSelectedWallpaperSeed = string.IsNullOrWhiteSpace(state.SelectedWallpaperSeed)
@@ -276,6 +279,12 @@ internal sealed class ThemeAppearanceService : IThemeAppearanceService
             changedKeys.Add(nameof(AppSettingsSnapshot.UseSystemChrome));
         }
 
+        if (Math.Abs(GlobalAppearanceSettings.NormalizeCornerRadiusScale(snapshot.GlobalCornerRadiusScale) - normalizedCornerRadiusScale) > 0.0001d)
+        {
+            snapshot.GlobalCornerRadiusScale = normalizedCornerRadiusScale;
+            changedKeys.Add(nameof(AppSettingsSnapshot.GlobalCornerRadiusScale));
+        }
+
         if (!string.Equals(snapshot.ThemeColorMode, normalizedThemeColorMode, StringComparison.OrdinalIgnoreCase))
         {
             snapshot.ThemeColorMode = normalizedThemeColorMode;