Save main screen size in the app preferences. (#166)

Author: DaleStan

Yafc.UI/Core/Ui.cs

@@ -156,6 +156,12 @@ public static void ProcessEvents() {
                                 case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_RESIZED:
                                     window.WindowResize();
                                     break;
+                                case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_MAXIMIZED:
+                                    window.WindowMaximized();
+                                    break;
+                                case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_RESTORED:
+                                    window.WindowRestored();
+                                    break;
                                 default:
                                     Console.WriteLine("Window event of type " + evt.window.windowEvent);
                                     window.Rebuild(); // might be something like "window exposed", better to paint the UI again

Yafc.UI/Core/Window.cs

@@ -77,7 +77,7 @@ internal int CalculateUnitsToPixels(int display) {
             return desiredUnitsToPixels;
         }
 
-        internal virtual void WindowResize() {
+        protected internal virtual void WindowResize() {
             rootGui.MarkEverythingForRebuild();
             rootGui.Rebuild();
         }
@@ -223,5 +223,7 @@ private void Build(ImGui gui) {
         public virtual void Dispose() => rootGui.Dispose();
 
         internal ImGui.DragOverlay GetDragOverlay() => draggingOverlay ??= new ImGui.DragOverlay(InputSystem);
+        protected internal virtual void WindowMaximized() { }
+        protected internal virtual void WindowRestored() { }
     }
 }

Yafc.UI/Core/WindowMain.cs

@@ -6,7 +6,7 @@
 namespace Yafc.UI {
     // Main window is resizable and hardware-accelerated
     public abstract class WindowMain : Window {
-        protected void Create(string title, int display) {
+        protected void Create(string title, int display, float initialWidth, float initialHeight, bool maximized) {
             if (visible) {
                 return;
             }
@@ -17,13 +17,16 @@ protected void Create(string title, int display) {
             int minWidth = MathUtils.Round(85f * pixelsPerUnit);
             int minHeight = MathUtils.Round(60f * pixelsPerUnit);
             // Initial width/height define the initial size of the MainWindow when it is opened.
-            int initialWidth = MathUtils.Round(85f * pixelsPerUnit);
-            int initialHeight = MathUtils.Round(60f * pixelsPerUnit);
+            int initialWidthPixels = Math.Max(minWidth, MathUtils.Round(initialWidth * pixelsPerUnit));
+            int initialHeightPixels = Math.Max(minHeight, MathUtils.Round(initialHeight * pixelsPerUnit));
+            SDL.SDL_WindowFlags flags = SDL.SDL_WindowFlags.SDL_WINDOW_RESIZABLE | (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 0 : SDL.SDL_WindowFlags.SDL_WINDOW_OPENGL);
+            if (maximized) {
+                flags |= SDL.SDL_WindowFlags.SDL_WINDOW_MAXIMIZED;
+            }
             window = SDL.SDL_CreateWindow(title,
                 SDL.SDL_WINDOWPOS_CENTERED_DISPLAY(display),
                 SDL.SDL_WINDOWPOS_CENTERED_DISPLAY(display),
-                initialWidth, initialHeight,
-                SDL.SDL_WindowFlags.SDL_WINDOW_RESIZABLE | (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 0 : SDL.SDL_WindowFlags.SDL_WINDOW_OPENGL)
+                initialWidthPixels, initialHeightPixels, flags
             );
             SDL.SDL_SetWindowMinimumSize(window, minWidth, minHeight);
             WindowResize();
@@ -43,12 +46,19 @@ protected override void OnRepaint() {
             base.OnRepaint();
         }
 
-        internal override void WindowResize() {
+        protected internal override void WindowResize() {
             SDL.SDL_GetWindowSize(window, out int windowWidth, out int windowHeight);
             contentSize = new Vector2(windowWidth / pixelsPerUnit, windowHeight / pixelsPerUnit);
             base.WindowResize();
         }
 
+        protected bool IsMaximized {
+            get {
+                SDL.SDL_WindowFlags flags = (SDL.SDL_WindowFlags)SDL.SDL_GetWindowFlags(window);
+                return flags.HasFlag(SDL.SDL_WindowFlags.SDL_WINDOW_MAXIMIZED);
+            }
+        }
+
         protected WindowMain(Padding padding) : base(padding) { }
     }
 

Yafc.UI/Core/WindowUtility.cs

@@ -35,7 +35,7 @@ protected void Create(string? title, float width, Window? parent) {
             base.Create();
         }
 
-        internal override void WindowResize() {
+        protected internal override void WindowResize() {
             (surface as UtilityWindowDrawingSurface)!.OnResize(); // null-forgiving: Assuming WindowResize cannot be called before Create
             base.WindowResize();
         }

Yafc/Utils/Preferences.cs

@@ -45,6 +45,18 @@ public void Save() {
         public bool darkMode { get; set; }
         public string language { get; set; } = "en";
         public string? overrideFont { get; set; }
+        /// <summary>
+        /// Whether or not the main screen should be created maximized.
+        /// </summary>
+        public bool maximizeMainScreen { get; set; }
+        /// <summary>
+        /// The initial width of the main screen or the width the main screen will be after being restored, depending on whether it starts restored or maximized.
+        /// </summary>
+        public float initialMainScreenWidth { get; set; }
+        /// <summary>
+        /// The initial height of the main screen or the height the main screen will be after being restored, depending on whether it starts restored or maximized.
+        /// </summary>
+        public float initialMainScreenHeight { get; set; }
 
         public void AddProject(string path, string dataPath, string modsPath, bool expensiveRecipes, bool netProduction) {
             recentProjects = recentProjects.Where(x => string.Compare(path, x.path, StringComparison.InvariantCultureIgnoreCase) != 0)

Yafc/Windows/MainScreen.cs

@@ -55,7 +55,7 @@ public MainScreen(int display, Project project) : base(default) {
             objectTooltip = new ObjectTooltip();
             tabBar = new MainScreenTabBar(this);
             allPages = new VirtualScrollList<ProjectPage>(30, new Vector2(0f, 2f), BuildPage, InputSystem, collapsible: true);
-            Create("Yet Another Factorio Calculator CE v" + YafcLib.version, display);
+            Create("Yet Another Factorio Calculator CE v" + YafcLib.version, display, Preferences.Instance.initialMainScreenWidth, Preferences.Instance.initialMainScreenHeight, Preferences.Instance.maximizeMainScreen);
             SetProject(project);
         }
 
@@ -444,6 +444,25 @@ protected override async void Close() {
             ForceClose();
         }
 
+        protected override void WindowMaximized() {
+            Preferences.Instance.maximizeMainScreen = true;
+            Preferences.Instance.Save();
+        }
+
+        protected override void WindowRestored() {
+            Preferences.Instance.maximizeMainScreen = false;
+            Preferences.Instance.Save();
+        }
+
+        protected override void WindowResize() {
+            base.WindowResize();
+            if (!IsMaximized) {
+                Preferences.Instance.initialMainScreenWidth = size.X;
+                Preferences.Instance.initialMainScreenHeight = size.Y;
+                Preferences.Instance.Save();
+            }
+        }
+
         public void ForceClose() {
             base.Close();
         }

changelog.txt

@@ -16,6 +16,7 @@ Date: soon
     Features:
         - Add several right-click and keyboard shortcuts, notably Enter/Return to close most dialogs.
         - Add UI rebuilding itself on resize.
+        - When opening the main window, use the same size it was when it was last closed.
     Bugfixes:
         - Fix that some pages couldn't be deleted.
         - Fix that returning to the Welcome Screen could break the panels in the main window.