Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* EmbedWidget.cs: remove OnSizeAllocated, redundant and potential source

of endless loops
* WebBrowser.cs: Add NavigationRequested and ExecuteScript to conform
to the new API. Do widget.Resize instead of SizeAllocate, works better.

svn path=/trunk/mono-webbrowser/; revision=157653
  • Loading branch information...
commit e71801a06f0aea35c2404d1cf562df0af134a0b6 1 parent 29f1120
Andreia Gaita authored
View
10 mono-webkit/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-21 Andreia Gaita <shana@jitted.com>
+
+ * EmbedWidget.cs: remove OnSizeAllocated, redundant and potential
+ source of endless loops
+ * WebBrowser.cs: Add NavigationRequested and ExecuteScript to
+ conform to the new API. Do widget.Resize instead of SizeAllocate,
+ works better.
+
2008-11-08 Andreia Gaita <shana@jitted.com>
- * mono-webkit: mono-webkit is the WebKit backend for Mono.WebBrowser.
+ * mono-webkit: mono-webkit is the WebKit backend for Mono.WebBrowser.
View
4 mono-webkit/EmbedWidget.cs
@@ -118,7 +118,7 @@ protected override void OnUnrealized ()
base.OnUnrealized ();
}
-
+/*
protected override void OnSizeAllocated (Rectangle allocation)
{
DebugHelper.DumpCallers ();
@@ -131,7 +131,7 @@ protected override void OnSizeAllocated (Rectangle allocation)
}
base.OnSizeAllocated (allocation);
}
-
+*/
protected override void OnAdded (Widget webview)
{
this.webview = webview;
View
8 mono-webkit/WebBrowser.cs
@@ -187,7 +187,7 @@ public void Resize (int width, int height)
DebugHelper.WriteLine ("Resizing to " + widget.Allocation.X + " " + widget.Allocation.Y + " " + width + " " + height);
Gdk.Threads.Enter ();
- widget.SizeAllocate (new Gdk.Rectangle (widget.Allocation.X, widget.Allocation.Y, width, height));
+ widget.Resize (width, height);
Gdk.Threads.Leave ();
}
public void Render (byte[] data)
@@ -223,6 +223,11 @@ public void Render (string html, string uri, string contentType)
set { }
}
+ public void ExecuteScript (string s)
+ {
+ webview.ExecuteScript (s);
+ }
+
#region Events
public event NodeEventHandler KeyDown;
@@ -248,6 +253,7 @@ public void Render (string html, string uri, string contentType)
public event LoadFinishedEventHandler LoadFinished;
public event SecurityChangedEventHandler SecurityChanged;
public event ContextMenuEventHandler ContextMenuShown;
+ public event NavigationRequestedEventHandler NavigationRequested;
void OnKeyDown () {
if (KeyDown != null) {
Please sign in to comment.
Something went wrong with that request. Please try again.