From 2e96d594df4346b46f019feeef303d86ea40cc7d Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Fri, 11 Feb 2022 18:02:06 +0800
Subject: [PATCH] Bump FluentAvalonia to lastest Bump titanium-web-proxy to
 lastest

---
 references/FluentAvalonia                                 | 2 +-
 references/Titanium-Web-Proxy                             | 2 +-
 src/ST.Client.Desktop.Avalonia.App/App.axaml              | 5 +----
 src/ST.Client.Desktop.Avalonia.App/App.axaml.cs           | 6 +++---
 .../Implementation/AvaloniaWin32WindowingPlatformImpl.cs  | 6 +++---
 .../Application/UI/Views/Windows/DebugWindow.axaml.cs     | 8 ++++----
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/references/FluentAvalonia b/references/FluentAvalonia
index af86596b1..5ee989b1b 160000
--- a/references/FluentAvalonia
+++ b/references/FluentAvalonia
@@ -1 +1 @@
-Subproject commit af86596b10f3475fb6edd90a4ec6dd6751282c5a
+Subproject commit 5ee989b1b81b36707c1b4194c5d31afb0861e652
diff --git a/references/Titanium-Web-Proxy b/references/Titanium-Web-Proxy
index 29256a4b4..c36a4563a 160000
--- a/references/Titanium-Web-Proxy
+++ b/references/Titanium-Web-Proxy
@@ -1 +1 @@
-Subproject commit 29256a4b4fb5bbbb4a0dafb7bab2b37d4bf45c78
+Subproject commit c36a4563a057f35ffabf1200fb0bd10140125bda
diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml b/src/ST.Client.Desktop.Avalonia.App/App.axaml
index 282bfb19e..6d2c78788 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml
@@ -21,10 +21,7 @@
   </Application.Resources>
   <Application.Styles>
     <!--<FluentTheme Mode="Dark" />-->
-    <sty:FluentAvaloniaTheme RequestedTheme="Dark"
-                             DefaultToUserTheme="False"
-                             GetUserAccentColor="False"
-                             UseSegoeUIOnWindows="True"/>
+    <sty:FluentAvaloniaTheme />
     <StyleInclude Source="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Styles/ThemeDark.xaml" />
     <StyleInclude Source="avares://System.Application.SteamTools.Client.Avalonia/Application/UI/Styles/ThemeAccent.xaml" />
     
diff --git a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
index e36cdb448..36ca205be 100644
--- a/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -152,13 +152,13 @@ namespace System.Application.UI
             if (OperatingSystem2.IsWindows)
             {
                 if (OperatingSystem2.IsWindowsVersionAtLeast(6, 2))
-                    thm.GetUserAccentColor = true;
+                    thm.UseUserAccentColorOnWindows = true;
                 else
-                    thm.GetUserAccentColor = false;
+                    thm.UseUserAccentColorOnWindows = false;
             }
             else
             {
-                thm.GetUserAccentColor = true;
+                thm.UseUserAccentColorOnWindows = true;
             }
         }
 
diff --git a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaWin32WindowingPlatformImpl.cs b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaWin32WindowingPlatformImpl.cs
index c27587f72..4aecea9a4 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaWin32WindowingPlatformImpl.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/Services/Implementation/AvaloniaWin32WindowingPlatformImpl.cs
@@ -155,9 +155,9 @@ namespace System.Application.Services.Implementation
                         }
                         break;
 
-                    case WM.ACTIVATE:
-                        EnsureExtended();
-                        break;
+                    //case WM.ACTIVATE:
+                    //    EnsureExtended();
+                    //    break;
 
                     case WM.NCMOUSEMOVE:
                         if (_fakingMaximizeButton)
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/DebugWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/DebugWindow.axaml.cs
index 7f8a23e39..92c8e08f8 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/DebugWindow.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/DebugWindow.axaml.cs
@@ -17,10 +17,10 @@ namespace System.Application.UI.Views.Windows
             SystemDecorations = SystemDecorations.Full;
             ExtendClientAreaChromeHints = Avalonia.Platform.ExtendClientAreaChromeHints.PreferSystemChrome;
 
-            if (OperatingSystem2.IsWindows11AtLeast)
-            {
-                AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>().ForceNativeTitleBarToTheme(this, "Dark");
-            }
+            //if (OperatingSystem2.IsWindows11AtLeast)
+            //{
+            //    AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>().ForceNativeTitleBarToTheme(this, "Dark");
+            //}
 #if DEBUG
             this.AttachDevTools();
 #endif