Merge into trunk : mapToItem3Args : Code : Unity 8

Status:

Merged

Approved by:

Michael Zanetti on 2016-07-28

Approved revision:

2549

Merged at revision:

2550

Proposed branch:

lp:~aacid/unity8/mapToItem3Args

Merge into:

lp:unity8

Diff against target:

34 lines (+3/-3)

2 files modified

qml/Launcher/LauncherPanel.qml (+1/-1)
tests/qmltests/Stages/tst_PhoneStage.qml (+2/-2)

To merge this branch:

bzr merge lp:~aacid/unity8/mapToItem3Args

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-07-27	Approve on 2016-07-28
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-07-27
Review via email: mp+301283@code.launchpad.net

Commit Message

Pass the correct number of arguments to mapToItem

One argument used to work in Qt 5.4 and 5.5 but it is not documented and seems to have broken on Qt 5.6 so just update to the correct signature

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
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

lp:~aacid/unity8/mapToItem3Args updated on 2016-07-27

2549. By Albert Astals Cid on 2016-07-27: Fix mapFromItem call too

Michael Zanetti (mzanetti) wrote on 2016-07-27:

#

lgtm. I've often made that very same mistake before and also already fixed a few occurances of this.

I've tested the code change on a current device, no breakage.

waiting for jenkins to confirm tests are passing still with all versions we support.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-27:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1826/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-27:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1828/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-07-28:

#

Jenkins failures seem unrelated.

review: Approve

1	=== modified file 'qml/Launcher/LauncherPanel.qml'
2	--- qml/Launcher/LauncherPanel.qml 2016-06-15 14:36:15 +0000
3	+++ qml/Launcher/LauncherPanel.qml 2016-07-27 14:54:49 +0000
4	@@ -758,7 +758,7 @@
5	}
6
7	// internal
8	- property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) + quickList.item.offset : units.gu(1)
9	+ property int itemCenter: item ? root.mapFromItem(quickList.item, 0, 0).y + (item.height / 2) + quickList.item.offset : units.gu(1)
10	property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
11	itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
12
13
14	=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
15	--- tests/qmltests/Stages/tst_PhoneStage.qml 2016-06-14 08:25:34 +0000
16	+++ tests/qmltests/Stages/tst_PhoneStage.qml 2016-07-27 14:54:49 +0000
17	@@ -272,7 +272,7 @@
18	var tile = findChild(spreadView, "spreadDelegate_" + topLevelSurfaceList.idAt(data.index));
19	var appId = ApplicationManager.get(data.index).appId;
20
21	- if (tile.mapToItem(spreadView).x > spreadView.width) {
22	+ if (tile.mapToItem(spreadView, 0, 0).x > spreadView.width) {
23	// Item is not visible... Need to flick the spread
24	var startX = phoneStage.width - units.gu(1);
25	var startY = phoneStage.height / 2;
26	@@ -286,7 +286,7 @@
27
28	console.log("clicking app", data.index, "(", appId, ")")
29	tryCompare(tile, "swipeToCloseEnabled", true);
30	- mouseClick(spreadView, tile.mapToItem(spreadView).x + units.gu(1), spreadView.height / 2)
31	+ mouseClick(spreadView, tile.mapToItem(spreadView, 0, 0).x + units.gu(1), spreadView.height / 2)
32	tryCompare(ApplicationManager, "focusedApplicationId", appId);
33	tryCompare(spreadView, "phase", 0);
34	}

Unity 8

Merge lp:~aacid/unity8/mapToItem3Args into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers