WindyMadman/Pixeval
1
0
Fork 0
mirror of https://github.com/Pixeval/Pixeval.git synced 2025-01-09 04:09:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

最大化设置持久化 (#365)

Browse Source
This commit is contained in:
Poker 2024-03-08 21:39:52 +08:00 committed by GitHub
parent d701cfa906
commit f644064274
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Pixeval.Controls/Windowing/WindowFactory.cs
View File

@ -50,7 +50,7 @@ public static class WindowFactory
if (element.XamlRoot is null) if (element.XamlRoot is null)
ThrowHelper.ArgumentNull(element.XamlRoot, $"{nameof(element.XamlRoot)} should not be null."); ThrowHelper.ArgumentNull(element.XamlRoot, $"{nameof(element.XamlRoot)} should not be null.");
return _forkedWindowsInternal.Find(window => element.XamlRoot == window.Content.XamlRoot) return _forkedWindowsInternal.Find(window => element.XamlRoot == window.Content.XamlRoot)
?? ThrowHelper.ArgumentOutOfRange<UIElement, EnhancedWindow>(element, $"Specified {nameof(element)} is not existed in any of {nameof(ForkedWindows)}."); ?? ThrowHelper.ArgumentOutOfRange<UIElement, EnhancedWindow>(element, $"Specified {nameof(element)} is not existed in any of {nameof(ForkedWindows)}.");
} }
@ -95,7 +95,7 @@ public static class WindowFactory
return window; return window;
} }
public static EnhancedWindow Init(this EnhancedWindow window, string title, SizeInt32 size = default) public static EnhancedWindow Init(this EnhancedWindow window, string title, SizeInt32 size = default, bool isMaximized = false)
{ {
window.Initialize(new InitializeInfo window.Initialize(new InitializeInfo
{ {
@ -105,6 +105,8 @@ public static class WindowFactory
IconPath = IconAbsolutePath, IconPath = IconAbsolutePath,
Title = title Title = title
}); });
if (isMaximized)
window.AppWindow.Presenter.To<OverlappedPresenter>().Maximize();
window.FrameLoaded += (s, _) => s.To<FrameworkElement>().RequestedTheme = WindowSettings.Theme; window.FrameLoaded += (s, _) => s.To<FrameworkElement>().RequestedTheme = WindowSettings.Theme;
return window; return window;
} }

2
src/Pixeval/App.xaml.cs
View File

@ -91,7 +91,7 @@ public partial class App
.WithLoaded((s, _) => s.To<Frame>().NavigateTo<LoginPage>(w)) .WithLoaded((s, _) => s.To<Frame>().NavigateTo<LoginPage>(w))
.WithClosing((_, _) => AppInfo.SaveContext()) // TODO: 从运行打开应用的时候不会ExitApp，就算是调用App.Current.Exit(); .WithClosing((_, _) => AppInfo.SaveContext()) // TODO: 从运行打开应用的时候不会ExitApp，就算是调用App.Current.Exit();
.WithSizeLimit(800, 360) .WithSizeLimit(800, 360)
.Init(AppInfo.AppIdentifier, AppViewModel.AppSettings.WindowSize.ToSizeInt32()) .Init(AppInfo.AppIdentifier, AppViewModel.AppSettings.WindowSize.ToSizeInt32(), AppViewModel.AppSettings.IsMaximized)
.Activate(); .Activate();
RegisterUnhandledExceptionHandler(); RegisterUnhandledExceptionHandler();

8
src/Pixeval/AppManagement/AppInfo.cs
View File

@ -200,7 +200,13 @@ public static partial class AppInfo
public static void SaveContext() public static void SaveContext()
{ {
// Save the current resolution // Save the current resolution
App.AppViewModel.AppSettings.WindowSize = WindowFactory.RootWindow.AppWindow.Size.ToSize(); if (WindowFactory.RootWindow.AppWindow.Presenter is OverlappedPresenter { State: OverlappedPresenterState.Maximized })
App.AppViewModel.AppSettings.IsMaximized = true;
else
{
App.AppViewModel.AppSettings.IsMaximized = false;
App.AppViewModel.AppSettings.WindowSize = WindowFactory.RootWindow.AppWindow.Size.ToSize();
}
if (!App.AppViewModel.SignOutExit) if (!App.AppViewModel.SignOutExit)
{ {
if (App.AppViewModel.MakoClient != null!) if (App.AppViewModel.MakoClient != null!)

4
src/Pixeval/AppManagement/AppSettings.cs
View File

@ -248,6 +248,10 @@ public partial record AppSettings : IWindowSettings
[SyntheticSetting] [SyntheticSetting]
public Size WindowSize { get; set; } = WindowHelper.EstimatedWindowSize().ToSize(); public Size WindowSize { get; set; } = WindowHelper.EstimatedWindowSize().ToSize();
[AttributeIgnore(typeof(SettingsViewModelAttribute<>))]
[SyntheticSetting]
public bool IsMaximized { get; set; } = false;
public MakoClientConfiguration ToMakoClientConfiguration() public MakoClientConfiguration ToMakoClientConfiguration()
{ {
return new MakoClientConfiguration(5000, !DisableDomainFronting, MirrorHost, CultureInfo.CurrentUICulture); return new MakoClientConfiguration(5000, !DisableDomainFronting, MirrorHost, CultureInfo.CurrentUICulture);