[dasher: 199/217] Win32 Maximized state was not remembered if minimized window was closed.



commit 36c5ed7b6785653468d4ad81d9c6ec3493996624
Author: Ada Majorek <amajorek google com>
Date:   Mon Feb 1 11:36:19 2016 -0800

    Win32 Maximized state was not remembered if minimized window was closed.

 Src/Win32/DasherWindow.cpp |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index ab313f1..1170c2b 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -474,16 +474,18 @@ LRESULT CDasherWindow::OnWindowPosChanged(UINT message, WPARAM wParam, LPARAM lP
     WINDOWPLACEMENT wp;
     wp.length = sizeof(wp);
     if (GetWindowPlacement(&wp)) {
-      bool normal = wp.showCmd != SW_SHOWMAXIMIZED && wp.showCmd != SW_SHOWMINIMIZED;
-      if (normal)
-      {
-        LPWINDOWPOS pwp = (LPWINDOWPOS)lParam;
-        m_pAppSettings->SetLongParameter(APP_LP_X, pwp->x);
-        m_pAppSettings->SetLongParameter(APP_LP_Y,pwp->y);
-        m_pAppSettings->SetLongParameter(APP_LP_SCREEN_WIDTH, pwp->cx);
-        m_pAppSettings->SetLongParameter(APP_LP_SCREEN_HEIGHT, pwp->cy);
+      if (wp.showCmd != SW_SHOWMINIMIZED) {
+        bool normal = wp.showCmd != SW_SHOWMAXIMIZED;
+        if (normal)
+        {
+          LPWINDOWPOS pwp = (LPWINDOWPOS)lParam;
+          m_pAppSettings->SetLongParameter(APP_LP_X, pwp->x);
+          m_pAppSettings->SetLongParameter(APP_LP_Y, pwp->y);
+          m_pAppSettings->SetLongParameter(APP_LP_SCREEN_WIDTH, pwp->cx);
+          m_pAppSettings->SetLongParameter(APP_LP_SCREEN_HEIGHT, pwp->cy);
+        }
+        m_pAppSettings->SetBoolParameter(APP_BP_FULL_SCREEN, !normal);
       }
-    m_pAppSettings->SetBoolParameter(APP_BP_FULL_SCREEN, wp.showCmd == SW_SHOWMAXIMIZED);
     }
   }
   bHandled = false;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]