Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/fixAplColumnDivider into lp:ubuntu-ui-toolkit/staging

fixAplColumnDivider
Merge into staging

Proposed by Zsombor Egri on 2016-04-27

Status:

Merged

Approved by:

Tim Peeters on 2016-05-10

Approved revision:

1964

Merged at revision:

1975

Proposed branch:

lp:~zsombi/ubuntu-ui-toolkit/fixAplColumnDivider

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

51 lines (+4/-6)

2 files modified

src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+4/-3)
src/Ubuntu/Components/plugin/uclistitem.cpp (+0/-3)

To merge this branch:

bzr merge lp:~zsombi/ubuntu-ui-toolkit/fixAplColumnDivider

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-05-10
Tim Peeters		2016-04-27	Approve on 2016-05-10
Review via email: mp+293058@code.launchpad.net

Commit message

AdaptivePageLayout vertical divider occludes with ListItem's visuals.

Description of the change

AdaptivePageLayout vertical divider occludes with ListItem's visuals.

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-27:

FAILED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/540/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2981/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/540/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-27:

FAILED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/759/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2982/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/759/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-27:

FAILED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/514/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2983/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/514/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-27:

PASSED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/728/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2984/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/728/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-04-27:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/345/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2016-04-28:

CI has failures on tst_adaptivepagelayout

http://pastebin.ubuntu.com/16093320/ shows the relevant part. It says 1 failure, but I don't see which one failed :s

lp:~zsombi/ubuntu-ui-toolkit/fixAplColumnDivider updated on 2016-05-04

1962. By Zsombor Egri on 2016-05-04: divider hides based on the column count
1963. By Zsombor Egri on 2016-05-04: staging sync

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-04:

FAILED: Continuous integration, rev:1963
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/773/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3191/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/773/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-04:

PASSED: Continuous integration, rev:1963
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/804/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3192/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/804/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-04:

PASSED: Continuous integration, rev:1963
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/559/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3193/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/559/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-04:

PASSED: Continuous integration, rev:1963
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/585/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3194/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/585/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-04:

FAILED: Continuous integration, rev:1963
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/375/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/773/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/804
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/585
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/559
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3195/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3191
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3192
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3194
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3193

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/375/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/fixAplColumnDivider updated on 2016-05-10

1964. By Zsombor Egri on 2016-05-10: staging sync

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/810/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3220/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/810/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/565/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3221/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/565/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/591/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3222/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/591/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/779/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3223/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/779/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/380/rebuild

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2016-05-10:

Looks good. Thanks.

review: Approve

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/812/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3228/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/812/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/593/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3231/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/593/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/567/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3232/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/567/rebuild

review: Approve (continuous-integration)

Revision history for this message

ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote on 2016-05-10:

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/781/
Executed test runs:
None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3233/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/781/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

1	=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
2	--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml 2016-03-16 09:15:39 +0000
3	+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml 2016-05-10 07:10:08 +0000
4	@@ -788,7 +788,7 @@
5	bottom: parent.bottom
6	left: parent.left
7	right: parent.right
8	- rightMargin: dividerThickness
9	+ rightMargin: dividerThickness + verticalDivider.width
10	}
11	Item {
12	id: hiddenItem
13	@@ -806,6 +806,7 @@
14	left: parent.left
15	top: parent.top
16	right: parent.right
17	+ rightMargin: dividerThickness + verticalDivider.width
18	}
19	height: body.headerHeight
20
21	@@ -856,7 +857,7 @@
22	right: parent.right
23	rightMargin: dividerThickness
24	}
25	- width: (column == (d.columns - 1)) \|\| !pageWrapper ? 0 : units.dp(1)
26	+ width: (column == (d.columns - 1)) ? 0 : units.dp(1)
27	color: theme.palette.normal.base
28	MouseArea {
29	id: resizerSensing
30	@@ -923,7 +924,7 @@
31	wrapper.active = false;
32	subHeader.config = null;
33	pageWrapper = null;
34	- wrapper.parent = hiddenPool;
35	+ wrapper.parent = hiddenItem;
36	wrapper.pageHolder = null;
37	return wrapper;
38	}
39
40	=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
41	--- src/Ubuntu/Components/plugin/uclistitem.cpp 2016-04-26 10:21:32 +0000
42	+++ src/Ubuntu/Components/plugin/uclistitem.cpp 2016-05-10 07:10:08 +0000
43	@@ -1140,9 +1140,6 @@
44	updateNode = true;
45	}
46	QRectF rect(boundingRect());
47	- // FIXME: The 1dp margin is here so that part of the focus frame
48	- // is not hidden by the APL divider. See bug #1575060.
49	- rect -= QMarginsF(0, 0, UCUnits::instance()->dp(1), 0);
50	d->divider->setOpacity(paintFocus ? 0.0 : 1.0);
51	rectNode->setRect(rect);
52