Merge lp:~cimi/unity8/dash-visual-tweaks_pageHeader-bottomEdge into lp:unity8
- dash-visual-tweaks_pageHeader-bottomEdge
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Albert Astals Cid |
Approved revision: | 2610 |
Merged at revision: | 2675 |
Proposed branch: | lp:~cimi/unity8/dash-visual-tweaks_pageHeader-bottomEdge |
Merge into: | lp:unity8 |
Diff against target: |
197 lines (+30/-70) 6 files modified
qml/Dash/Dash.qml (+1/-1) qml/Dash/DashBackground.qml (+2/-11) qml/Dash/DashPageHeader.qml (+23/-55) qml/Dash/GenericScopeView.qml (+1/-0) tests/qmltests/Dash/tst_DashPageHeader.qml (+2/-2) tests/qmltests/Dash/tst_GenericScopeView.qml (+1/-1) |
To merge this branch: | bzr merge lp:~cimi/unity8/dash-visual-tweaks_pageHeader-bottomEdge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Albert Astals Cid (community) | Approve | ||
Review via email: mp+304798@code.launchpad.net |
Commit message
Remove background under header pagination dots, update dots assets, remove dash paper background, update bottom edge asset
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
n
* Did you perform an exploratory manual test run of your code change and any related functionality?
y
* 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?
yes
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
Albert Astals Cid (aacid) wrote : | # |
You removed the overview_hint file but it's still referenced in Dash.qml
source: "graphics/
Albert Astals Cid (aacid) wrote : | # |
testDashPageHeader doesn't pass
Albert Astals Cid (aacid) wrote : | # |
The pagination dots are not visible if the scope defines a blue background
http://
Is this something we want to live with or design has a solution for it?
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2607
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
I think the old Qt doesn't like the alpha components in #00000000 and that makes the test not pass, remove two zeros and it shoudl work i guesS?
Andrea Cimitan (cimi) wrote : | # |
> The pagination dots are not visible if the scope defines a blue background
> http://
>
> Is this something we want to live with or design has a solution for it?
asked design, we can live with it for now
Albert Astals Cid (aacid) wrote : | # |
Ok, i guess that's ok if that's what they want :)
* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
* Did CI run pass? If not, please explain why.
Waiting before top approval
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2607
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2608
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
> Ok, i guess that's ok if that's what they want :)
>
> * Did you perform an exploratory manual test run of the code change and any
> related functionality?
> Yes
>
> * Did CI run pass? If not, please explain why.
> Waiting before top approval
last revision contains visual tweaks following design
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2609
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2609
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
Seems you actually broke something in the tests.
- 2610. By Andrea Cimitan
-
try to fix test
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) : | # |
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2610
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'qml/Dash/Dash.qml' |
2 | --- qml/Dash/Dash.qml 2016-05-02 07:57:07 +0000 |
3 | +++ qml/Dash/Dash.qml 2016-10-14 09:08:35 +0000 |
4 | @@ -329,7 +329,7 @@ |
5 | enabled: bottomEdgeController.progress == 0 |
6 | UbuntuNumberAnimation {} |
7 | } |
8 | - y: parent.height - height * (1 - bottomEdgeController.progress * 4) |
9 | + y: parent.height - height * (1 - bottomEdgeController.progress * 4) - units.gu(1) |
10 | MouseArea { |
11 | // Eat direct presses on the overview hint so that they do not end up in the card below |
12 | anchors.fill: parent |
13 | |
14 | === modified file 'qml/Dash/DashBackground.qml' |
15 | --- qml/Dash/DashBackground.qml 2016-08-30 14:06:47 +0000 |
16 | +++ qml/Dash/DashBackground.qml 2016-10-14 09:08:35 +0000 |
17 | @@ -15,16 +15,7 @@ |
18 | */ |
19 | |
20 | import QtQuick 2.4 |
21 | -import QtQuick.Window 2.2 |
22 | -import ImageCache 0.1 |
23 | |
24 | -Image { |
25 | - source: "image://unity8imagecache/" + Qt.resolvedUrl("graphics/paper.png") |
26 | - fillMode: Image.PreserveAspectCrop |
27 | - horizontalAlignment: Image.AlignRight |
28 | - verticalAlignment: Image.AlignTop |
29 | - // avoid CPU scaling when window size changes |
30 | - readonly property int maxSize: Math.max(Screen.width, Screen.height) |
31 | - sourceSize.width: maxSize |
32 | - sourceSize.height: 0 |
33 | +Rectangle { |
34 | + color: "white" |
35 | } |
36 | |
37 | === modified file 'qml/Dash/DashPageHeader.qml' |
38 | --- qml/Dash/DashPageHeader.qml 2016-08-16 14:06:26 +0000 |
39 | +++ qml/Dash/DashPageHeader.qml 2016-10-14 09:08:35 +0000 |
40 | @@ -25,7 +25,7 @@ |
41 | id: root |
42 | objectName: "pageHeader" |
43 | implicitHeight: headerContainer.height + signatureLineHeight |
44 | - readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0 |
45 | + readonly property real signatureLineHeight: showSignatureLine ? units.gu(2.5) : headerBottomLine.height |
46 | readonly property real headerDividerLuminance: Style.luminance(bottomBorder.color) |
47 | |
48 | property int activeFiltersCount: 0 |
49 | @@ -44,7 +44,7 @@ |
50 | property ListModel searchHistory |
51 | property alias searchQuery: searchTextField.text |
52 | property alias searchHint: searchTextField.placeholderText |
53 | - property bool showSignatureLine: true |
54 | + property bool showSignatureLine: false |
55 | |
56 | property int paginationCount: 0 |
57 | property int paginationIndex: -1 |
58 | @@ -414,68 +414,36 @@ |
59 | } |
60 | |
61 | Rectangle { |
62 | - id: bottomBorder |
63 | + id: headerBottomLine |
64 | + anchors { |
65 | + top: headerContainer.bottom |
66 | + left: parent.left |
67 | + right: parent.right |
68 | + } |
69 | + height: units.dp(1) |
70 | + color: theme.palette.normal.base |
71 | + } |
72 | + |
73 | + Row { |
74 | + anchors { |
75 | + top: headerContainer.bottom |
76 | + horizontalCenter: headerContainer.horizontalCenter |
77 | + topMargin: units.gu(1) |
78 | + } |
79 | visible: showSignatureLine |
80 | - anchors { |
81 | - top: headerContainer.bottom |
82 | - left: parent.left |
83 | - right: parent.right |
84 | - bottom: parent.bottom |
85 | - } |
86 | - |
87 | - color: root.scopeStyle ? root.scopeStyle.headerDividerColor : "#e0e0e0" |
88 | - |
89 | - Rectangle { |
90 | - anchors { |
91 | - top: parent.top |
92 | - left: parent.left |
93 | - right: parent.right |
94 | - } |
95 | - height: units.dp(1) |
96 | - color: Qt.darker(parent.color, 1.1) |
97 | - } |
98 | - } |
99 | - |
100 | - Row { |
101 | - visible: bottomBorder.visible |
102 | spacing: units.gu(.5) |
103 | Repeater { |
104 | objectName: "paginationRepeater" |
105 | model: root.paginationCount |
106 | - Image { |
107 | + Rectangle { |
108 | objectName: "paginationDots_" + index |
109 | height: units.gu(1) |
110 | width: height |
111 | - source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png" |
112 | + radius: height / 2 |
113 | + color: index == root.paginationIndex ? UbuntuColors.blue : "transparent" |
114 | + border.width: index == root.paginationIndex ? 0 : 1 // yes, one pixel and not 1dp |
115 | + border.color: theme.palette.normal.baseText |
116 | } |
117 | } |
118 | - anchors { |
119 | - top: headerContainer.bottom |
120 | - horizontalCenter: headerContainer.horizontalCenter |
121 | - topMargin: units.gu(.5) |
122 | - } |
123 | - } |
124 | - |
125 | - // FIXME this doesn't work with solid scope backgrounds due to z-ordering |
126 | - Item { |
127 | - id: bottomHighlight |
128 | - visible: bottomBorder.visible |
129 | - anchors { |
130 | - top: parent.bottom |
131 | - left: parent.left |
132 | - right: parent.right |
133 | - } |
134 | - z: 1 |
135 | - height: units.dp(1) |
136 | - opacity: 0.6 |
137 | - |
138 | - Rectangle { |
139 | - anchors.fill: parent |
140 | - color: if (root.scopeStyle) { |
141 | - Qt.lighter(Qt.rgba(root.scopeStyle.background.r, |
142 | - root.scopeStyle.background.g, |
143 | - root.scopeStyle.background.b, 1.0), 1.2); |
144 | - } else "#CCFFFFFF" |
145 | - } |
146 | } |
147 | } |
148 | |
149 | === modified file 'qml/Dash/GenericScopeView.qml' |
150 | --- qml/Dash/GenericScopeView.qml 2016-09-22 07:37:21 +0000 |
151 | +++ qml/Dash/GenericScopeView.qml 2016-10-14 09:08:35 +0000 |
152 | @@ -644,6 +644,7 @@ |
153 | scopeHasFilters: scopeView.scope.filters != null |
154 | activeFiltersCount: scopeView.scope.activeFiltersCount |
155 | showBackButton: scopeView.hasBackAction |
156 | + showSignatureLine: !showBackButton |
157 | searchEntryEnabled: true |
158 | settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false |
159 | favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope" |
160 | |
161 | === removed file 'qml/Dash/graphics/overview_hint@27.png' |
162 | Binary files qml/Dash/graphics/overview_hint@27.png 2016-06-03 23:00:28 +0000 and qml/Dash/graphics/overview_hint@27.png 1970-01-01 00:00:00 +0000 differ |
163 | === added file 'qml/Dash/graphics/overview_hint@30.png' |
164 | Binary files qml/Dash/graphics/overview_hint@30.png 1970-01-01 00:00:00 +0000 and qml/Dash/graphics/overview_hint@30.png 2016-10-14 09:08:35 +0000 differ |
165 | === removed file 'qml/Dash/graphics/pagination_dot_off@30.png' |
166 | Binary files qml/Dash/graphics/pagination_dot_off@30.png 2016-06-03 23:00:28 +0000 and qml/Dash/graphics/pagination_dot_off@30.png 1970-01-01 00:00:00 +0000 differ |
167 | === removed file 'qml/Dash/graphics/pagination_dot_on@30.png' |
168 | Binary files qml/Dash/graphics/pagination_dot_on@30.png 2016-06-03 23:00:28 +0000 and qml/Dash/graphics/pagination_dot_on@30.png 1970-01-01 00:00:00 +0000 differ |
169 | === removed file 'qml/Dash/graphics/paper.png' |
170 | Binary files qml/Dash/graphics/paper.png 2016-06-03 23:00:28 +0000 and qml/Dash/graphics/paper.png 1970-01-01 00:00:00 +0000 differ |
171 | === modified file 'tests/qmltests/Dash/tst_DashPageHeader.qml' |
172 | --- tests/qmltests/Dash/tst_DashPageHeader.qml 2016-08-03 15:51:32 +0000 |
173 | +++ tests/qmltests/Dash/tst_DashPageHeader.qml 2016-10-14 09:08:35 +0000 |
174 | @@ -173,9 +173,9 @@ |
175 | for (var j=0; j<paginationRepeater.count; j++) { |
176 | var paginationDot = findChild(pageHeader, "paginationDots_"+j); |
177 | if (i==j) { |
178 | - compare(paginationDot.source.toString().indexOf("pagination_dot_on") > -1, true); |
179 | + compare(paginationDot.color, UbuntuColors.blue); |
180 | } else { |
181 | - compare(paginationDot.source.toString().indexOf("pagination_dot_off") > -1, true); |
182 | + compare(paginationDot.color.a, 0); |
183 | } |
184 | } |
185 | } |
186 | |
187 | === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml' |
188 | --- tests/qmltests/Dash/tst_GenericScopeView.qml 2016-09-22 07:41:49 +0000 |
189 | +++ tests/qmltests/Dash/tst_GenericScopeView.qml 2016-10-14 09:08:35 +0000 |
190 | @@ -485,7 +485,7 @@ |
191 | mouseClick(seeAll0); |
192 | verify(category0.expanded); |
193 | tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height); |
194 | - tryCompare(genericScopeView.categoryView, "contentY", units.gu(8)); |
195 | + tryCompare(genericScopeView.categoryView, "contentY", units.gu(8.5)); |
196 | |
197 | scrollToEnd(); |
198 |
FAILED: Continuous integration, rev:2605 /code.launchpad .net/~cimi/ unity8/ dash-visual- tweaks_ pageHeader- bottomEdge/ +merge/ 304798/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/ /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/2094/ /unity8- jenkins. ubuntu. com/job/ build/2742/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/2770 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 2643 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 2643 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 2643 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2635 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2635/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2635 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2635/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2635/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2635 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2635/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2635 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2635/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2635/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2635 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2635/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2635/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2635/console
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/2094/ rebuild
https:/