Switch to using SizeChanged event rather than being notified of chang…

…es to the ActualWidth and ActualHeight (not really sure the original reason that method was choose) Remove no longer used DisposableEventWrapper
cefsharp · Mar 20, 2016 · cd322af · cd322af
1 parent b1b38ac
commit cd322af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 46 deletions.
diff --git a/CefSharp.Wpf/CefSharp.Wpf.csproj b/CefSharp.Wpf/CefSharp.Wpf.csproj
@@ -74,7 +74,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DelegateCommand.cs" />
-    <Compile Include="DisposableEventWrapper.cs" />
     <Compile Include="Internals\WpfExtensions.cs" />
     <Compile Include="Rendering\InteropBitmapInfo.cs" />
     <Compile Include="IWpfWebBrowser.cs" />

diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -7,7 +7,6 @@
 using CefSharp.Wpf.Rendering;
 using Microsoft.Win32.SafeHandles;
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -23,8 +22,6 @@ namespace CefSharp.Wpf
 {
     public class ChromiumWebBrowser : ContentControl, IRenderWebBrowser, IWpfWebBrowser
     {
-        private readonly List<IDisposable> disposables = new List<IDisposable>();
-
         private HwndSource source;
         private HwndSourceHook sourceHook;
         private DispatcherTimer tooltipTimer;
@@ -118,6 +115,7 @@ public ChromiumWebBrowser()
             Dispatcher.BeginInvoke((Action)(() => WebBrowser = this));
 
             Loaded += OnLoaded;
+            SizeChanged += OnActualSizeChanged;
 
             GotKeyboardFocus += OnGotKeyboardFocus;
             LostKeyboardFocus += OnLostKeyboardFocus;
@@ -154,9 +152,6 @@ public ChromiumWebBrowser()
 
             managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this, true);
 
-            disposables.Add(new DisposableEventWrapper(this, ActualHeightProperty, OnActualSizeChanged));
-            disposables.Add(new DisposableEventWrapper(this, ActualWidthProperty, OnActualSizeChanged));
-
             ResourceHandlerFactory = new DefaultResourceHandlerFactory();
             BrowserSettings = new BrowserSettings();
 
@@ -205,6 +200,7 @@ protected virtual void Dispose(bool isdisposing)
 
                     // Release internal event listeners:
                     Loaded -= OnLoaded;
+                    SizeChanged -= OnActualSizeChanged;
                     GotKeyboardFocus -= OnGotKeyboardFocus;
                     LostKeyboardFocus -= OnLostKeyboardFocus;
 
@@ -232,11 +228,6 @@ protected virtual void Dispose(bool isdisposing)
                         managedCefBrowserAdapter = null;
                     }
 
-                    foreach (var disposable in disposables)
-                    {
-                        disposable.Dispose();
-                    }
-                    disposables.Clear();
 
                     browserInitialized = false;
                     UiThreadRunAsync(() =>
@@ -890,9 +881,9 @@ private void RemoveSourceHook()
             }
         }
 
-        private void CreateOffscreenBrowserWhenActualSizeChanged()
+        private void CreateOffscreenBrowserWhenActualSizeChanged(Size newSize)
         {
-            if (browserCreated || System.ComponentModel.DesignerProperties.GetIsInDesignMode(this))
+            if (browserCreated || System.ComponentModel.DesignerProperties.GetIsInDesignMode(this) || newSize.IsEmpty)
             {
                 return;
             }
@@ -917,10 +908,10 @@ private void UiThreadRunAsync(Action action, DispatcherPriority priority = Dispa
             }
         }
 
-        private void OnActualSizeChanged(object sender, EventArgs e)
+        private void OnActualSizeChanged(object sender, SizeChangedEventArgs e)
         {
             // Initialize RenderClientAdapter when WPF has calculated the actual size of current content.
-            CreateOffscreenBrowserWhenActualSizeChanged();
+            CreateOffscreenBrowserWhenActualSizeChanged(e.NewSize);
 
             if (browser != null)
             {

diff --git a/CefSharp.Wpf/DisposableEventWrapper.cs b/CefSharp.Wpf/DisposableEventWrapper.cs