From fd9b9a85ce0872fbc68981c18b4cbf47874b610d Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Thu, 29 Dec 2011 23:30:09 -0200
Subject: [PATCH] fix maximize on win32

---
 src/framework/platform/win32window.cpp | 12 +++---------
 src/framework/platform/win32window.h   |  1 -
 src/framework/platform/x11window.cpp   |  3 +--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp
index f3960f08..94ee1448 100644
--- a/src/framework/platform/win32window.cpp
+++ b/src/framework/platform/win32window.cpp
@@ -263,7 +263,6 @@ void WIN32Window::internalCreateWindow()
     DWORD dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
     DWORD dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
 
-    dump << m_size;
     RECT windowRect = {m_pos.x, m_pos.y, m_pos.x + m_size.width(), m_pos.y + m_size.height()};
     AdjustWindowRectEx(&windowRect, dwStyle, FALSE, dwExStyle);
 
@@ -471,15 +470,14 @@ LRESULT WIN32Window::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
             break;
         }
         case WM_MOVE: {
-            m_lastWindowPos = m_pos;
             m_pos.x = LOWORD(lParam);
             m_pos.y = HIWORD(lParam);
+            dump << m_pos;
             break;
         }
         case WM_SIZE: {
             switch(wParam) {
                 case SIZE_MAXIMIZED:
-                    m_pos = m_lastWindowPos;
                     m_maximized = true;
                     break;
                 case SIZE_RESTORED:
@@ -488,12 +486,8 @@ LRESULT WIN32Window::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
             }
 
             m_visible = !(wParam == SIZE_MINIMIZED);
-
-            if(!m_maximized) {
-                m_size.setWidth(LOWORD(lParam));
-                m_size.setHeight(HIWORD(lParam));
-            }
-
+            m_size.setWidth(LOWORD(lParam));
+            m_size.setHeight(HIWORD(lParam));
             m_onResize(m_size);
             break;
         }
diff --git a/src/framework/platform/win32window.h b/src/framework/platform/win32window.h
index a843c7e6..64024576 100644
--- a/src/framework/platform/win32window.h
+++ b/src/framework/platform/win32window.h
@@ -77,7 +77,6 @@ private:
     HDC m_deviceContext;
     HGLRC m_glContext;
     bool m_maximized;
-    Point m_lastWindowPos;
     std::string m_clipboardText;
     std::map<int, Fw::Key> m_keyMap;
 };
diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp
index 83292ce2..dcecfb6c 100644
--- a/src/framework/platform/x11window.cpp
+++ b/src/framework/platform/x11window.cpp
@@ -560,8 +560,7 @@ void X11Window::poll()
                 }
 
                 // updates window pos
-                if(m_pos != newPos && !isMaximized())
-                    m_pos = newPos;
+                m_pos = newPos;
                 break;
             }
             case SelectionRequest: {