Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-proportional-shape-ensured-correct-ratio-width-default-size into lp:ubuntu-ui-toolkit/staging

Proposed by Loïc Molinari on 2016-02-17
Status: Merged
Approved by: Zsombor Egri on 2016-02-18
Approved revision: 1856
Merged at revision: 1857
Proposed branch: lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-proportional-shape-ensured-correct-ratio-width-default-size
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 25 lines (+8/-0)
2 files modified
src/Ubuntu/Components/plugin/ucproportionalshape.cpp (+6/-0)
src/Ubuntu/Components/plugin/ucproportionalshape.h (+2/-0)
To merge this branch: bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-proportional-shape-ensured-correct-ratio-width-default-size
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-02-18
Zsombor Egri 2016-02-17 Approve on 2016-02-18
Review via email: mp+286390@code.launchpad.net

Commit message

[ProportionalShape] Ensured width/height ratio is correct with default values.

Description of the change

[ProportionalShape] Ensured width/height ratio is correct with default values.

To post a comment you must log in.
Zsombor Egri (zsombi) wrote :

Ahh... the bloody fox sniffed out a chicken :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/plugin/ucproportionalshape.cpp'
2--- src/Ubuntu/Components/plugin/ucproportionalshape.cpp 2015-08-11 13:02:37 +0000
3+++ src/Ubuntu/Components/plugin/ucproportionalshape.cpp 2016-02-17 19:34:52 +0000
4@@ -56,3 +56,9 @@
5 setHeight(newHeight);
6 }
7 }
8+
9+void UCProportionalShape::componentComplete()
10+{
11+ QQuickItem::componentComplete();
12+ _q_updateHeight();
13+}
14
15=== modified file 'src/Ubuntu/Components/plugin/ucproportionalshape.h'
16--- src/Ubuntu/Components/plugin/ucproportionalshape.h 2015-08-11 13:02:37 +0000
17+++ src/Ubuntu/Components/plugin/ucproportionalshape.h 2016-02-17 19:34:52 +0000
18@@ -33,6 +33,8 @@
19 void _q_updateHeight();
20
21 private:
22+ void componentComplete();
23+
24 Q_DISABLE_COPY(UCProportionalShape)
25 };
26

Subscribers

People subscribed via source and target branches