Merge lp:~mzanetti/ubuntu-settings-components/dpr into lp:~registry/ubuntu-settings-components/trunk

[Michael Zanetti]

Tell the layout what size we want the icons to be

width/height are ignored by the Layout and it uses only implicitWidth/implicitHeight unless explicitly set with Layout.preferredWidth/preferredHeight.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

n/a

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/103/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Looks fine.

review: Approve

=== modified file 'Ubuntu/Settings/Menus/StandardMenu.qml'
--- Ubuntu/Settings/Menus/StandardMenu.qml	2014-09-22 16:37:31 +0000
+++ Ubuntu/Settings/Menus/StandardMenu.qml	2015-03-24 10:22:08 +0000
@@ -56,8 +56,8 @@
 
             readonly property real size: Math.min(units.gu(3), parent.height - menu.__contentsMargins)
 
-            height: size
-            width: size
+            Layout.preferredHeight: size
+            Layout.preferredWidth: size
             Layout.alignment: Qt.AlignVCenter
         }