Merge pull request H-uru#214 from cwalther/window-size

Avoid truncated window size after going from fullscreen to a window of the same size
Deledrius · Jun 18, 2012 · 4ee30c1 · 4ee30c1
2 parents a2a6a2d + 4577f9f
commit 4ee30c1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -2181,10 +2181,10 @@ void plClient::ResetDisplayDevice(int Width, int Height, int ColorDepth, hsBool
 
     WindowActivate(false);
 
-    ResizeDisplayDevice(Width, Height, Windowed);
-
     fPipeline->ResetDisplayDevice(Width, Height, ColorDepth, Windowed, NumAASamples, MaxAnisotropicSamples, VSync);
 
+    ResizeDisplayDevice(Width, Height, Windowed);
+
     WindowActivate(true);
 }
 
@@ -2202,7 +2202,8 @@ void plClient::ResizeDisplayDevice(int Width, int Height, hsBool Windowed)
     uint32_t winStyle, winExStyle;
     if( Windowed )
     {
-        winStyle = WS_OVERLAPPEDWINDOW;
+        // WS_VISIBLE appears necessary to avoid leaving behind framebuffer junk when going from windowed to a smaller window
+        winStyle = WS_OVERLAPPEDWINDOW | WS_VISIBLE;
         winExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
     } else {
         winStyle = WS_POPUP;