On Mon, 7 Apr 2008, iain wrote:
Recursion is possible, but its not what I'm seeing at the moment.
The recursion problem is another one, e.g. try to click on the "plus" link
in google.com and it should nicely crash with an almost infinite
backtrace. ;-)
Here is a patch/workaround for the font size problem.
diff --git a/WebKit/clutter/webkit/webkitwebview.cpp
b/WebKit/clutter/webkit/webkitwebview.cpp
index 4a7c48c..ca29108 100644
--- a/WebKit/clutter/webkit/webkitwebview.cpp
+++ b/WebKit/clutter/webkit/webkitwebview.cpp
@@ -775,6 +775,29 @@ static void webkit_web_view_class_init(WebKitWebViewClass*
webViewClass)
g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
}
+static void webkit_web_view_screen_changed(WebKitWebView* webView, gpointer
userdata)
+{
+ WebKitWebViewPrivate* priv = webView->priv;
+ WebKitWebSettings* webSettings = priv->webSettings;
+ Settings* settings = core(webView)->settings();
+
+ guint defaultFontSize, defaultMonospaceFontSize, minimumFontSize,
minimumLogicalFontSize;
+
+ g_object_get(G_OBJECT(webSettings),
+ "default-font-size", &defaultFontSize,
+ "default-monospace-font-size", &defaultMonospaceFontSize,
+ "minimum-font-size", &minimumFontSize,
+ "minimum-logical-font-size", &minimumLogicalFontSize,
+ NULL);
+
+ gdouble DPI = defaultDPI;
+ ASSERT(DPI > 0);
+ settings->setDefaultFontSize(defaultFontSize / 72.0 * DPI);
+ settings->setDefaultFixedFontSize(defaultMonospaceFontSize / 72.0 * DPI);
+ settings->setMinimumFontSize(minimumFontSize / 72.0 * DPI);
+ settings->setMinimumLogicalFontSize(minimumLogicalFontSize / 72.0 * DPI);
+}
+
static void webkit_web_view_update_settings(WebKitWebView* webView)
{
WebKitWebViewPrivate* priv = webView->priv;
@@ -825,8 +848,7 @@ static void webkit_web_view_update_settings(WebKitWebView*
webView)
g_free(serifFontFamily);
g_free(userStylesheetUri);
- /* We're inside clutter, we don't have screens... */
- // webkit_web_view_screen_changed(webView, NULL, NULL);
+ webkit_web_view_screen_changed(webView, NULL);
}
static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings,
GParamSpec* pspec, WebKitWebView* webView)
--
To unsubscribe send a mail to [EMAIL PROTECTED]
