Skip to content

WinForms - Create ManagedCefBrowserAdapter in Constructor #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 12, 2014
Merged

WinForms - Create ManagedCefBrowserAdapter in Constructor #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fba29ac
Move managedCefBrowserAdapter creation to constructor (same as WPF co…
amaitland Dec 12, 2014
0efff78
Update examples to call RegisterJsObject in constructor
amaitland Dec 12, 2014
56e9b9d
Remove hack for #522 that's no longer required
amaitland Dec 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions CefSharp.WinForms.Example/BrowserTabUserControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public BrowserTabUserControl(string url)
browser.StatusMessage += OnBrowserStatusMessage;
browser.IsBrowserInitializedChanged += OnIsBrowserInitializedChanged;
browser.IsLoadingChanged += OnIsLoadingChanged;
browser.HandleCreated += OnBrowserHandleCreated;
browser.DragHandler = new DragHandler();
browser.RegisterJsObject("bound", new BoundObject());

CefExample.RegisterTestResources(browser);

Expand All @@ -43,11 +43,6 @@ public BrowserTabUserControl(string url)

Disposed += BrowserTabUserControlDisposed;
}

private void OnBrowserHandleCreated(object sender, EventArgs e)
{
Browser.RegisterJsObject("bound", new BoundObject());
}

private void BrowserTabUserControlDisposed(object sender, EventArgs e)
{
Expand All @@ -61,7 +56,6 @@ private void BrowserTabUserControlDisposed(object sender, EventArgs e)
browser.StatusMessage -= OnBrowserStatusMessage;
browser.IsBrowserInitializedChanged -= OnIsBrowserInitializedChanged;
browser.IsLoadingChanged -= OnIsLoadingChanged;
browser.HandleCreated -= OnBrowserHandleCreated;

browser.Dispose();
}
Expand Down
11 changes: 2 additions & 9 deletions CefSharp.WinForms.Example/Minimal/SimpleBrowserForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using System;
using System.Windows.Forms;
using CefSharp.Example;
using CefSharp.WinForms.Example.Controls;

namespace CefSharp.WinForms.Example.Minimal
Expand All @@ -30,14 +31,6 @@ public SimpleBrowserForm()
Load += OnLoad;
}

private void BrowserPaint(object sender, PaintEventArgs e)
{
browser.Paint -= BrowserPaint;

//Invalidate browser as short term fix for #522
browser.Invalidate();
}

private void OnLoad(object sender, EventArgs e)
{
CreateBrowser();
Expand All @@ -56,7 +49,7 @@ private void CreateBrowser()
browser.StatusMessage += OnBrowserStatusMessage;
browser.TitleChanged += OnBrowserTitleChanged;
browser.AddressChanged += OnBrowserAddressChanged;
browser.Paint += BrowserPaint;
browser.RegisterJsObject("bound", new BoundObject());
}

private void OnBrowserConsoleMessage(object sender, ConsoleMessageEventArgs args)
Expand Down
3 changes: 2 additions & 1 deletion CefSharp.WinForms/ChromiumWebBrowser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public ChromiumWebBrowser(string address)

FocusHandler = new DefaultFocusHandler(this);
ResourceHandler = new DefaultResourceHandler();

managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this);
}

protected override void Dispose(bool disposing)
Expand Down Expand Up @@ -151,7 +153,6 @@ public void SendMouseWheelEvent(int x, int y, int deltaX, int deltaY)

protected override void OnHandleCreated(EventArgs e)
{
managedCefBrowserAdapter = new ManagedCefBrowserAdapter(this);
managedCefBrowserAdapter.CreateBrowser(BrowserSettings ?? new BrowserSettings(), Handle, Address);

base.OnHandleCreated(e);
Expand Down