From 5ea13748662075c365036d168dca5d4e239194eb Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Sun, 22 Aug 2021 15:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=E6=89=98?=
 =?UTF-8?q?=E7=9B=98=E8=8F=9C=E5=8D=95=E6=9C=89=E6=97=B6=E5=80=99=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=89=93=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Pages/ProxyScriptManagePage.axaml   | 16 +++++++-------
 .../UI/Views/Windows/TaskBarWindow.axaml.cs   |  3 +--
 .../Implementation/WindowServiceImpl.cs       | 21 +++++++++++--------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
index c6b28a55e..ce9e78967 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
@@ -31,20 +31,20 @@
                         VerticalAlignment="Center"></ToggleSwitch>
 
           <controls:ProgressRing IsIndeterminate="True" ToolTip.Tip="{ReflectionBinding Path=Res.Script_ImportLoading,Mode=OneWay,Source={x:Static resx:R.Current}}" HorizontalAlignment="Stretch" Height="30" Width="30" IsVisible="{Binding Source={x:Static service:ProxyService.Current},Path=IsLoading,Mode=OneWay}" />
-          <Button IsVisible="{Binding Source={x:Static service:ProxyService.Current},Path=!IsLoading,Mode=OneWay}" 
-                  Background="Transparent" 
-                  Cursor="Hand" 
+          <Button IsVisible="{Binding Source={x:Static service:ProxyService.Current},Path=!IsLoading,Mode=OneWay}"
+                  Background="Transparent"
+                  Cursor="Hand"
                   Command="{Binding AddNewScriptButton_Click}"
                    ToolTip.Tip="{ReflectionBinding Path=Res.Import,Mode=OneWay,Source={x:Static resx:R.Current}}">
             <PathIcon Width="16"  Data="{StaticResource AddDrawing}" />
           </Button>
-          <Button Background="Transparent" 
+          <Button Background="Transparent"
                   Cursor="Hand"
                   Command="{ReflectionBinding RefreshScriptButton}"
                   ToolTip.Tip="{ReflectionBinding Path=Res.Refresh,Mode=OneWay,Source={x:Static resx:R.Current}}">
             <PathIcon Width="16"  Data="{StaticResource RefreshDrawing}" />
           </Button>
-          <Button Background="Transparent" 
+          <Button Background="Transparent"
                   Cursor="Hand"
                   Command="{Binding ScriptStoreCommand}"
                   ToolTip.Tip="{ReflectionBinding Path=Res.ScriptStore,Mode=OneWay,Source={x:Static resx:R.Current}}">
@@ -139,12 +139,12 @@
 
                     <DockPanel VerticalAlignment="Bottom">
                       <StackPanel Orientation="Horizontal" Spacing="10">
-                        <ToggleSwitch Classes="onlyToggleSwitch" 
+                        <ToggleSwitch Classes="onlyToggleSwitch"
                                       Margin="0 -5 0 0"
                                       IsChecked="{Binding Enable,Mode=TwoWay}"
                                       VerticalAlignment="Center">
                         </ToggleSwitch>
-                        
+
                         <Button Background="Transparent"
                                 Cursor="Hand"
                                 VerticalAlignment="Center"
@@ -170,7 +170,7 @@
                           <PathIcon Width="16"  Data="{StaticResource HomeDrawing}" />
                         </Button>
 
-                        <Button Background="Transparent" IsVisible="{Binding !IsBasics}" Cursor="Hand" 
+                        <Button Background="Transparent" IsVisible="{Binding !IsBasics}" Cursor="Hand"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Right"
                                 Command="{ReflectionBinding #u.DataContext.DeleteScriptItemButton}"
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/TaskBarWindow.axaml.cs b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/TaskBarWindow.axaml.cs
index d67a7c701..cb772484f 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/TaskBarWindow.axaml.cs
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/TaskBarWindow.axaml.cs
@@ -44,8 +44,7 @@ namespace System.Application.UI.Views.Windows
 
             if (OperatingSystem2.IsWindows10AtLeast)
             {
-                var thm = AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>();
-                thm.ForceNativeTitleBarToTheme(this);
+                AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>().ForceNativeTitleBarToTheme(this);
             }
         }
 
diff --git a/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
index e49ed9ef7..a6e9480d9 100644
--- a/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
+++ b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
@@ -43,13 +43,16 @@ namespace System.Application.Services.Implementation
                     mainWindow = new MainWindowViewModel();
                     MainWindow = mainWindow;
                 }
-                taskbarWindow = new TaskBarWindowViewModel();
             }
             catch (Exception ex)
             {
                 Log.Error("WindowService", ex, "Init WindowViewModel");
                 throw;
             }
+            finally
+            {
+                taskbarWindow = new TaskBarWindowViewModel();
+            }
         }
 
         int? appidUnlockAchievement;
@@ -82,14 +85,14 @@ namespace System.Application.Services.Implementation
         {
             try
             {
-                if (!taskbarWindow.IsVisible)
-                {
-                    taskbarWindow.Show(x, y);
-                }
-                else
-                {
-                    taskbarWindow.SetPosition(x, y);
-                }
+                //if (!taskbarWindow.IsVisible)
+                //{
+                taskbarWindow.Show(x, y);
+                //}
+                //else
+                //{
+                //    taskbarWindow.SetPosition(x, y);
+                //}
             }
             catch (Exception ex)
             {