Merge pull request #347 from adobe/jeff/fix-5252

Restored secondary windows need repainting

Author: RaymondLim

appshell/cef_host_window.cpp

@@ -90,11 +90,45 @@ BOOL cef_host_window::DoCommand(UINT commandId, CefRefPtr<CommandCallback> callb
     return DoCommand(commandString, callback);
 }
 
+// WM_SIZE handler
+BOOL cef_host_window::HandleSize(BOOL bMinimize)
+{
+#ifdef DARK_UI
+    // We turn off redraw during activation to minimized flicker
+    //    which causes problems on some versions of Windows. If the app
+    //  was minimized and was re-activated, it will restore and the client area isn't 
+    //    drawn so redraw the client area now or it will be hollow in the middle...
+    if (GetProp(L"WasMinimized")) {
+        DoRepaintClientArea();
+    }
+    SetProp(L"WasMinimized", (HANDLE)bMinimize);
+#endif
+
+    return FALSE;
+}
+
+void cef_host_window::DoRepaintClientArea()
+{
+    CefWindowHandle hwnd = SafeGetCefBrowserHwnd();
+    if (!hwnd) 
+        return;
+
+    RECT rect;
+    GetClientRect(&rect);
+    
+    ::RedrawWindow(hwnd, &rect, NULL, RDW_ERASE|RDW_INTERNALPAINT|RDW_INVALIDATE|RDW_ERASENOW|RDW_UPDATENOW|RDW_ALLCHILDREN);
+}
+
+
 // Window Proc dispatches window messages
 LRESULT cef_host_window::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message) 
     {
+    case WM_SIZE:
+        if (HandleSize(wParam == SIZE_MINIMIZED))
+            return 0L;
+        break;
     case WM_INITMENUPOPUP:
         if (HandleInitMenuPopup((HMENU)wParam))
             return 0L;

appshell/cef_host_window.h

@@ -51,11 +51,15 @@ class cef_host_window : public cef_host_window_base
 
     // Message Handlers 
     BOOL HandleInitMenuPopup(HMENU hMenuPopup);
+    BOOL HandleSize(BOOL bMinimize);
 
     // Command Implementation
     BOOL DoCommand(UINT commandId, CefRefPtr<CommandCallback> callback = 0);
     BOOL DoCommand(const CefString& commandString, CefRefPtr<CommandCallback> callback = 0);
 
+    // Implementation
+    virtual void DoRepaintClientArea();
+
     // Helper to get a command string from command id
     CefString GetCommandString(UINT commandId);
 };

appshell/cef_main_window.cpp

@@ -265,52 +265,6 @@ BOOL cef_main_window::HandleExitCommand()
     return TRUE;
 }
 
-// WM_SIZE handler
-BOOL cef_main_window::HandleSize(BOOL bMinimize)
-{
-    // Minimizing the window to 0x0 which causes our layout to go all
-    // screwy, so we just ignore it.
-    CefWindowHandle hwnd = SafeGetCefBrowserHwnd();
-    if (!hwnd) 
-        return FALSE;
-
-    RECT rect;
-    GetClientRect(&rect);
-
-    if (!bMinimize) 
-    {
-        HDWP hdwp = ::BeginDeferWindowPos(1);
-        hdwp = ::DeferWindowPos(hdwp, hwnd, NULL, rect.left, rect.top, ::RectWidth(rect), ::RectHeight(rect), SWP_NOZORDER);
-        ::EndDeferWindowPos(hdwp);
-    }
-
-#ifdef DARK_UI
-    // We turn off redraw during activation to minimized flicker
-    //    which causes problems on some versions of Windows. If the app
-    //  was minimized and was re-activated, it will restore and the client area isn't 
-    //    drawn so redraw the client area now or it will be hollow in the middle...
-    if (GetProp(L"WasMinimized")) {
-        DoRepaintClientArea();
-    }
-    SetProp(L"WasMinimized", (HANDLE)bMinimize);
-#endif
-
-    return FALSE;
-}
-
-void cef_main_window::DoRepaintClientArea()
-{
-    CefWindowHandle hwnd = SafeGetCefBrowserHwnd();
-    if (!hwnd) 
-        return;
-
-    RECT rect;
-    GetClientRect(&rect);
-    
-    ::RedrawWindow(hwnd, &rect, NULL, RDW_ERASE|RDW_INTERNALPAINT|RDW_INVALIDATE|RDW_ERASENOW|RDW_UPDATENOW|RDW_ALLCHILDREN);
-}
-
-
 // WM_COMMAND handler
 BOOL cef_main_window::HandleCommand(UINT commandId)
 {
@@ -459,6 +413,28 @@ HWND cef_main_window::FindFirstTopLevelInstance()
     return hFirstInstanceWnd;
 }
 
+// WM_SIZE handler
+BOOL cef_main_window::HandleSize(BOOL bMinimize)
+{
+    CefWindowHandle hwnd = SafeGetCefBrowserHwnd();
+    if (!hwnd) 
+        return FALSE;
+
+    RECT rect;
+    GetClientRect(&rect);
+
+    // Minimizing the window to 0x0 which causes our layout to go all
+    // screwy, so we just ignore it.
+    if (!bMinimize) 
+    {
+        HDWP hdwp = ::BeginDeferWindowPos(1);
+        hdwp = ::DeferWindowPos(hdwp, hwnd, NULL, rect.left, rect.top, ::RectWidth(rect), ::RectHeight(rect), SWP_NOZORDER);
+        ::EndDeferWindowPos(hdwp);
+    }
+
+    return FALSE;
+}
+
 // WindowProc -- Dispatches and routes window messages
 LRESULT cef_main_window::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 {

appshell/cef_main_window.h

@@ -54,19 +54,18 @@ class cef_main_window : public cef_host_window
     BOOL HandleSetFocus(HWND hLosingFocus);
     BOOL HandleDestroy();
     BOOL HandleClose();
-    BOOL HandleSize(BOOL bMinimize);
     BOOL HandleInitMenuPopup(HMENU hMenuPopup);
     BOOL HandleCommand(UINT commandId);
     BOOL HandleExitCommand();
     BOOL HandlePaint();
     BOOL HandleGetMinMaxInfo(LPMINMAXINFO mmi);
     BOOL HandleCopyData(HWND, PCOPYDATASTRUCT lpCopyData);
+    BOOL HandleSize(BOOL bMinimize);
 
     // Implementation
     virtual void PostNcDestroy();
     virtual void GetCefBrowserRect(RECT& rect);
     virtual const CefRefPtr<CefBrowser> GetBrowser();
-    virtual void DoRepaintClientArea();
 
     // Find helper
     static BOOL CALLBACK FindSuitableBracketsInstanceHelper(HWND hwnd, LPARAM lParam);