Ubuntu Settings Components

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

  1. dpr
  2. Merge into trunk
Proposed by Michael Zanetti on 2015-03-24
Status: Merged
Approved by: Nick Dedekind on 2015-07-16
Approved revision: 86
Merged at revision: 92
Proposed branch: lp:~mzanetti/ubuntu-settings-components/dpr
Merge into: lp:~registry/ubuntu-settings-components/trunk
Diff against target: 13 lines (+2/-2)
1 file modified
Ubuntu/Settings/Menus/StandardMenu.qml (+2/-2)
To merge this branch: bzr merge lp:~mzanetti/ubuntu-settings-components/dpr
Reviewer Review Type Date Requested Status
Nick Dedekind (community) Approve on 2015-07-16
PS Jenkins bot (community) continuous-integration Approve on 2015-03-24
Andrea Cimitan 2015-03-24 Pending
Review via email: mp+253944@code.launchpad.net

Commit Message

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.

Description of the Change

 * 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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu/Settings/Menus/StandardMenu.qml'
2--- Ubuntu/Settings/Menus/StandardMenu.qml 2014-09-22 16:37:31 +0000
3+++ Ubuntu/Settings/Menus/StandardMenu.qml 2015-03-24 10:22:08 +0000
4@@ -56,8 +56,8 @@
5
6 readonly property real size: Math.min(units.gu(3), parent.height - menu.__contentsMargins)
7
8- height: size
9- width: size
10+ Layout.preferredHeight: size
11+ Layout.preferredWidth: size
12 Layout.alignment: Qt.AlignVCenter
13 }
14

Subscribers

People subscribed via source and target branches

to all changes: