|
@@ -1,6 +1,10 @@
|
|
|
-using System.Windows;
|
|
|
+using System;
|
|
|
+using System.Windows;
|
|
|
+using System.Windows.Input;
|
|
|
+using System.Windows.Interop;
|
|
|
using CefSharp;
|
|
|
using CefSharp.Wpf;
|
|
|
+using CEFSharpWPF;
|
|
|
|
|
|
namespace CEFSharpWpf
|
|
|
{
|
|
@@ -14,8 +18,9 @@ namespace CEFSharpWpf
|
|
|
{
|
|
|
get
|
|
|
{
|
|
|
- if (instance == null)
|
|
|
+ if (instance == null||instance.IsDisposed())
|
|
|
{
|
|
|
+ //OneTimeLoad.Init();
|
|
|
SetBrowserEnvironment.SetEnvironment();
|
|
|
instance = new WinBrowser();
|
|
|
}
|
|
@@ -29,6 +34,10 @@ namespace CEFSharpWpf
|
|
|
this.Closing += WinBrowser_Closing;
|
|
|
browser.DownloadHandler = new DownloadHandler();
|
|
|
browser.LifeSpanHandler = new OpenPageSelf();
|
|
|
+ this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Copy, (s, e) =>
|
|
|
+ {
|
|
|
+ Clipboard.SetDataObject(URL??string.Empty, false);
|
|
|
+ }));
|
|
|
}
|
|
|
|
|
|
private void WinBrowser_Closing(object sender, System.ComponentModel.CancelEventArgs e)
|
|
@@ -76,6 +85,7 @@ namespace CEFSharpWpf
|
|
|
{
|
|
|
base.Show();
|
|
|
}
|
|
|
+ this.Activate();
|
|
|
ReloadUrl(url);
|
|
|
}
|
|
|
|
|
@@ -122,7 +132,7 @@ namespace CEFSharpWpf
|
|
|
{
|
|
|
public bool DoClose(IWebBrowser browserControl, IBrowser browser)
|
|
|
{
|
|
|
- return false;
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
public void OnAfterCreated(IWebBrowser browserControl, IBrowser browser)
|