[Bf-blender-cvs] [9b87d3f0296] master: Win32: Allow return from fullscreen to maximized

[Vincent Blankfield]

Commit: 9b87d3f029626d124a7814512aac79a1b637baa7
Author: Vincent Blankfield
Date:   Fri Mar 26 14:30:57 2021 -0700
Branches: master
https://developer.blender.org/rB9b87d3f029626d124a7814512aac79a1b637baa7

Win32: Allow return from fullscreen to maximized

If window is maximized when toggling fullscreen, go back to maximized when done.

Differential Revision: https://developer.blender.org/D10813

Reviewed by Harley Acheson

===================================================================

M	intern/ghost/intern/GHOST_WindowWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 7496874b4b9..28ce1381562 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -537,7 +537,14 @@ GHOST_TSuccess GHOST_WindowWin32::setState(GHOST_TWindowState state)
       break;
     case GHOST_kWindowStateNormal:
     default:
-      wp.showCmd = SW_SHOWNORMAL;
+      if (curstate == GHOST_kWindowStateFullScreen &&
+          m_normal_state == GHOST_kWindowStateMaximized) {
+        wp.showCmd = SW_SHOWMAXIMIZED;
+        m_normal_state = GHOST_kWindowStateNormal;
+      }
+      else {
+        wp.showCmd = SW_SHOWNORMAL;
+      }
       break;
   }
   ::SetWindowLongPtr(m_hWnd, GWL_STYLE, style);