Merge lp:~aacid/unity-2d/unity-2d_fix_starting_size_problem into lp:unity-2d

[Albert Astals Cid]

Make sure the size is the size the QML root elements wants to have

This should always be true since we use SizeViewToRootObject resizeMode but seems that there is some bug somewhere that makes the wrong size be set to the view

[Gerry Boland (gerboland)]

Still happening for me :(

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d_fix_starting_size_problem]

930. By Albert Astals Cid on 2012-02-21

More expeditive way to make sure our size is not wrongly set

931. By Albert Astals Cid on 2012-02-21

fix comment

[Albert Astals Cid (aacid)]

Michał: Florian: Gerry wants your opinion on this, the fix is "not nice" but I could not find any other way to fix it

[lp:~aacid/unity-2d/unity-2d_fix_starting_size_problem]

932. By Albert Astals Cid on 2012-02-28

Add FIXME

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-28 08:00:04 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-28 10:18:19 +0000
@@ -155,6 +155,18 @@
 void
 ShellDeclarativeView::resizeEvent(QResizeEvent *event)
 {
+    if (rootObject()) {
+        const int wantedWidth = rootObject()->property("width").toInt();
+        const int wantedHeight = rootObject()->property("height").toInt();
+        if (width() != wantedWidth || height() != wantedHeight) {
+            // FIXME This should never happen as we are using SizeViewToRootObject
+            // in our QDeclarativeView but it seems it happens sometimes
+            // that we get a size it's not the size the QML wants
+            // so force it to the size we want in those cases
+            // This is just a workaround for the time being
+            resize(wantedWidth, wantedHeight);
+        }
+    }
     updateShellPosition();
     Unity2DDeclarativeView::resizeEvent(event);
 }