summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorGustavo Noronha Silva <gustavo.noronha@collabora.com>2013-03-15 22:14:04 (GMT)
committerGustavo Noronha Silva <gustavo.noronha@collabora.com>2013-03-15 22:14:04 (GMT)
commit3900142953b21a44ec54b2fcc0bc866cf2370ee9 (patch)
tree0d00e905885e3399b8279f3ff518c2e7d7a2c74c /Source
parentab73da1b200cbde0dd7d8aaa84ad97fb100248e8 (diff)
downloadwebkit-clutter-3900142953b21a44ec54b2fcc0bc866cf2370ee9.tar.gz
webkit-clutter-3900142953b21a44ec54b2fcc0bc866cf2370ee9.tar.xz
Do not always set minimum size, this is a regression
Diffstat (limited to 'Source')
-rw-r--r--Source/WebKit/clutter/webkit/mx/mx-web-view.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebKit/clutter/webkit/mx/mx-web-view.cpp b/Source/WebKit/clutter/webkit/mx/mx-web-view.cpp
index e2e93f5..4d4157c 100644
--- a/Source/WebKit/clutter/webkit/mx/mx-web-view.cpp
+++ b/Source/WebKit/clutter/webkit/mx/mx-web-view.cpp
@@ -345,7 +345,8 @@ static void mx_web_view_get_preferred_width(ClutterActor *actor,
gfloat *minWidth,
gfloat *naturalWidth)
{
- *minWidth = *naturalWidth = 640.0;
+ *minWidth = 0.0;
+ *naturalWidth = 640.0;
WebKitWebFrame* mainFrame = webkit_web_page_get_main_frame(MX_WEB_VIEW(actor)->priv->webPage);
if (!mainFrame)
@@ -365,7 +366,8 @@ static void mx_web_view_get_preferred_height(ClutterActor* actor,
gfloat* minHeight,
gfloat* naturalHeight)
{
- *minHeight = *naturalHeight = 480.0;
+ *minHeight = 0.0;
+ *naturalHeight = 480.0;
WebKitWebFrame* mainFrame = webkit_web_page_get_main_frame(MX_WEB_VIEW(actor)->priv->webPage);
if (!mainFrame)