Restoring maximized windows

Window position and size are stored when move/resize events are received, not only when the window is closed.

2 files changed, 16 insertions, 3 deletions

diff --git a/src/ui/window.c b/src/ui/window.c
index a7ec37dd..6c7775ee 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -507,6 +507,7 @@ void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
     iZap(d->cursors);
     d->initialPos = rect.pos;
+    d->lastRect = rect;
     d->pendingCursor = NULL;
     d->isDrawFrozen = iTrue;
     uint32_t flags = 0;
@@ -525,7 +526,7 @@ void init_Window(iWindow *d, iRect rect) {
             exit(-2);
         }
     }
-    if (left_Rect(rect) >= 0) {
+    if (left_Rect(rect) >= 0 || top_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
     }
     SDL_SetWindowMinimumSize(d->win, 400, 250);
@@ -608,11 +609,22 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             }
             return iFalse;
 #endif
-        case SDL_WINDOWEVENT_MOVED:
-            /* No need to do anything. */
+        case SDL_WINDOWEVENT_MOVED: {
+            if (!(SDL_GetWindowFlags(d->win) & (SDL_WINDOW_MINIMIZED | SDL_WINDOW_MAXIMIZED))) {
+                d->lastRect.pos = init_I2(ev->data1, ev->data2);
+                iInt2 border = zero_I2();
+#if defined (iPlatformMsys) || defined (iPlatformLinux)
+                SDL_GetWindowBordersSize(d->win, &border.y, &border.x, NULL, NULL);
+#endif
+                d->lastRect.pos = max_I2(zero_I2(), sub_I2(d->lastRect.pos, border));
+            }
             return iTrue;
+        }
         case SDL_WINDOWEVENT_RESIZED:
         case SDL_WINDOWEVENT_SIZE_CHANGED:
+            if (!(SDL_GetWindowFlags(d->win) & (SDL_WINDOW_MINIMIZED | SDL_WINDOW_MAXIMIZED))) {
+                d->lastRect.size = init_I2(ev->data1, ev->data2);
+            }
             updateRootSize_Window_(d);
             return iTrue;
         case SDL_WINDOWEVENT_LEAVE:
diff --git a/src/ui/window.h b/src/ui/window.h
index b067d30e..da4a2123 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -35,6 +35,7 @@ iDeclareTypeConstructionArgs(Window, iRect rect)
 struct Impl_Window {
     SDL_Window *  win;
     iInt2         initialPos;
+    iRect         lastRect; /* updated when window is moved/resized */
     iBool         isDrawFrozen; /* avoids premature draws while restoring window state */
     SDL_Renderer *render;
     iWidget *     root;