From 724914ff694b2d27ff0b85f80c215e43d7175f44 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 20 May 2012 08:58:32 +0000
Subject: [PATCH] *CtrlCore: Win32 TopWindow SerializePlacement patched

git-svn-id: svn://ultimatepp.org/upp/trunk@4971 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/TopWin32.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/uppsrc/CtrlCore/TopWin32.cpp b/uppsrc/CtrlCore/TopWin32.cpp
index c6e16bafe..1f4b64eb7 100644
--- a/uppsrc/CtrlCore/TopWin32.cpp
+++ b/uppsrc/CtrlCore/TopWin32.cpp
@@ -348,7 +348,7 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize)
 	LLOG("minimized = " << mn << ", maximized = " << mx);
 	LLOG("rect = " << rect << ", overlapped = " << overlapped);
 	if(s.IsLoading()) {
-		if(mn) rect = overlapped;
+		rect = overlapped;
 		Rect limit = GetVirtualWorkArea();
 		Rect outer = rect;
 		::AdjustWindowRect(outer, WS_OVERLAPPEDWINDOW, FALSE);
@@ -362,12 +362,11 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize)
 			minmax(rect.top,  limit.top,  limit.bottom - sz.cy),
 			sz.cx, sz.cy);
 		state = OVERLAPPED;
+		SetRect(rect);
 		if(mn && reminimize)
 			state = MINIMIZED;
 		if(mx)
 			state = MAXIMIZED;
-		if(state == OVERLAPPED)
-			SetRect(rect);
 		if(IsOpen()) {
 			WINDOWPLACEMENT wp;
 			memset(&wp,0,sizeof(WINDOWPLACEMENT));
@@ -378,23 +377,6 @@ void TopWindow::SerializePlacement(Stream& s, bool reminimize)
 			wp.rcNormalPosition.right=rect.right;
 			wp.rcNormalPosition.bottom=rect.bottom;
 			::SetWindowPlacement(GetHWND(),&wp);
-		/*
-			HWND hwnd = GetHWND();
-			switch(state) {
-			case MINIMIZED:
-				if(!IsIconic(hwnd))
-					::ShowWindow(hwnd, SW_MINIMIZE);
-				break;
-			case MAXIMIZED:
-				if(!IsZoomed(hwnd))
-					::ShowWindow(hwnd, SW_MAXIMIZE);
-				break;
-			default:
-				if(IsIconic(hwnd) || IsZoomed(hwnd))
-					::ShowWindow(hwnd, SW_RESTORE);
-				break;
-			}
-		*/
 		}
 	}
 #endif