0.8.0.1

修圆角

AGENTS.md

@@ -62,6 +62,7 @@ dotnet test LanMountainDesktop.slnx -c Debug
 ### UI
 
 - 主题、资源和视觉语义优先遵守 `docs/VISUAL_SPEC.md` 与 `docs/CORNER_RADIUS_SPEC.md`
+- **组件圆角**：所有内置与插件组件的根边框必须使用 `{DynamicResource DesignCornerRadiusComponent}` 资源。
 - 设置页相关改动通常同时落在 `Views/`、`ViewModels/`、`Services/` 和 `.trae/specs/`
 - UI 启动与窗口生命周期主线在 `Program.cs` 和 `App.axaml.cs`
 
@@ -76,6 +77,7 @@ dotnet test LanMountainDesktop.slnx -c Debug
 
 - 设置持久化和 scope 变化优先检查 `LanMountainDesktop.Settings.Core/`
 - 外观、圆角、主题资源优先检查 `LanMountainDesktop.Appearance/` 与专题规范
+- **圆角统一**：桌面组件（Widget）必须统一使用动态资源 `DesignCornerRadiusComponent`。严禁在组件根容器使用硬编码数值或非组件级令牌（如 `Xs`, `Md` 等），以确保全局圆角缩放设置能正确应用到所有组件。
 
 ## 6. 权威来源
 

LanMountainDesktop.Appearance/AppearanceCornerRadiusTokenFactory.cs

@@ -11,12 +11,13 @@ public static class AppearanceCornerRadiusTokenFactory
         var normalizedScale = GlobalAppearanceSettings.NormalizeCornerRadiusScale(scale);
         return new AppearanceCornerRadiusTokens(
             Radius(6, normalizedScale),
-            Radius(10, normalizedScale),
+            Radius(12, normalizedScale),
             Radius(14, normalizedScale),
-            Radius(18, normalizedScale),
-            Radius(24, normalizedScale),
-            Radius(30, normalizedScale),
-            Radius(36, normalizedScale));
+            Radius(20, normalizedScale),
+            Radius(28, normalizedScale),
+            Radius(32, normalizedScale),
+            Radius(36, normalizedScale),
+            Radius(18, normalizedScale));
     }
 
     private static CornerRadius Radius(double value, double scale)

LanMountainDesktop.PluginSdk/PluginCornerRadiusPreset.cs

@@ -9,5 +9,6 @@ public enum PluginCornerRadiusPreset
     Md = 4,
     Lg = 5,
     Xl = 6,
-    Island = 7
+    Island = 7,
+    Component = 8
 }

LanMountainDesktop.PluginSdk/PluginCornerRadiusTokens.cs

@@ -10,13 +10,14 @@ public sealed record PluginCornerRadiusTokens(
     double Md,
     double Lg,
     double Xl,
-    double Island)
+    double Island,
+    double Component)
 {
     public double Get(PluginCornerRadiusPreset preset)
     {
         return preset switch
         {
-            PluginCornerRadiusPreset.Default => Md,
+            PluginCornerRadiusPreset.Default => Component,
             PluginCornerRadiusPreset.Micro => Micro,
             PluginCornerRadiusPreset.Xs => Xs,
             PluginCornerRadiusPreset.Sm => Sm,
@@ -24,7 +25,8 @@ public sealed record PluginCornerRadiusTokens(
             PluginCornerRadiusPreset.Lg => Lg,
             PluginCornerRadiusPreset.Xl => Xl,
             PluginCornerRadiusPreset.Island => Island,
-            _ => Md
+            PluginCornerRadiusPreset.Component => Component,
+            _ => Component
         };
     }
 
@@ -44,6 +46,7 @@ public sealed record PluginCornerRadiusTokens(
             tokens.Md.TopLeft,
             tokens.Lg.TopLeft,
             tokens.Xl.TopLeft,
-            tokens.Island.TopLeft);
+            tokens.Island.TopLeft,
+            tokens.Component.TopLeft);
     }
 }

LanMountainDesktop.Shared.Contracts/AppearanceCornerRadiusTokens.cs

@@ -9,4 +9,5 @@ public sealed record AppearanceCornerRadiusTokens(
     CornerRadius Md,
     CornerRadius Lg,
     CornerRadius Xl,
-    CornerRadius Island);
+    CornerRadius Island,
+    CornerRadius Component);

LanMountainDesktop.Tests/BuiltInDesktopHostCornerRadiusBaselineTests.cs

@@ -19,7 +19,7 @@ public sealed class BuiltInDesktopHostCornerRadiusBaselineTests
         var registry = new DesktopComponentRuntimeRegistry(
             ComponentRegistry.CreateDefault(),
             DesktopComponentRuntimeRegistry.GetDefaultRegistrations());
-        var expected = AppearanceCornerRadiusTokenFactory.Create(globalScale).Lg.TopLeft;
+        var expected = AppearanceCornerRadiusTokenFactory.Create(globalScale).Component.TopLeft;
 
         foreach (var descriptor in registry.GetDesktopComponents())
         {

LanMountainDesktop.Tests/CornerRadiusScaleTests.cs

@@ -40,12 +40,13 @@ public sealed class CornerRadiusScaleTests
             GlobalCornerRadiusScale: 0d,
             CornerRadiusTokens: PluginCornerRadiusTokens.FromShared(new AppearanceCornerRadiusTokens(
                 new CornerRadius(6),
-                new CornerRadius(10),
+                new CornerRadius(12),
                 new CornerRadius(14),
-                new CornerRadius(18),
-                new CornerRadius(24),
-                new CornerRadius(30),
-                new CornerRadius(36))),
+                new CornerRadius(20),
+                new CornerRadius(28),
+                new CornerRadius(32),
+                new CornerRadius(36),
+                new CornerRadius(8))),
             ThemeVariant: "Unknown"));
 
         var context = new PluginDesktopComponentContext(
@@ -76,7 +77,8 @@ public sealed class CornerRadiusScaleTests
                 Md: 36d,
                 Lg: 48d,
                 Xl: 60d,
-                Island: 72d),
+                Island: 72d,
+                Component: 16d),
             ThemeVariant: "Light"));
 
         Assert.Equal(36d, context.ResolveCornerRadius(PluginCornerRadiusPreset.Md), 3);

LanMountainDesktop.Tests/DesktopComponentRuntimeRegistrationCornerRadiusTests.cs

@@ -48,11 +48,12 @@ public sealed class DesktopComponentRuntimeRegistrationCornerRadiusTests
             GlobalCornerRadiusScale: globalScale,
             CornerRadiusTokens: new AppearanceCornerRadiusTokens(
                 new CornerRadius(6),
-                new CornerRadius(10),
+                new CornerRadius(12),
                 new CornerRadius(14),
-                new CornerRadius(18),
-                new CornerRadius(24),
-                new CornerRadius(30),
-                new CornerRadius(36)));
+                new CornerRadius(20),
+                new CornerRadius(28),
+                new CornerRadius(32),
+                new CornerRadius(36),
+                new CornerRadius(8)));
     }
 }

LanMountainDesktop.Tests/InfoRecommendationHostCornerRadiusTests.cs

@@ -53,8 +53,8 @@ public sealed class InfoRecommendationHostCornerRadiusTests
         var max = descriptor.ResolveCornerRadius(CreateChromeContext(componentId, cellSize, 2.5d));
 
         Assert.Equal(0d, zero, 3);
-        Assert.Equal(24d, unit, 3);
-        Assert.Equal(60d, max, 3);
+        Assert.Equal(18d, unit, 3);
+        Assert.Equal(45d, max, 3);
         Assert.True(zero <= unit && unit <= max);
     }
 

LanMountainDesktop/Services/AppearanceThemeService.cs

@@ -476,6 +476,7 @@ internal sealed class AppearanceThemeService : IAppearanceThemeService, IDisposa
         resources["DesignCornerRadiusLg"] = snapshot.CornerRadiusTokens.Lg;
         resources["DesignCornerRadiusXl"] = snapshot.CornerRadiusTokens.Xl;
         resources["DesignCornerRadiusIsland"] = snapshot.CornerRadiusTokens.Island;
+        resources["DesignCornerRadiusComponent"] = snapshot.CornerRadiusTokens.Component;
     }
 
     public AppearanceMaterialSurface GetMaterialSurface(MaterialSurfaceRole role)

LanMountainDesktop/Styles/ComponentEditorThemeResources.axaml

@@ -18,7 +18,7 @@
         <Setter Property="Background" Value="{DynamicResource EditorSelectFieldBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource EditorSelectOutlineBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusMd}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusComponent}" />
         <Setter Property="Padding" Value="16,14,12,14" />
         <Setter Property="MinHeight" Value="56" />
         <Setter Property="FontSize" Value="14" />
@@ -40,7 +40,7 @@
         <Setter Property="Background" Value="{DynamicResource EditorSelectFieldBackgroundBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource EditorSelectOutlineBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusMd}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusComponent}" />
         <Setter Property="Padding" Value="16,14,12,14" />
         <Setter Property="MinHeight" Value="56" />
         <Setter Property="Foreground" Value="{DynamicResource ComponentEditorPrimaryTextBrush}" />

LanMountainDesktop/Styles/GlassModule.axaml

@@ -11,6 +11,7 @@
         <CornerRadius x:Key="DesignCornerRadiusSm">14</CornerRadius>
         <CornerRadius x:Key="DesignCornerRadiusXs">12</CornerRadius>
         <CornerRadius x:Key="DesignCornerRadiusIsland">36</CornerRadius>
+        <CornerRadius x:Key="DesignCornerRadiusComponent">18</CornerRadius>
     </Styles.Resources>
 
     <Style Selector="TextBlock">

LanMountainDesktop/Views/ComponentEditorWindow.axaml

@@ -53,7 +53,7 @@
         
         <!-- MD3 Button Styles -->
         <Style Selector="Button.component-editor-footer-button">
-            <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusMd}" />
+            <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusComponent}" />
             <Setter Property="Background" Value="{DynamicResource EditorPrimaryBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource EditorOnPrimaryBrush}" />
             <Setter Property="Height" Value="40" />
@@ -99,7 +99,12 @@
             </Grid>
         </Border>
 
-        <Panel Grid.Row="1">
+        <Border Grid.Row="1"
+                Background="{DynamicResource EditorSurfaceContainerBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+                Margin="16,0,16,16"
+                ClipToBounds="True">
+            <Panel>
                 <ScrollViewer Classes="component-editor-scroll-host"
                               HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Auto">
@@ -118,7 +123,7 @@
                         Height="64"
                         Background="{DynamicResource EditorPrimaryBrush}"
                         Foreground="{DynamicResource EditorOnPrimaryBrush}"
-                    CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                         Classes="accent"
                         Click="OnCloseClick">
                     <Button.Styles>
@@ -131,5 +136,6 @@
                                      Height="32" />
                 </Button>
             </Panel>
+        </Border>
     </Grid>
 </Window>

LanMountainDesktop/Views/ComponentLibraryWindow.axaml

@@ -87,14 +87,14 @@
                                 <Border Width="240"
                                         Height="220"
                                         Margin="6"
-                                        CornerRadius="{DynamicResource DesignCornerRadiusLg}"
+                                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                                         Padding="10"
                                         Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
                                         BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
                                         BorderThickness="1">
                                     <Grid RowDefinitions="*,Auto,Auto"
                                           RowSpacing="8">
-                                        <Border CornerRadius="{DynamicResource DesignCornerRadiusXs}"
+                                        <Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                                                 Background="{DynamicResource AdaptiveGlassPanelBackgroundBrush}"
                                                 BorderThickness="1"
                                                 BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"

LanMountainDesktop/Views/Components/AnalogClockWidget.axaml

@@ -8,7 +8,7 @@
              x:Class="LanMountainDesktop.Views.Components.AnalogClockWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="42"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             Padding="14">
         <Border.Background>

LanMountainDesktop/Views/Components/BaiduHotSearchWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.BaiduHotSearchWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
@@ -17,7 +17,7 @@
         <Grid>
             <Border x:Name="CardBorder"
                     Background="#FCFCFD"
-                    CornerRadius="34"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="16,14,16,14">

LanMountainDesktop/Views/Components/BilibiliHotSearchWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.BilibiliHotSearchWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
@@ -17,7 +17,7 @@
         <Grid>
             <Border x:Name="CardBorder"
                     Background="#FCFCFD"
-                    CornerRadius="34"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="16,14,16,14">

LanMountainDesktop/Views/Components/BrowserWidget.axaml

@@ -9,15 +9,17 @@
              x:Class="LanMountainDesktop.Views.Components.BrowserWidget">
 
     <Border x:Name="RootBorder"
-            Background="#F4F7FC"
-            CornerRadius="24"
-            ClipToBounds="True"
-            Padding="10">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="0"
+            ClipToBounds="True">
         <Grid RowDefinitions="*,Auto"
               RowSpacing="8">
             <Border x:Name="WebViewHostBorder"
                     Grid.Row="0"
-                    CornerRadius="16"
+                    CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                     ClipToBounds="True"
                     Background="#FFFFFFFF"
                     BorderBrush="#22000000"
@@ -50,7 +52,7 @@
 
             <Border x:Name="AddressBarBorder"
                     Grid.Row="1"
-                    CornerRadius="14"
+                    CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                     Background="#ECF2FA"
                     BorderBrush="#22000000"
                     BorderThickness="1"

LanMountainDesktop/Views/Components/ClassScheduleWidget.axaml

@@ -2,9 +2,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="LanMountainDesktop.Views.Components.ClassScheduleWidget">
     <Border x:Name="RootBorder"
-            ClipToBounds="True"
-            CornerRadius="28"
-            BorderThickness="1">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="LayoutGrid"
               RowDefinitions="Auto,*">
             <Grid x:Name="HeaderGrid"

LanMountainDesktop/Views/Components/ClockWidget.axaml

@@ -10,7 +10,7 @@
     <Border x:Name="RootBorder"
             Classes="surface-translucent-panel"
             Padding="0"
-            CornerRadius="24">
+            CornerRadius="{DynamicResource DesignCornerRadiusXs}">
         <StackPanel Orientation="Horizontal"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center">

LanMountainDesktop/Views/Components/CnrDailyNewsWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.CnrDailyNewsWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
@@ -17,7 +17,7 @@
         <Grid>
             <Border x:Name="CardBorder"
                     Background="#FCFCFD"
-                    CornerRadius="34"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="16,14,16,14">
@@ -94,7 +94,7 @@
                                 Grid.Column="1"
                                 Width="160"
                                 Height="90"
-                                CornerRadius="16"
+                                CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                                 ClipToBounds="True"
                                 Background="#E6E6E6">
                             <Image x:Name="News1Image"
@@ -122,7 +122,7 @@
                                 Grid.Column="1"
                                 Width="160"
                                 Height="90"
-                                CornerRadius="16"
+                                CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                                 ClipToBounds="True"
                                 Background="#E6E6E6">
                             <Image x:Name="News2Image"

LanMountainDesktop/Views/Components/ComponentChromeCornerRadiusHelper.cs

@@ -9,15 +9,15 @@ namespace LanMountainDesktop.Views.Components;
 
 internal static class ComponentChromeCornerRadiusHelper
 {
-    public static double ResolveMainRectangleRadiusValue(ComponentChromeContext? chromeContext = null, double fallback = 24d)
+    public static double ResolveMainRectangleRadiusValue(ComponentChromeContext? chromeContext = null, double fallback = 18d)
     {
         if (chromeContext is not null)
         {
-            return Math.Max(0d, chromeContext.CornerRadiusTokens.Lg.TopLeft);
+            return Math.Max(0d, chromeContext.CornerRadiusTokens.Component.TopLeft);
         }
 
         var snapshot = HostAppearanceThemeProvider.GetOrCreate().GetCurrent();
-        var resolved = snapshot.CornerRadiusTokens.Lg.TopLeft;
+        var resolved = snapshot.CornerRadiusTokens.Component.TopLeft;
         return double.IsFinite(resolved)
             ? Math.Max(0d, resolved)
             : Math.Max(0d, fallback * ResolveScale(chromeContext));

LanMountainDesktop/Views/Components/DailyArtworkWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.DailyArtworkWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             BorderThickness="0"
             Background="#D5D5D5">
@@ -88,7 +88,7 @@
                                 Grid.Row="2"
                                 Width="118"
                                 Height="3"
-                                CornerRadius="2"
+                                CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                 HorizontalAlignment="Left"
                                 Margin="0,0,0,10"
                                 Background="#F0F0F0" />

LanMountainDesktop/Views/Components/DailyNewsView.axaml

@@ -16,7 +16,7 @@
     
     <StackPanel x:Name="RootStackPanel" Spacing="16">
         <Border x:Name="CoverImageBorder"
-                CornerRadius="12"
+                CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                 ClipToBounds="True"
                 Background="#f8f5ec"
                 PointerPressed="OnCoverImagePointerPressed"
@@ -75,7 +75,7 @@
         
         <Border x:Name="OverviewBorder"
                 Background="#f8f5ec"
-                CornerRadius="8"
+                CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                 Padding="12"
                 Margin="0,0,0,8">
             <StackPanel x:Name="OverviewStackPanel" Spacing="12"/>
@@ -85,7 +85,7 @@
                 Content="展开更多新闻 ▼"
                 FontSize="14"
                 Padding="16,8"
-                CornerRadius="8"
+                CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                 Background="Transparent"
                 BorderBrush="#bb5649"
                 BorderThickness="1"

LanMountainDesktop/Views/Components/DailyPoetryWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.DailyPoetryWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             BorderThickness="0"
             Background="#C20A0A"
@@ -75,7 +75,7 @@
                         Height="26"
                         VerticalAlignment="Center"
                         Margin="0,0,8,0"
-                        CornerRadius="3"
+                        CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                         Background="#6BF2A497" />
 
                 <TextBlock x:Name="AuthorTextBlock"

LanMountainDesktop/Views/Components/DailyWord2x2Widget.axaml

@@ -9,15 +9,15 @@
              x:Class="LanMountainDesktop.Views.Components.DailyWord2x2Widget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="30"
+            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
             Padding="0">
         <Grid>
             <Border x:Name="CardBorder"
-                    Background="#FCFBFA"
-                    CornerRadius="30"
+                    Background="#FCFCFD"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="12,11,12,11"

LanMountainDesktop/Views/Components/DailyWordWidget.axaml

@@ -10,15 +10,15 @@
              x:Class="LanMountainDesktop.Views.Components.DailyWordWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
             Padding="0">
         <Grid>
             <Border x:Name="CardBorder"
-                    Background="#FCFBFA"
-                    CornerRadius="34"
+                    Background="#FCFCFD"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="16,14,16,14">

LanMountainDesktop/Views/Components/DateWidget.axaml

@@ -8,10 +8,11 @@
              x:Class="LanMountainDesktop.Views.Components.DateWidget">
 
     <Border x:Name="RootBorder"
-            Background="{DynamicResource AdaptiveSurfaceBaseBrush}"
-            CornerRadius="28"
-            ClipToBounds="True"
-            Padding="12">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Viewbox Stretch="Uniform">
             <Grid x:Name="LayoutRoot"
                   Width="460"
@@ -86,7 +87,7 @@
                         Grid.Column="1"
                         Background="{DynamicResource AdaptiveLayer2Brush}"
                         BorderThickness="1"
-                        CornerRadius="24"
+                        CornerRadius="{DynamicResource DesignCornerRadiusLg}"
                         BoxShadow="0 8 18 #1A000000"
                         Padding="14">
                     <Grid x:Name="RightPanelGrid"

LanMountainDesktop/Views/Components/ExchangeRateCalculatorWidget.axaml

@@ -9,7 +9,7 @@
 
     <UserControl.Styles>
         <Style Selector="Button">
-            <Setter Property="CornerRadius" Value="16" />
+            <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusSm}" />
             <Setter Property="Background" Value="#F8F9FB" />
             <Setter Property="BorderBrush" Value="#00000000" />
             <Setter Property="BorderThickness" Value="0" />
@@ -21,10 +21,11 @@
     </UserControl.Styles>
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
-            ClipToBounds="True"
-            Padding="12"
-            Background="#ECEDEF">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Viewbox Stretch="Uniform">
             <Grid x:Name="LayoutRoot"
                   Width="304"
@@ -39,7 +40,7 @@
                     <Border x:Name="FromCurrencyRowBorder"
                             Grid.Row="0"
                             Grid.Column="0"
-                            CornerRadius="16"
+                            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                             Background="#F8F9FB"
                             Padding="12,8"
                             PointerPressed="OnFromCurrencyRowPointerPressed">
@@ -80,7 +81,7 @@
                     <Border x:Name="ToCurrencyRowBorder"
                             Grid.Row="1"
                             Grid.Column="0"
-                            CornerRadius="16"
+                            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                             Background="#F8F9FB"
                             Padding="12,8"
                             PointerPressed="OnToCurrencyRowPointerPressed">
@@ -122,7 +123,7 @@
                             Grid.Row="0"
                             Grid.RowSpan="2"
                             Grid.Column="1"
-                            CornerRadius="16"
+                            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                             Background="#F8F9FB"
                             BorderBrush="#00000000"
                             BorderThickness="0"

LanMountainDesktop/Views/Components/ExtendedWeatherWidget.axaml

@@ -8,16 +8,16 @@
              x:Class="LanMountainDesktop.Views.Components.ExtendedWeatherWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="28"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             Background="#6B7B8F">
         <Grid>
             <Border x:Name="BackgroundImageLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True" />
 
             <Border x:Name="BackgroundMotionLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.26"
                     RenderTransformOrigin="0.5,0.5">
@@ -31,12 +31,12 @@
             </Border>
 
             <Border x:Name="BackgroundTintLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.12" />
 
             <Border x:Name="BackgroundLightLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.54">
                 <Border.Background>
@@ -53,7 +53,7 @@
             </Border>
 
             <Border x:Name="BackgroundShadeLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.70">
                 <Border.Background>

LanMountainDesktop/Views/Components/HolidayCalendarWidget.axaml

@@ -8,10 +8,11 @@
              x:Class="LanMountainDesktop.Views.Components.HolidayCalendarWidget">
 
     <Border x:Name="RootBorder"
-            Background="#DCE7FA"
-            CornerRadius="34"
-            ClipToBounds="True"
-            Padding="14">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="LayoutRoot"
               RowDefinitions="1.1*,2.3*,0.62*,0.78*,0.95*"
               RowSpacing="8">

LanMountainDesktop/Views/Components/HourlyWeatherWidget.axaml

@@ -9,14 +9,14 @@
              x:Class="LanMountainDesktop.Views.Components.HourlyWeatherWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="28"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             Background="#6B7B8F">
         <Grid>
-            <Border x:Name="BackgroundImageLayer" CornerRadius="28" ClipToBounds="True" />
+            <Border x:Name="BackgroundImageLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" />
 
             <Border x:Name="BackgroundMotionLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.25"
                     RenderTransformOrigin="0.5,0.5">
@@ -28,9 +28,9 @@
                 </Border.RenderTransform>
             </Border>
 
-            <Border x:Name="BackgroundTintLayer" CornerRadius="28" ClipToBounds="True" Opacity="0.12" />
+            <Border x:Name="BackgroundTintLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" Opacity="0.12" />
 
-            <Border x:Name="BackgroundLightLayer" CornerRadius="28" ClipToBounds="True" Opacity="0.52">
+            <Border x:Name="BackgroundLightLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" Opacity="0.52">
                 <Border.Background>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                         <GradientStop Color="#45FFFFFF" Offset="0" />
@@ -40,7 +40,7 @@
                 </Border.Background>
             </Border>
 
-            <Border x:Name="BackgroundShadeLayer" CornerRadius="28" ClipToBounds="True" Opacity="0.68">
+            <Border x:Name="BackgroundShadeLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" Opacity="0.68">
                 <Border.Background>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                         <GradientStop Color="#00000000" Offset="0.42" />

LanMountainDesktop/Views/Components/IfengNewsWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.IfengNewsWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="32"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
@@ -17,7 +17,7 @@
         <Grid>
             <Border x:Name="CardBorder"
                     Background="#FCFCFD"
-                    CornerRadius="32"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="14,14,14,14">
@@ -40,7 +40,7 @@
                                        VerticalAlignment="Center" />
                             <Border x:Name="NewsBadge"
                                     Background="#E24B2D"
-                                    CornerRadius="4"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     Padding="6,2"
                                     Margin="4,0,0,0"
                                     VerticalAlignment="Center">

LanMountainDesktop/Views/Components/JuyaNewsWidget.axaml

@@ -9,15 +9,15 @@
              x:Class="LanMountainDesktop.Views.Components.JuyaNewsWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="24"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
             Padding="0">
         <Grid>
             <Border x:Name="CardBorder"
-                    Background="#fefefe"
-                    CornerRadius="24"
+                    Background="#FCFCFD"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="16,14,16,14">
@@ -52,7 +52,7 @@
                         <Button x:Name="RefreshButton"
                                 Grid.Column="1"
                                 Padding="8,4"
-                                CornerRadius="8"
+                                CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                                 Background="Transparent"
                                 BorderBrush="#bb5649"
                                 BorderThickness="1"

LanMountainDesktop/Views/Components/LunarCalendarWidget.axaml

@@ -8,10 +8,11 @@
              x:Class="LanMountainDesktop.Views.Components.LunarCalendarWidget">
 
     <Border x:Name="RootBorder"
-            Background="#EFE6D9"
-            CornerRadius="30"
-            ClipToBounds="True"
-            Padding="16">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Viewbox Stretch="Uniform">
             <Grid x:Name="LayoutRoot"
                   Width="300"

LanMountainDesktop/Views/Components/MonthCalendarWidget.axaml

@@ -11,9 +11,8 @@
             Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
             BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
             BorderThickness="1"
-            CornerRadius="28"
-            ClipToBounds="True"
-            Padding="14">
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Viewbox Stretch="Uniform">
             <Grid x:Name="LayoutRoot"
                   Width="280"

LanMountainDesktop/Views/Components/MultiDayWeatherWidget.axaml

@@ -9,14 +9,14 @@
              x:Class="LanMountainDesktop.Views.Components.MultiDayWeatherWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="28"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             Background="#6B7B8F">
         <Grid>
-            <Border x:Name="BackgroundImageLayer" CornerRadius="28" ClipToBounds="True" />
+            <Border x:Name="BackgroundImageLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" />
 
             <Border x:Name="BackgroundMotionLayer"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.25"
                     RenderTransformOrigin="0.5,0.5">
@@ -28,9 +28,9 @@
                 </Border.RenderTransform>
             </Border>
 
-            <Border x:Name="BackgroundTintLayer" CornerRadius="28" ClipToBounds="True" Opacity="0.12" />
+            <Border x:Name="BackgroundTintLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" Opacity="0.12" />
 
-            <Border x:Name="BackgroundLightLayer" CornerRadius="28" ClipToBounds="True" Opacity="0.52">
+            <Border x:Name="BackgroundLightLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" Opacity="0.52">
                 <Border.Background>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                         <GradientStop Color="#45FFFFFF" Offset="0" />
@@ -40,7 +40,7 @@
                 </Border.Background>
             </Border>
 
-            <Border x:Name="BackgroundShadeLayer" CornerRadius="28" ClipToBounds="True" Opacity="0.68">
+            <Border x:Name="BackgroundShadeLayer" CornerRadius="{DynamicResource DesignCornerRadiusComponent}" ClipToBounds="True" Opacity="0.68">
                 <Border.Background>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                         <GradientStop Color="#00000000" Offset="0.42" />

LanMountainDesktop/Views/Components/MusicControlWidget.axaml

@@ -66,7 +66,7 @@
     </UserControl.Styles>
 
     <Border x:Name="RootBorder"
-            CornerRadius="30"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
             BorderThickness="1"
             BorderBrush="#52FFFFFF"
@@ -75,11 +75,11 @@
         <Grid>
             <Grid IsHitTestVisible="False">
                 <Border x:Name="DynamicBackgroundBase"
-                        CornerRadius="30"
+                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                         ClipToBounds="True"
                         Background="#B89E7B" />
                 <Border x:Name="BackdropCoverHost"
-                        CornerRadius="30"
+                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                         ClipToBounds="True">
                     <Image x:Name="BackdropCoverImage"
                            IsVisible="False"
@@ -91,10 +91,10 @@
                     </Image>
                 </Border>
                 <Border x:Name="DynamicGradientOverlay"
-                        CornerRadius="30"
+                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                         ClipToBounds="True" />
                 <Border x:Name="DynamicSoftLightOverlay"
-                        CornerRadius="30"
+                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                         ClipToBounds="True" />
             </Grid>
 
@@ -111,7 +111,7 @@
                         <Border x:Name="CoverBorder"
                                 Width="56"
                                 Height="56"
-                                CornerRadius="12"
+                                CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                                 ClipToBounds="True"
                                 BorderThickness="1"
                                 BorderBrush="#77FFFFFF"

LanMountainDesktop/Views/Components/OfficeRecentDocumentsWidget.axaml

@@ -10,11 +10,11 @@
              x:Class="LanMountainDesktop.Views.Components.OfficeRecentDocumentsWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="{DynamicResource DesignCornerRadiusLg}"
-            Background="#2D5A8E"
-            ClipToBounds="True"
-            BorderThickness="0"
-            Padding="0">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid>
             <Border x:Name="AccentCorner"
                     Width="140"

LanMountainDesktop/Views/Components/RecordingWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.RecordingWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Padding="0"
             ClipToBounds="True"
             Background="#ECEFF3"
@@ -23,7 +23,7 @@
                         Height="300"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        CornerRadius="34"
+                        CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                         BorderBrush="#00000000"
                         BorderThickness="0"
                         Background="Transparent">
@@ -65,7 +65,7 @@
                                     Grid.Column="1"
                                     Width="2"
                                     Height="32"
-                                    CornerRadius="1"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     Background="#F14A40"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center" />
@@ -74,7 +74,7 @@
                                     Grid.Column="2"
                                     Margin="4,0,0,0"
                                     Height="2"
-                                    CornerRadius="1"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     Background="#A3A8B3"
                                     Opacity="0.55"
                                     HorizontalAlignment="Stretch"

LanMountainDesktop/Views/Components/RemovableStorageWidget.axaml

@@ -9,9 +9,11 @@
              x:Class="LanMountainDesktop.Views.Components.RemovableStorageWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="28"
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
             BorderThickness="1"
-            Padding="16"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12"
             ClipToBounds="True">
         <Grid>
             <Border x:Name="AccentOrb"

LanMountainDesktop/Views/Components/Stcn24ForumWidget.axaml

@@ -9,7 +9,7 @@
              x:Class="LanMountainDesktop.Views.Components.Stcn24ForumWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="28"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Background="Transparent"
             ClipToBounds="True"
             BorderThickness="0"
@@ -17,7 +17,7 @@
         <Grid>
             <Border x:Name="CardBorder"
                     Background="#FCFCFD"
-                    CornerRadius="28"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     BorderBrush="Transparent"
                     BorderThickness="0"
                     Padding="12,12,12,12">
@@ -72,7 +72,7 @@
                                     Grid.Row="1"
                                     Tag="0"
                                     Background="#F7F8FA"
-                            CornerRadius="10"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                                     Padding="8,6"
                                     PointerPressed="OnPostItemPointerPressed">
                         <Grid x:Name="PostItem1Grid"

LanMountainDesktop/Views/Components/StudyDeductionReasonsWidget.axaml

@@ -7,10 +7,11 @@
              d:DesignHeight="220"
              x:Class="LanMountainDesktop.Views.Components.StudyDeductionReasonsWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="22"
-            Padding="12,10"
-            ClipToBounds="True">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="ContentRootGrid"
               RowDefinitions="Auto,*,Auto"
               RowSpacing="8">
@@ -28,7 +29,7 @@
                 <Border x:Name="ModeBadgeBorder"
                         Grid.Column="1"
                         Padding="8,3"
-                        CornerRadius="8"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         BorderThickness="1"
                         BorderBrush="#88FFFFFF"
                         Background="#553B82F6"
@@ -46,7 +47,7 @@
                         Grid.Row="1"
                         Spacing="6">
                 <Border x:Name="SustainedRowBorder"
-                        CornerRadius="10"
+                        CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                         Background="#2CFFFFFF"
                         BorderBrush="#33FFFFFF"
                         BorderThickness="1"
@@ -75,7 +76,7 @@
                 </Border>
 
                 <Border x:Name="TimeRowBorder"
-                        CornerRadius="10"
+                        CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                         Background="#2CFFFFFF"
                         BorderBrush="#33FFFFFF"
                         BorderThickness="1"
@@ -104,7 +105,7 @@
                 </Border>
 
                 <Border x:Name="SegmentRowBorder"
-                        CornerRadius="10"
+                        CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                         Background="#2CFFFFFF"
                         BorderBrush="#33FFFFFF"
                         BorderThickness="1"

LanMountainDesktop/Views/Components/StudyEnvironmentWidget.axaml

@@ -10,7 +10,7 @@
             Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
             BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
             BorderThickness="1"
-            CornerRadius="18"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Padding="14,10">
         <Grid x:Name="LayoutGrid"
               ColumnDefinitions="*,Auto"

LanMountainDesktop/Views/Components/StudyInterruptDensityWidget.axaml

@@ -7,10 +7,11 @@
              d:DesignHeight="220"
              x:Class="LanMountainDesktop.Views.Components.StudyInterruptDensityWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="22"
-            Padding="14,10"
-            ClipToBounds="True">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="ContentRootGrid"
               RowDefinitions="Auto,*,Auto"
               RowSpacing="8">
@@ -28,7 +29,7 @@
                 <Border x:Name="ModeBadgeBorder"
                         Grid.Column="1"
                         Padding="8,3"
-                        CornerRadius="8"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         BorderThickness="1"
                         BorderBrush="#88FFFFFF"
                         Background="#553B82F6"
@@ -78,7 +79,7 @@
                             Spacing="6"
                             VerticalAlignment="Center">
                     <Border x:Name="CountCardBorder"
-                            CornerRadius="10"
+                            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                             Background="#2CFFFFFF"
                             BorderBrush="#33FFFFFF"
                             BorderThickness="1"
@@ -101,7 +102,7 @@
                     </Border>
 
                     <Border x:Name="DurationCardBorder"
-                            CornerRadius="10"
+                            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                             Background="#2CFFFFFF"
                             BorderBrush="#33FFFFFF"
                             BorderThickness="1"

LanMountainDesktop/Views/Components/StudyNoiseCurveWidget.axaml

@@ -8,10 +8,11 @@
              d:DesignHeight="320"
              x:Class="LanMountainDesktop.Views.Components.StudyNoiseCurveWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="24"
-            Padding="14,10"
-            ClipToBounds="True">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid RowDefinitions="Auto,*"
               RowSpacing="8">
             <Grid Grid.Row="0"
@@ -19,7 +20,7 @@
                   ColumnSpacing="8">
                 <Border x:Name="StatusBadgeBorder"
                         Padding="8,3"
-                        CornerRadius="8"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         Background="#7A0E2235"
                         BorderBrush="#88FFFFFF"
                         BorderThickness="1"

LanMountainDesktop/Views/Components/StudyNoiseDistributionWidget.axaml

@@ -8,10 +8,11 @@
              d:DesignHeight="320"
              x:Class="LanMountainDesktop.Views.Components.StudyNoiseDistributionWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="24"
-            Padding="14,10"
-            ClipToBounds="True">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="ContentRootGrid"
               RowDefinitions="Auto,*"
               RowSpacing="8">
@@ -38,7 +39,7 @@
                 <Border x:Name="ModeBadgeBorder"
                         Grid.Column="2"
                         Padding="8,3"
-                        CornerRadius="8"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         BorderThickness="1"
                         BorderBrush="#88FFFFFF"
                         Background="#553B82F6"

LanMountainDesktop/Views/Components/StudyScoreOverviewWidget.axaml

@@ -7,10 +7,11 @@
              d:DesignHeight="360"
              x:Class="LanMountainDesktop.Views.Components.StudyScoreOverviewWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="24"
-            Padding="16,14"
-            ClipToBounds="True">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="ContentRootGrid"
               RowDefinitions="Auto,Auto,*,Auto"
               RowSpacing="8">
@@ -30,7 +31,7 @@
                 <Border x:Name="ModeBadgeBorder"
                         Grid.Column="1"
                         Padding="8,3"
-                        CornerRadius="8"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         BorderThickness="1"
                         BorderBrush="#88FFFFFF"
                         Background="#553B82F6"
@@ -70,7 +71,7 @@
                   ColumnDefinitions="*,*,*"
                   ColumnSpacing="10">
                 <Border x:Name="AverageCardBorder"
-                        CornerRadius="12"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         Background="#24FFFFFF"
                         BorderBrush="#2EFFFFFF"
                         BorderThickness="1"
@@ -95,7 +96,7 @@
 
                 <Border x:Name="MinimumCardBorder"
                         Grid.Column="1"
-                        CornerRadius="12"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         Background="#24FFFFFF"
                         BorderBrush="#2EFFFFFF"
                         BorderThickness="1"
@@ -120,7 +121,7 @@
 
                 <Border x:Name="MaximumCardBorder"
                         Grid.Column="2"
-                        CornerRadius="12"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         Background="#24FFFFFF"
                         BorderBrush="#2EFFFFFF"
                         BorderThickness="1"

LanMountainDesktop/Views/Components/StudySessionControlWidget.axaml

@@ -8,8 +8,10 @@
              d:DesignHeight="150"
              x:Class="LanMountainDesktop.Views.Components.StudySessionControlWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="18"
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             Padding="14,10"
             ClipToBounds="True">
         <Grid x:Name="LayoutGrid"

LanMountainDesktop/Views/Components/StudySessionHistoryWidget.axaml

@@ -7,10 +7,11 @@
              d:DesignHeight="220"
              x:Class="LanMountainDesktop.Views.Components.StudySessionHistoryWidget">
     <Border x:Name="RootBorder"
-            Classes="surface-translucent-strong"
-            CornerRadius="22"
-            Padding="12,10"
-            ClipToBounds="True">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid>
             <Grid x:Name="ContentRootGrid"
                   RowDefinitions="Auto,*,Auto"
@@ -24,7 +25,7 @@
                            TextTrimming="CharacterEllipsis" />
 
                 <Border Grid.Row="1"
-                        CornerRadius="10"
+                        CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                         Background="#1AFFFFFF"
                         BorderBrush="#26FFFFFF"
                         BorderThickness="1"
@@ -55,7 +56,7 @@
                 <Border x:Name="DialogCardBorder"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
-                        CornerRadius="12"
+                        CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                         BorderThickness="1"
                         Padding="12">
                     <StackPanel Spacing="10">
@@ -79,12 +80,12 @@
                             <Button x:Name="DialogCancelButton"
                                     Grid.Column="0"
                                     Content="Cancel"
-                                    CornerRadius="8"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                                     Height="30" />
                             <Button x:Name="DialogConfirmButton"
                                     Grid.Column="1"
                                     Content="Confirm"
-                                    CornerRadius="8"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                                     Height="30" />
                         </Grid>
                     </StackPanel>

LanMountainDesktop/Views/Components/TimerWidget.axaml

@@ -8,10 +8,11 @@
              x:Class="LanMountainDesktop.Views.Components.TimerWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="34"
-            ClipToBounds="True"
-            Padding="14"
-            Background="#E8EAEE">
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+            BorderThickness="1"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Viewbox Stretch="Uniform">
             <Grid x:Name="LayoutRoot"
                   Width="300"
@@ -21,7 +22,7 @@
                         Height="224"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        CornerRadius="32"
+                        CornerRadius="{DynamicResource DesignCornerRadiusLg}"
                         BorderThickness="1">
                     <Grid ColumnDefinitions="96,2,*">
                         <Grid Grid.Column="0"
@@ -69,14 +70,14 @@
                                     Grid.Row="0"
                                     Height="3"
                                     Width="18"
-                                    CornerRadius="2"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     HorizontalAlignment="Left"
                                     Background="#D0D6E1" />
                             <Border x:Name="ScaleMark2"
                                     Grid.Row="1"
                                     Height="3"
                                     Width="16"
-                                    CornerRadius="2"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     Margin="0,18,0,0"
                                     HorizontalAlignment="Left"
                                     Background="#D0D6E1" />
@@ -84,7 +85,7 @@
                                     Grid.Row="2"
                                     Height="3"
                                     Width="14"
-                                    CornerRadius="2"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     Margin="0,18,0,0"
                                     HorizontalAlignment="Left"
                                     Background="#D0D6E1" />
@@ -92,7 +93,7 @@
                                     Grid.Row="3"
                                     Height="3"
                                     Width="12"
-                                    CornerRadius="2"
+                                    CornerRadius="{DynamicResource DesignCornerRadiusMicro}"
                                     Margin="0,18,0,0"
                                     HorizontalAlignment="Left"
                                     Background="#D0D6E1" />

LanMountainDesktop/Views/Components/WeatherClockWidget.axaml

@@ -8,12 +8,12 @@
              x:Class="LanMountainDesktop.Views.Components.WeatherClockWidget">
 
     <Border x:Name="RootBorder"
-            Background="#FFFFFF"
-            BorderBrush="#14000000"
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
             BorderThickness="1"
-            CornerRadius="22"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
-            Padding="12,8">
+            Padding="14,12">
         <Grid x:Name="ContentGrid"
               ColumnDefinitions="*,Auto"
               ColumnSpacing="10">

LanMountainDesktop/Views/Components/WeatherWidget.axaml

@@ -9,16 +9,16 @@
              x:Class="LanMountainDesktop.Views.Components.WeatherWidget">
 
     <Border x:Name="RootBorder"
-            CornerRadius="30"
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True"
-            Background="#68A9EC">
+            Background="#6B7B8F">
         <Grid>
             <Border x:Name="BackgroundImageLayer"
-                    CornerRadius="30"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True" />
 
             <Border x:Name="BackgroundMotionLayer"
-                    CornerRadius="30"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.20"
                     RenderTransformOrigin="0.5,0.5">
@@ -32,12 +32,12 @@
             </Border>
 
             <Border x:Name="BackgroundTintLayer"
-                    CornerRadius="30"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.16" />
 
             <Border x:Name="BackgroundLightLayer"
-                    CornerRadius="30"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.62">
                 <Border.Background>
@@ -54,7 +54,7 @@
             </Border>
 
             <Border x:Name="BackgroundShadeLayer"
-                    CornerRadius="30"
+                    CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                     ClipToBounds="True"
                     Opacity="0.74">
                 <Border.Background>

LanMountainDesktop/Views/Components/WhiteboardWidget.axaml

@@ -11,10 +11,12 @@
 
     <Grid>
         <Border x:Name="RootBorder"
-                Background="#F1F4F9"
-                CornerRadius="20"
+                Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+                BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
+                BorderThickness="1"
+                CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
                 ClipToBounds="True"
-                Padding="8">
+                Padding="12">
             <Grid RowDefinitions="*,Auto"
                   RowSpacing="8">
                 <Border x:Name="CanvasBorder"
@@ -22,7 +24,7 @@
                         Background="#FFFFFF"
                         BorderBrush="#24000000"
                         BorderThickness="1"
-                        CornerRadius="14"
+                        CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                         ClipToBounds="True">
                     <inking:InkCanvas x:Name="InkCanvas" />
                 </Border>
@@ -33,7 +35,7 @@
                         Background="#E6FFFFFF"
                         BorderBrush="#16000000"
                         BorderThickness="1"
-                        CornerRadius="14"
+                        CornerRadius="{DynamicResource DesignCornerRadiusSm}"
                         Padding="8,6">
                     <StackPanel x:Name="ToolbarButtonsPanel"
                                 Orientation="Horizontal"
@@ -101,7 +103,7 @@
             <Border Background="{DynamicResource AdaptiveSurfaceBaseBrush}"
                     BorderBrush="{DynamicResource SystemControlForegroundBaseMediumLowBrush}"
                     BorderThickness="1"
-                    CornerRadius="8"
+                    CornerRadius="{DynamicResource DesignCornerRadiusXs}"
                     Padding="12">
                 <StackPanel Spacing="12">
                     <ColorView x:Name="InkColorPicker"

LanMountainDesktop/Views/Components/WorldClockWidget.axaml

@@ -8,12 +8,11 @@
              x:Class="LanMountainDesktop.Views.Components.WorldClockWidget">
 
     <Border x:Name="RootBorder"
-            Background="#F4F5F7"
-            BorderBrush="#16000000"
+            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
+            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
             BorderThickness="1"
-            CornerRadius="26"
-            ClipToBounds="True"
-            Padding="10,8">
+            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
+            Padding="14,12">
         <Grid x:Name="ClockHostGrid"
               ColumnDefinitions="*,*,*,*"
               ColumnSpacing="8" />

LanMountainDesktop/plugins/PluginLoader.cs

@@ -340,7 +340,7 @@ public sealed class PluginLoader
     {
         var defaultSnapshot = new PluginAppearanceSnapshot(
             GlobalCornerRadiusScale: 1d,
-            CornerRadiusTokens: new PluginCornerRadiusTokens(6, 10, 14, 18, 24, 30, 36),
+            CornerRadiusTokens: new PluginCornerRadiusTokens(6, 12, 14, 20, 28, 32, 36, 18),
             ThemeVariant: "Unknown");
 
         if (hostServices?.GetService(typeof(IAppearanceThemeService)) is not IAppearanceThemeService appearanceThemeService)

LanMountainDesktop/plugins/PluginMarketEmbeddedView.cs

@@ -515,12 +515,34 @@ internal sealed class PluginMarketEmbeddedView : UserControl, IDisposable
             Background = isSelected ? SelectedSurfaceBrush : SurfaceBrush,
             BorderBrush = isSelected ? SelectedBorderBrush : CardBorderBrush,
             BorderThickness = new Thickness(1),
-            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusMd", 18),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 18),
             Padding = new Thickness(14),
             Child = layoutGrid
         };
     }
 
+    private Control CreateDetailInfoRow(Control icon, Control infoStack)
+    {
+        return new Border
+        {
+            Background = SurfaceBrush,
+            BorderBrush = CardBorderBrush,
+            BorderThickness = new Thickness(1),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 16),
+            Padding = new Thickness(14, 12),
+            Child = new Grid
+            {
+                ColumnDefinitions = new ColumnDefinitions("Auto,*"),
+                ColumnSpacing = 12,
+                Children =
+                {
+                    icon,
+                    infoStack
+                }
+            }
+        };
+    }
+
     private void BuildDetailPanel()
     {
         if (_selectedPlugin is null)
@@ -617,7 +639,7 @@ internal sealed class PluginMarketEmbeddedView : UserControl, IDisposable
             Background = SurfaceBrush,
             BorderBrush = CardBorderBrush,
             BorderThickness = new Thickness(1),
-            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusMd", 16),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 16),
             Padding = new Thickness(16),
             Child = new TextBlock
             {
@@ -1011,7 +1033,7 @@ internal sealed class PluginMarketEmbeddedView : UserControl, IDisposable
         return new Border
         {
             Background = SurfaceBrush,
-            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusMd", 18),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 18),
             Padding = new Thickness(padding)
         };
     }
@@ -1021,7 +1043,7 @@ internal sealed class PluginMarketEmbeddedView : UserControl, IDisposable
         return new Border
         {
             Background = SurfaceBrush,
-            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusMd", 16),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 16),
             BorderBrush = CardBorderBrush,
             BorderThickness = new Thickness(1),
             Padding = new Thickness(18),
@@ -1124,7 +1146,7 @@ internal sealed class PluginMarketEmbeddedView : UserControl, IDisposable
             Background = SurfaceBrush,
             BorderBrush = CardBorderBrush,
             BorderThickness = new Thickness(1),
-            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusSm", 14),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 14),
             Padding = new Thickness(14),
             Child = new StackPanel
             {
@@ -1154,7 +1176,7 @@ internal sealed class PluginMarketEmbeddedView : UserControl, IDisposable
             Background = SurfaceBrush,
             BorderBrush = CardBorderBrush,
             BorderThickness = new Thickness(1),
-            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusSm", 14),
+            CornerRadius = ResolveCornerRadiusResource("DesignCornerRadiusComponent", 14),
             Padding = new Thickness(14),
             Child = new StackPanel
             {

docs/CORNER_RADIUS_SPEC.md

@@ -10,6 +10,7 @@
 - Level 2：16px，小型色块和紧凑控件
 - Level 3：20px，普通按钮
 - Level 4：24px，输入面板和小型容器
+- Component：18px，桌面组件的标准圆角（默认值）
 - Level 5：28px，普通玻璃面板
 - Level 6：32px，强化容器
 - Level 7：36px，大容器、窗口、任务栏