Merge pull request #618 from Octopus-ITSM/fix_553b

fix #553 by handling Initial resize and OnSizeChanged

Author: amaitland

CefSharp.Core/ManagedCefBrowserAdapter.h

@@ -481,16 +481,10 @@ namespace CefSharp
                 *(CefBrowserSettings*)browserSettings->_internalBrowserSettings, NULL);
         }
 
-        void OnPaint(IntPtr^ sourceHandle)
+        void Resize(int width, int height)
         {
-            HWND hWnd = static_cast<HWND>(sourceHandle->ToPointer());
-            RECT rect;
-            GetClientRect(hWnd, &rect);
-            HDWP hdwp = BeginDeferWindowPos(1);
-
             HWND browserHwnd = _renderClientAdapter->GetBrowserHwnd();
-            hdwp = DeferWindowPos(hdwp, browserHwnd, NULL, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOZORDER);
-            EndDeferWindowPos(hdwp);
+            SetWindowPos(browserHwnd, NULL, 0, 0, width, height, SWP_NOZORDER);
         }
 
         void RegisterJsObject(String^ name, Object^ object)

CefSharp.WinForms.Example/BrowserForm.cs

@@ -40,7 +40,11 @@ private void AddTab(string url, int? insertIndex = null)
             {
                 Dock = DockStyle.Fill
             };
-            
+
+            //This call isn't required for the sample to work. 
+            //It's sole purpose is to demonstrate that #553 has been resolved.
+            browser.CreateControl();
+
             tabPage.Controls.Add(browser);
 
             if (insertIndex == null)

CefSharp.WinForms/ChromiumWebBrowser.cs

@@ -53,18 +53,11 @@ public ChromiumWebBrowser(string address)
             Cef.AddDisposable(this);
             Address = address;
 
-            Paint += OnPaint;
-
-            //Redraw on Resize so Cef is notified and updates accordingly
-            SetStyle(ControlStyles.ResizeRedraw, true);
-
             Dock = DockStyle.Fill;
         }
 
         protected override void Dispose(bool disposing)
         {
-            Paint -= OnPaint;
-
             Cef.RemoveDisposable(this);
 
             if (disposing)
@@ -82,6 +75,8 @@ void IWebBrowserInternal.OnInitialized()
         {
             IsBrowserInitialized = true;
 
+            ResizeBrowser();
+
             var handler = IsBrowserInitializedChanged;
 
             if (handler != null)
@@ -349,12 +344,20 @@ public Task<string> GetTextAsync()
             return taskStringVisitor.Task;
         }
 
-        private void OnPaint(object sender, PaintEventArgs e)
+        protected override void OnSizeChanged(EventArgs e)
+        {
+            base.OnSizeChanged(e);
+            if (managedCefBrowserAdapter != null)
+            {
+                ResizeBrowser();
+            }
+        }
+
+        private void ResizeBrowser()
         {
-            // Size is 0x0 when we are on a modeless Form which is minimized.
-            if (!Size.IsEmpty && managedCefBrowserAdapter != null)
+            if (IsBrowserInitialized)
             {
-                managedCefBrowserAdapter.OnPaint(Handle);
+                managedCefBrowserAdapter.Resize(Width, Height);
             }
         }
     }