X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_window.c;h=a8bdf21020328914ba1c5e83de80552875a482ce;hb=02d1360233aa5a71d0f46fda6c6956c5122fad80;hp=c9d73eaf5194d1277b75956e1e9b39af763e3cbf;hpb=ef7b4087e528297b33da63643d494bd5d8689867;p=freeglut

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index c9d73ea..a8bdf21 100644
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -581,7 +581,7 @@ void fgCloseWindow( SFG_Window* window )
             wglDeleteContext( window->Window.Context );
     }
 
-    DestroyWindow( hWnd );
+    DestroyWindow( window->Window.Handle );
 #endif
 }
 
@@ -943,13 +943,39 @@ void FGAPIENTRY glutFullScreen( void )
         }
     }
 #elif TARGET_HOST_WIN32
-    MoveWindow(
-        fgStructure.Window->Window.Handle,
-        0, 0,
-        fgDisplay.ScreenWidth,
-        fgDisplay.ScreenHeight,
-        TRUE
-    );
+    {
+        RECT rect;
+
+        /* For fullscreen mode, force the top-left corner to 0,0
+         * and adjust the window rectangle so that the client area
+         * covers the whole screen.
+         */
+
+        rect.left   = 0;
+        rect.top    = 0;
+        rect.right  = fgDisplay.ScreenWidth;
+        rect.bottom = fgDisplay.ScreenHeight;
+
+        AdjustWindowRect ( &rect, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS |
+                                  WS_CLIPCHILDREN, FALSE );
+
+        /*
+         * SWP_NOACTIVATE     Do not activate the window
+         * SWP_NOOWNERZORDER  Do not change position in z-order
+         * SWP_NOSENDCHANGING Supress WM_WINDOWPOSCHANGING message
+         * SWP_NOZORDER       Retains the current Z order (ignore 2nd param)
+         */
+
+        SetWindowPos( fgStructure.Window->Window.Handle,
+                      HWND_TOP,
+                      rect.left,
+                      rect.top,
+                      rect.right  - rect.left,
+                      rect.bottom - rect.top,
+                      SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING |
+                      SWP_NOZORDER
+                    );
+    }
 #endif
 }