Author: mhutch
Date: 2007-12-03 21:05:02 -0500 (Mon, 03 Dec 2007)
New Revision: 90617
Modified:
trunk/monodevelop/Extras/GeckoWebBrowser/ChangeLog
trunk/monodevelop/Extras/GeckoWebBrowser/GeckoWebBrowser.cs
Log:
* GeckoWebBrowser.cs: Implement LinkClicked event.
Modified: trunk/monodevelop/Extras/GeckoWebBrowser/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/GeckoWebBrowser/ChangeLog 2007-12-04 02:04:08 UTC
(rev 90616)
+++ trunk/monodevelop/Extras/GeckoWebBrowser/ChangeLog 2007-12-04 02:05:02 UTC
(rev 90617)
@@ -1,5 +1,9 @@
2007-12-03 Michael Hutchinson <[EMAIL PROTECTED]>
+ * GeckoWebBrowser.cs: Implement LinkClicked event.
+
+2007-12-03 Michael Hutchinson <[EMAIL PROTECTED]>
+
* GeckoWebBrowser.cs: Workaround for On{Event} overridable methods not
executing even though events are fired. Partial fix for "Bug 345423 -
project is not a registered protocol".
Modified: trunk/monodevelop/Extras/GeckoWebBrowser/GeckoWebBrowser.cs
===================================================================
--- trunk/monodevelop/Extras/GeckoWebBrowser/GeckoWebBrowser.cs 2007-12-04
02:04:08 UTC (rev 90616)
+++ trunk/monodevelop/Extras/GeckoWebBrowser/GeckoWebBrowser.cs 2007-12-04
02:05:02 UTC (rev 90617)
@@ -41,6 +41,8 @@
string oldTempFile;
bool reShown = false;
+ bool suppressLinkClickedBecauseCausedByLoadUrlCall = false;
+
public GeckoWebBrowser ()
{
WebControl.SetProfilePath ("/tmp", "MonoDevelop");
@@ -167,6 +169,8 @@
oldTempFile = null;
}
+ suppressLinkClickedBecauseCausedByLoadUrlCall = true;
+
if (url.StartsWith ("tempfile://")) {
oldTempFile = url.Substring (11);
base.LoadUrl (oldTempFile);
@@ -187,21 +191,33 @@
public event PageLoadedHandler PageLoaded;
public event LocationChangingHandler LocationChanging;
+ public event LocationChangingHandler LinkClicked;
public event LocationChangedHandler LocationChanged;
public event TitleChangedHandler TitleChanged;
public event StatusMessageChangedHandler JSStatusChanged;
public event StatusMessageChangedHandler LinkStatusChanged;
public event LoadingProgressChangedHandler
LoadingProgressChanged;
- protected virtual bool OnLocationChanging (string aURI)
+ protected bool OnLocationChanging (string aURI)
{
LocationChangingEventArgs args = new
LocationChangingEventArgs (aURI, false);
args.SuppressChange = false;
if (LocationChanging != null)
LocationChanging (this, args);
+ OnLinkClicked (args);
return args.SuppressChange;
}
+ protected virtual void OnLinkClicked (LocationChangingEventArgs
args)
+ {
+ if (suppressLinkClickedBecauseCausedByLoadUrlCall) {
+ suppressLinkClickedBecauseCausedByLoadUrlCall =
false;
+ return;
+ }
+ if (LinkClicked != null)
+ LinkClicked (this, args);
+ }
+
protected virtual void OnLocationChanged ()
{
if (LocationChanged != null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches