Windows支持设置关闭时最小化

JiuLing-zhang · Nov 17, 2023 · 52013b2 · 52013b2
1 parent 5dcd8e8
commit 52013b2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/src/ListenTogether.Model/EnvironmentSetting.cs b/src/ListenTogether.Model/EnvironmentSetting.cs
@@ -53,9 +53,9 @@ public class GeneralSetting
         public int AppThemeInt { get; set; }
 
         /// <summary>
-        /// 关闭时最小化到托盘
+        /// 关闭时最小化
         /// </summary>
-        public bool IsHideWindowWhenMinimize { get; set; }
+        public bool IsHideWindowWhenClosed { get; set; } = false;
     }
 
     public class SearchSetting

diff --git a/src/ListenTogether.Pages/Components/DesktopTitleBar.razor b/src/ListenTogether.Pages/Components/DesktopTitleBar.razor
@@ -47,7 +47,14 @@
     }
     private Task CloseAsync()
     {
-        WindowTitleBar.Close();
+        if (Settings.Environment.General.IsHideWindowWhenClosed)
+        {
+            WindowTitleBar.Minimize();
+        }
+        else
+        {
+            WindowTitleBar.Close();
+        }
         return Task.CompletedTask;
     }
 

diff --git a/src/ListenTogether.Pages/Pages/SettingsPage.razor b/src/ListenTogether.Pages/Pages/SettingsPage.razor
@@ -41,6 +41,9 @@
             <Switch Title="启动时检查更新"
                     Checked="@(Settings.Environment.General.IsAutoCheckUpdate)"
                     OnChanged="OnIsAutoCheckUpdateChange" />
+            <Switch Title="关闭时最小化"
+                    Checked="@(Settings.Environment.General.IsHideWindowWhenClosed)"
+                    OnChanged="OnIsHideWindowWhenClosedChange" />
             <div class="d-flex justify-space-between align-center">
                 <div>外观</div>
                 <div style="width:100px;">
@@ -141,6 +144,12 @@
         Settings.Environment.General.IsAutoCheckUpdate = value;
         await WriteGeneralConfigAsync();
     }
+    private async Task OnIsHideWindowWhenClosedChange(bool value)
+    {
+        Settings.Environment.General.IsHideWindowWhenClosed = value;
+        await WriteGeneralConfigAsync();
+    }
+
     private async Task OnAppThemeIntChange(int value)
     {
         Settings.Environment.General.AppThemeInt = value;

diff --git a/src/ListenTogether.Service.Maui/EnvironmentConfigService.cs b/src/ListenTogether.Service.Maui/EnvironmentConfigService.cs
@@ -30,7 +30,7 @@ public async Task<EnvironmentSetting> ReadAllSettingsAsync()
         {
             IsAutoCheckUpdate = generalConfig.IsAutoCheckUpdate,
             AppThemeInt = generalConfig.AppThemeInt,
-            IsHideWindowWhenMinimize = generalConfig.IsHideWindowWhenMinimize,
+            IsHideWindowWhenClosed = generalConfig.IsHideWindowWhenClosed,
         };
 
         //播放设置
@@ -74,7 +74,7 @@ private async Task<EnvironmentConfigEntity> InitializationEnvironmentSettingAsyn
             {
                 AppThemeInt = 0,
                 IsAutoCheckUpdate = true,
-                IsHideWindowWhenMinimize = true
+                IsHideWindowWhenClosed = false
             }).ToJson(),
             SearchSettingJson = (new SearchSetting()
             {