From ce5acf5bd7934a709e97696841e177ad4bc4d000 Mon Sep 17 00:00:00 2001
From: lincube <lincube3@hotmail.com>
Date: Mon, 13 Apr 2026 16:26:23 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E6=96=B9=E5=BC=8F=E7=BB=84=E4=BB=B6=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E9=80=8F=E6=98=8E=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Components/ShortcutWidget.axaml     |  3 --
 .../Views/Components/ShortcutWidget.axaml.cs  | 46 +++++++++++++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/LanMountainDesktop/Views/Components/ShortcutWidget.axaml b/LanMountainDesktop/Views/Components/ShortcutWidget.axaml
index 3f4b3ff..df80d83 100644
--- a/LanMountainDesktop/Views/Components/ShortcutWidget.axaml
+++ b/LanMountainDesktop/Views/Components/ShortcutWidget.axaml
@@ -8,9 +8,6 @@
              x:Class="LanMountainDesktop.Views.Components.ShortcutWidget">
 
     <Border x:Name="RootBorder"
-            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
-            BorderBrush="{DynamicResource AdaptiveButtonBorderBrush}"
-            BorderThickness="1"
             CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
             ClipToBounds="True">
         <Grid RowDefinitions="*,Auto"
diff --git a/LanMountainDesktop/Views/Components/ShortcutWidget.axaml.cs b/LanMountainDesktop/Views/Components/ShortcutWidget.axaml.cs
index cff2f3f..4992960 100644
--- a/LanMountainDesktop/Views/Components/ShortcutWidget.axaml.cs
+++ b/LanMountainDesktop/Views/Components/ShortcutWidget.axaml.cs
@@ -25,6 +25,7 @@ public partial class ShortcutWidget : UserControl, IDesktopComponentWidget, ICom
     private bool _showBackground = true;
     private double _currentCellSize = 48;
     private bool _isDisposed;
+    private bool _chromeApplied;
 
     private const double TapMovementThreshold = 10;
     private const long TapTimeThresholdMs = 500;
@@ -40,9 +41,32 @@ public partial class ShortcutWidget : UserControl, IDesktopComponentWidget, ICom
     {
         InitializeComponent();
         DoubleTapped += OnDoubleTapped;
+        Loaded += OnLoaded;
         UpdateDisplay();
     }
 
+    private void OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        // ApplyChrome() may have been called before the control was attached to the visual tree,
+        // causing FindResource() to fail. Re-apply now that resources are available.
+        if (!_chromeApplied)
+        {
+            ApplyChrome();
+        }
+
+        // Subscribe to theme changes so the background follows theme updates.
+        var themeService = HostAppearanceThemeProvider.GetOrCreate();
+        themeService.Changed += OnAppearanceThemeChanged;
+    }
+
+    private void OnAppearanceThemeChanged(object? sender, AppearanceThemeSnapshot e)
+    {
+        if (_isDisposed || _showBackground)
+        {
+            ApplyChrome();
+        }
+    }
+
     public void SetComponentPlacementContext(string componentId, string? placementId)
     {
         _componentId = string.IsNullOrWhiteSpace(componentId)
@@ -258,13 +282,25 @@ public partial class ShortcutWidget : UserControl, IDesktopComponentWidget, ICom
             RootBorder.Background = Brushes.Transparent;
             RootBorder.BorderBrush = Brushes.Transparent;
             RootBorder.BorderThickness = new Thickness(0);
+            _chromeApplied = true;
             return;
         }
 
-        // 恢复默认的实心背景样式
-        RootBorder.Background = this.FindResource("AdaptiveSurfaceRaisedBrush") as IBrush ?? Brushes.Transparent;
-        RootBorder.BorderBrush = this.FindResource("AdaptiveButtonBorderBrush") as IBrush ?? Brushes.Transparent;
+        // FindResource requires the control to be attached to the visual tree.
+        // If it returns null, _chromeApplied stays false so OnLoaded will retry.
+        var background = this.FindResource("AdaptiveSurfaceRaisedBrush") as IBrush;
+        var borderBrush = this.FindResource("AdaptiveButtonBorderBrush") as IBrush;
+
+        if (background is null || borderBrush is null)
+        {
+            _chromeApplied = false;
+            return;
+        }
+
+        RootBorder.Background = background;
+        RootBorder.BorderBrush = borderBrush;
         RootBorder.BorderThickness = new Thickness(1);
+        _chromeApplied = true;
     }
 
     protected override void OnPointerPressed(PointerPressedEventArgs e)
@@ -391,6 +427,10 @@ public partial class ShortcutWidget : UserControl, IDesktopComponentWidget, ICom
         }
 
         _isDisposed = true;
+
+        var themeService = HostAppearanceThemeProvider.GetOrCreate();
+        themeService.Changed -= OnAppearanceThemeChanged;
+
         _gestureStates.Clear();
     }
 }