diff --git a/src/ListenTogether.Model/EnvironmentSetting.cs b/src/ListenTogether.Model/EnvironmentSetting.cs index a8536e5..dd595ae 100644 --- a/src/ListenTogether.Model/EnvironmentSetting.cs +++ b/src/ListenTogether.Model/EnvironmentSetting.cs @@ -53,9 +53,9 @@ public class GeneralSetting public int AppThemeInt { get; set; } /// - /// 关闭时最小化到托盘 + /// 关闭时最小化 /// - 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 index 39bac29..27401c4 100644 --- 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 index 84b6379..9cb1d79 100644 --- a/src/ListenTogether.Pages/Pages/SettingsPage.razor +++ b/src/ListenTogether.Pages/Pages/SettingsPage.razor @@ -41,6 +41,9 @@ +
外观
@@ -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 index 804dc2f..f82685e 100644 --- a/src/ListenTogether.Service.Maui/EnvironmentConfigService.cs +++ b/src/ListenTogether.Service.Maui/EnvironmentConfigService.cs @@ -30,7 +30,7 @@ public async Task ReadAllSettingsAsync() { IsAutoCheckUpdate = generalConfig.IsAutoCheckUpdate, AppThemeInt = generalConfig.AppThemeInt, - IsHideWindowWhenMinimize = generalConfig.IsHideWindowWhenMinimize, + IsHideWindowWhenClosed = generalConfig.IsHideWindowWhenClosed, }; //播放设置 @@ -74,7 +74,7 @@ private async Task InitializationEnvironmentSettingAsyn { AppThemeInt = 0, IsAutoCheckUpdate = true, - IsHideWindowWhenMinimize = true + IsHideWindowWhenClosed = false }).ToJson(), SearchSettingJson = (new SearchSetting() {