Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-use-set-implicit-size into lp:ubuntu-ui-toolkit/staging

Proposed by Loïc Molinari on 2015-03-05
Status: Work in progress
Proposed branch: lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-use-set-implicit-size
Merge into: lp:ubuntu-ui-toolkit/staging
Prerequisite: lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-resolution-independance
Diff against target: 22 lines (+2/-4)
1 file modified
modules/Ubuntu/Components/plugin/ucubuntushape.cpp (+2/-4)
To merge this branch: bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-use-set-implicit-size
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-03-06
Ubuntu SDK team 2015-03-05 Pending
Review via email: mp+251893@code.launchpad.net

Commit message

[UbuntuShape] Code clean up.

Made use of a single QQuickItem::setImplicitSize() call instead of two QQuickItem::setImplicitWidth() and QQuickItem::setImplicitHeight() calls.

Description of the change

[UbuntuShape] Code clean up.

Made use of a single QQuickItem::setImplicitSize() call instead of two QQuickItem::setImplicitWidth() and QQuickItem::setImplicitHeight() calls.

Unmerged revisions

1341. By Loïc Molinari on 2015-03-05

Made use of setImplicitSize instead of setImplicit[Width,Height].

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
2--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp 2015-03-05 10:25:20 +0000
3+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp 2015-03-05 10:25:21 +0000
4@@ -291,8 +291,7 @@
5 QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), this,
6 SLOT(_q_gridUnitChanged()));
7 const float gridUnit = UCUnits::instance().gridUnit();
8- setImplicitWidth(implicitWidthGU * gridUnit);
9- setImplicitHeight(implicitHeightGU * gridUnit);
10+ setImplicitSize(implicitWidthGU * gridUnit, implicitHeightGU * gridUnit);
11 update();
12 }
13
14@@ -976,8 +975,7 @@
15 void UCUbuntuShape::_q_gridUnitChanged()
16 {
17 const float gridUnit = UCUnits::instance().gridUnit();
18- setImplicitWidth(implicitWidthGU * gridUnit);
19- setImplicitHeight(implicitHeightGU * gridUnit);
20+ setImplicitSize(implicitWidthGU * gridUnit, implicitHeightGU * gridUnit);
21 update();
22 }
23

Subscribers

People subscribed via source and target branches