Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Keep the saved size when Filee quits maximized or minimized (#586)

KnifeLemonc9139b006bce
diff --git a/src/Filee.App/Services/WindowService.cs b/src/Filee.App/Services/WindowService.cs
index 63de248f..c6c23879 100644
--- a/src/Filee.App/Services/WindowService.cs
+++ b/src/Filee.App/Services/WindowService.cs
@@ -305,7 +305,8 @@ public sealed class WindowService(ILocalizer loc, IServiceProvider services, Mem
// While it is still on screen: the release closes it hidden, when its position may no longer be known.
if (!main.IsVisible)
return;
- _mainPlacement = MainWindowPlacement.Of(main, model, _mainPlacement);
+ // Maximized or minimized it keeps the size it had before: on the first close of a run, the one it opened with.
+ _mainPlacement = MainWindowPlacement.Of(main, model, _mainPlacement ?? placement);
store?.SaveMainWindow(_mainPlacement.ToBounds());
};
main.Closed += (_, _) =>
diff --git a/tests/Filee.App.Tests/MainWindowPlacementTests.cs b/tests/Filee.App.Tests/MainWindowPlacementTests.cs
index 049a1d0e..658e3493 100644
--- a/tests/Filee.App.Tests/MainWindowPlacementTests.cs
+++ b/tests/Filee.App.Tests/MainWindowPlacementTests.cs
@@ -121,6 +121,40 @@ public class MainWindowPlacementTests
}
}
+ [AvaloniaTheory]
+ [InlineData(WindowState.Maximized)]
+ [InlineData(WindowState.Minimized)]
+ public void Quitting_maximized_or_minimized_keeps_the_size_settings_json_had(WindowState state)
+ {
+ // The first close of a run has no placement of this run to fall back on: the one the window opened with counts.
+ TestServices.EnsureInitialized("en");
+ var store = AppHost.Get<UserDataStore>();
+ var before = store.Settings.MainWindow;
+ var service = ActivatorUtilities.CreateInstance<WindowService>(AppHost.Services);
+ try
+ {
+ store.Settings.MainWindow = new WindowBounds { X = 120, Y = 80, Width = 900, Height = 600 };
+ service.ShowMain();
+ var main = service.Main!;
+ Pump();
+ main.WindowState = state;
+ Pump();
+ main.Close();
+ Pump();
+
+ var saved = Assert.IsType<WindowBounds>(store.Settings.MainWindow);
+ Assert.Equal((120, 80, 900.0, 600.0, state == WindowState.Maximized),
+ (saved.X, saved.Y, saved.Width, saved.Height, saved.Maximized));
+ }
+ finally
+ {
+ service.Main?.Close();
+ Pump();
+ store.Settings.MainWindow = before;
+ store.SaveSettings();
+ }
+ }
+
[AvaloniaTheory]
[InlineData(WindowCloseReason.ApplicationShutdown, true)] // Quit from the tray (lifetime.Shutdown())
[InlineData(WindowCloseReason.OSShutdown, false)] // Windows signing out or shutting down