Fix tray menu window theme bug

Gaoyifei1011 · Apr 28, 2023 · 5ff46b7 · 5ff46b7
1 parent 29416c9
commit 5ff46b7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -15,7 +15,7 @@
     <EnableMsixTooling>false</EnableMsixTooling>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
     <FileAlignment>512</FileAlignment>
-    <FileVersion>1.5.427.0</FileVersion>
+    <FileVersion>1.5.428.0</FileVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
@@ -43,7 +43,7 @@
     <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <TrimMode>partial</TrimMode>
-    <Version>1.5.427.0</Version>
+    <Version>1.5.428.0</Version>
     <UseWindowsForms>False</UseWindowsForms>
     <UseWinUI>true</UseWinUI>
     <UseWPF>False</UseWPF>

diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //      生成号
 //      修订号
 //
-[assembly: AssemblyVersion("1.5.427.0")]
-[assembly: AssemblyFileVersion("1.5.427.0")]
+[assembly: AssemblyVersion("1.5.428.0")]
+[assembly: AssemblyFileVersion("1.5.428.0")]
diff --git a/GetStoreApp/Styles/NavigationView.xaml b/GetStoreApp/Styles/NavigationView.xaml
@@ -421,8 +421,8 @@
                                     <Grid
                                         x:Name="ContentGrid"
                                         Margin="0,45,0,0"
-                                        Background="{ThemeResource NavigationViewContentBackground}"
-                                        BorderBrush="{ThemeResource NavigationViewContentGridBorderBrush}"
+                                        Background="Transparent"
+                                        BorderBrush="Transparent"
                                         BorderThickness="{ThemeResource NavigationViewContentGridBorderThickness}"
                                         CornerRadius="{ThemeResource NavigationViewContentGridCornerRadius}">
                                         <Grid.RowDefinitions>

diff --git a/GetStoreApp/Styles/WindowChrome.xaml b/GetStoreApp/Styles/WindowChrome.xaml
@@ -1,16 +1,8 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="WindowLightBrush" Color="#F0F3F9" />
     <SolidColorBrush x:Key="WindowDarkBrush" Color="#141414" />
-    <AcrylicBrush
-        x:Key="MenuFlyoutWindowLightBrush"
-        FallbackColor="#F9F9F9"
-        TintColor="#FCFCFC"
-        TintOpacity="0.0" />
-    <AcrylicBrush
-        x:Key="MenuFlyoutWindowDarkBrush"
-        FallbackColor="#2C2C2C"
-        TintColor="#2C2C2C"
-        TintOpacity="0.15" />
+    <SolidColorBrush x:Key="MenuFlyoutLightBrush" Color="#F8F8F8" />
+    <SolidColorBrush x:Key="MenuFlyoutDarkBrush" Color="#353535" />
     <SolidColorBrush x:Key="WindowSystemBackdropBrush" Color="Transparent" />
 
     <Style x:Key="WindowChromeStyle" TargetType="ContentControl">

diff --git a/GetStoreApp/ViewModels/Window/TrayMenuViewModel.cs b/GetStoreApp/ViewModels/Window/TrayMenuViewModel.cs
@@ -195,20 +195,20 @@ private void SetWindowBackground()
                 {
                     if (Application.Current.RequestedTheme == ApplicationTheme.Light)
                     {
-                        WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutWindowLightBrush"] as AcrylicBrush;
+                        WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutLightBrush"] as SolidColorBrush;
                     }
                     else
                     {
-                        WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutWindowDarkBrush"] as AcrylicBrush;
+                        WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutDarkBrush"] as SolidColorBrush;
                     }
                 }
                 else if (WindowTheme == ElementTheme.Light)
                 {
-                    WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutWindowLightBrush"] as AcrylicBrush;
+                    WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutLightBrush"] as SolidColorBrush;
                 }
                 else if (WindowTheme == ElementTheme.Dark)
                 {
-                    WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutWindowDarkBrush"] as AcrylicBrush;
+                    WindowBackground = ResourceDictionaryHelper.WindowChromeDict["MenuFlyoutDarkBrush"] as SolidColorBrush;
                 }
             }
             else

diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Gaoyifei1011.GetStoreApp"
     Publisher="CN=高怡飞"
-    Version="1.5.427.0" />
+    Version="1.5.428.0" />
 
   <Properties>
     <DisplayName>ms-resource:PackageDisplayName</DisplayName>