Window: Fullscreen mode shouldn't affect the retained window rect

IssueID #130

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ui/window.c b/src/ui/window.c
index f8123a17..6d697e88 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -827,6 +827,10 @@ static iBool isMaximized_Window_(const iWindow *d) {
 #endif
 }
 
+iBool isFullscreen_Window(const iWindow *d) {
+    return (SDL_GetWindowFlags(d->win) & SDL_WINDOW_FULLSCREEN_DESKTOP) != 0;
+}
+
 static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
     switch (ev->event) {
         case SDL_WINDOWEVENT_EXPOSED:
@@ -845,7 +849,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
 #endif
             return iFalse;
         case SDL_WINDOWEVENT_MOVED: {
-            if (!isMaximized_Window_(d) && !d->isDrawFrozen) {
+            if (!isMaximized_Window_(d) && !isFullscreen_Window(d) && !d->isDrawFrozen) {
                 d->lastRect.pos = init_I2(ev->data1, ev->data2);
                 iInt2 border = zero_I2();
 #if !defined (iPlatformApple)
@@ -856,7 +860,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iTrue;
         }
         case SDL_WINDOWEVENT_RESIZED:
-            if (!isMaximized_Window_(d) && !d->isDrawFrozen) {
+            if (!isMaximized_Window_(d) && !isFullscreen_Window(d) && !d->isDrawFrozen) {
                 d->lastRect.size = init_I2(ev->data1, ev->data2);
             }
             updateRootSize_Window_(d, iTrue /* we were already redrawing during the resize */);
diff --git a/src/ui/window.h b/src/ui/window.h
index 4b6a6e7a..8cadad1b 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -65,5 +65,6 @@ iInt2       coord_Window            (const iWindow *, int x, int y);
 iInt2       mouseCoord_Window       (const iWindow *);
 uint32_t    frameTime_Window        (const iWindow *);
 SDL_Renderer *renderer_Window       (const iWindow *);
+iBool       isFullscreen_Window     (const iWindow *);
 
 iWindow *   get_Window              (void);