Merge lp:~feng-kylin/unity8/AddSmallDropShadowOnText into lp:unity8

Proposed by handsome_feng on 2015-06-01
Status: Rejected
Rejected by: Albert Astals Cid on 2015-08-03
Proposed branch: lp:~feng-kylin/unity8/AddSmallDropShadowOnText
Merge into: lp:unity8
Diff against target: 415 lines (+145/-27)
10 files modified
qml/Components/DelayedLockscreen.qml (+21/-8)
qml/Components/DropShadowText.qml (+48/-0)
qml/Components/Lockscreen.qml (+10/-1)
qml/Components/PassphraseLockscreen.qml (+19/-5)
qml/Components/PinLockscreen.qml (+29/-6)
qml/Components/PinPadButton.qml (+11/-1)
qml/Greeter/Clock.qml (+3/-2)
qml/Greeter/CoverPage.qml (+1/-1)
qml/Greeter/Infographics.qml (+1/-1)
qml/Greeter/LoginList.qml (+2/-2)
To merge this branch: bzr merge lp:~feng-kylin/unity8/AddSmallDropShadowOnText
Reviewer Review Type Date Requested Status
Michael Zanetti (community) 2015-06-01 Needs Fixing on 2015-06-02
Jouni Helminen 2015-08-03 Pending
Review via email: mp+260712@code.launchpad.net

Commit message

Added a small drop shadow on the text on the Greeter and the Lockscreens.

Description of the change

Added a small drop shadow on the text on the Greeter and the Lockscreens to keep fonts readable wherever we allow the user setting his own background image.

* Are there any related MPs required for this MP to build/function as expected? Please list.

no

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

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?

no

To post a comment you must log in.
Michael Zanetti (mzanetti) wrote :

There are some elements missing:

* The dots that appear when pressing a number
* The backspace button
* the close/cancel button
* The phone icon next to "Emergency call"

===

The checklist is missing

===

Also I'd like to have a review from design. I'll try to get hold of a designer.

review: Needs Fixing
1794. By handsome_feng on 2015-06-02

Added the drop shadow on the icons

handsome_feng (feng-kylin) wrote :

> There are some elements missing:
>
> * The dots that appear when pressing a number
> * The backspace button
> * the close/cancel button
> * The phone icon next to "Emergency call"
>
>
> ===
>
> The checklist is missing
>
> ===
>
> Also I'd like to have a review from design. I'll try to get hold of a
> designer.

I added the drop shadow on the missing icons, and waiting for a further design.Thank you!

Michael Zanetti (mzanetti) wrote :

Added some inline comments.

Also, please add the checklist to the description

review: Needs Fixing
1795. By handsome_feng on 2015-06-03

Modified the anchors statements

1796. By handsome_feng on 2015-06-30

merge trunk

Michael Zanetti (mzanetti) wrote :

Sorry... Jouni told me that they are trying to reduce usage of drop-shadows...

Albert Astals Cid (aacid) wrote :

Jouni should we disacard this then?

Unmerged revisions

1796. By handsome_feng on 2015-06-30

merge trunk

1795. By handsome_feng on 2015-06-03

Modified the anchors statements

1794. By handsome_feng on 2015-06-02

Added the drop shadow on the icons

1793. By handsome_feng on 2015-06-01

Add a small drop shadow on the text

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Components/DelayedLockscreen.qml'
2--- qml/Components/DelayedLockscreen.qml 2015-02-12 14:48:06 +0000
3+++ qml/Components/DelayedLockscreen.qml 2015-06-30 09:26:14 +0000
4@@ -15,6 +15,7 @@
5 */
6
7 import QtQuick 2.0
8+import QtGraphicalEffects 1.0
9 import Ubuntu.Components 0.1
10 import "../Components"
11
12@@ -37,7 +38,7 @@
13 anchors.verticalCenter: parent.verticalCenter
14 spacing: units.gu(2)
15
16- Label {
17+ DropShadowText {
18 id: deviceLockedLabel
19 objectName: "deviceLockedLabel"
20 anchors.left: parent.left
21@@ -54,7 +55,7 @@
22 height: units.gu(1)
23 }
24
25- Label {
26+ DropShadowText {
27 anchors.left: parent.left
28 anchors.right: parent.right
29 horizontalAlignment: Text.AlignHCenter
30@@ -65,7 +66,7 @@
31 i18n.tr("You have been locked out due to too many failed passcode attempts.")
32 }
33
34- Label {
35+ DropShadowText {
36 anchors.left: parent.left
37 anchors.right: parent.right
38 horizontalAlignment: Text.AlignHCenter
39@@ -81,14 +82,26 @@
40 height: units.gu(1)
41 }
42
43- Icon {
44- // It would be nice to use a less network-specific name,
45- // but this is the only lock icon we have.
46- name: "network-secure"
47- color: "#f3f3e7"
48+ Item {
49 height: units.gu(4)
50 width: units.gu(4)
51 anchors.horizontalCenter: parent.horizontalCenter
52+ Icon {
53+ // It would be nice to use a less network-specific name,
54+ // but this is the only lock icon we have.
55+ id: deviceLockedIcon
56+ name: "network-secure"
57+ anchors.fill: parent
58+ color: "#f3f3e7"
59+ }
60+
61+ DropShadow {
62+ anchors.fill: deviceLockedIcon
63+ radius: 4
64+ samples: 8
65+ color: "#80000000"
66+ source: deviceLockedIcon
67+ }
68 }
69 }
70 }
71
72=== added file 'qml/Components/DropShadowText.qml'
73--- qml/Components/DropShadowText.qml 1970-01-01 00:00:00 +0000
74+++ qml/Components/DropShadowText.qml 2015-06-30 09:26:14 +0000
75@@ -0,0 +1,48 @@
76+/*
77+ * Copyright (C) 2015 Canonical, Ltd.
78+ *
79+ * This program is free software; you can redistribute it and/or modify
80+ * it under the terms of the GNU General Public License as published by
81+ * the Free Software Foundation; version 3.
82+ *
83+ * This program is distributed in the hope that it will be useful,
84+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
85+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
86+ * GNU General Public License for more details.
87+ *
88+ * You should have received a copy of the GNU General Public License
89+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
90+ */
91+
92+import QtQuick 2.0
93+import Ubuntu.Components 1.1
94+import QtGraphicalEffects 1.0
95+
96+Item {
97+ id: root
98+ property alias clip: label.clip
99+ property alias color: label.color
100+ property alias elide: label.elide
101+ property alias font: label.font
102+ property alias fontSize: label.fontSize
103+ property alias text: label.text
104+ property alias textFormat: label.textFormat
105+ property alias wrapMode: label.wrapMode
106+ property alias horizontalAlignment: label.horizontalAlignment
107+ property alias verticalAlignment: label.verticalAlignment
108+ implicitWidth: label.implicitWidth
109+ implicitHeight: label.implicitHeight
110+
111+ Label {
112+ id: label
113+ anchors.fill: parent
114+ }
115+
116+ DropShadow {
117+ anchors.fill: label
118+ radius: 4
119+ samples: 8
120+ color: "#80000000"
121+ source: label
122+ }
123+}
124
125=== modified file 'qml/Components/Lockscreen.qml'
126--- qml/Components/Lockscreen.qml 2015-03-18 17:27:30 +0000
127+++ qml/Components/Lockscreen.qml 2015-06-30 09:26:14 +0000
128@@ -15,6 +15,7 @@
129 */
130
131 import QtQuick 2.0
132+import QtGraphicalEffects 1.0
133 import Ubuntu.Components 1.0
134 import Ubuntu.Components.Popups 1.0
135 import Ubuntu.Telephony 0.1 as Telephony
136@@ -237,7 +238,7 @@
137 right: parent.right
138 }
139
140- Label {
141+ DropShadowText {
142 id: emergencyCallLabel
143 objectName: "emergencyCallLabel"
144 anchors.horizontalCenter: parent.horizontalCenter
145@@ -256,6 +257,14 @@
146 color: root.foregroundColor
147 }
148
149+ DropShadow {
150+ anchors.fill: emergencyCallIcon
151+ radius: 4
152+ samples: 8
153+ color: "#80000000"
154+ source: emergencyCallIcon
155+ }
156+
157 MouseArea {
158 anchors.top: emergencyCallLabel.top
159 anchors.bottom: emergencyCallLabel.bottom
160
161=== modified file 'qml/Components/PassphraseLockscreen.qml'
162--- qml/Components/PassphraseLockscreen.qml 2015-03-18 17:27:30 +0000
163+++ qml/Components/PassphraseLockscreen.qml 2015-06-30 09:26:14 +0000
164@@ -15,6 +15,7 @@
165 */
166
167 import QtQuick 2.0
168+import QtGraphicalEffects 1.0
169 import Ubuntu.Components 0.1
170 import "../Components"
171
172@@ -50,7 +51,7 @@
173 width: parent.width
174 spacing: units.gu(2)
175
176- Label {
177+ DropShadowText {
178 id: infoField
179 objectName: "infoTextLabel"
180 fontSize: "x-large"
181@@ -119,16 +120,29 @@
182
183 Repeater {
184 model: pinentryField.length
185- delegate: Rectangle {
186- color: root.foregroundColor
187+ delegate: Item {
188 width: dotRow.dotSize
189 height: width
190- radius: width / 2
191+ Rectangle {
192+ id: dotItem
193+ color: root.foregroundColor
194+ anchors.fill: parent
195+ radius: width / 2
196+ }
197+
198+ DropShadow {
199+ anchors.fill: dotItem
200+ radius: 4
201+ samples: 8
202+ color: "#80000000"
203+ source: dotItem
204+ transparentBorder: true
205+ }
206 }
207 }
208 }
209
210- Label {
211+ DropShadowText {
212 id: wrongNoticeLabel
213 objectName: "wrongNoticeLabel"
214 fontSize: "large"
215
216=== modified file 'qml/Components/PinLockscreen.qml'
217--- qml/Components/PinLockscreen.qml 2015-05-28 07:42:09 +0000
218+++ qml/Components/PinLockscreen.qml 2015-06-30 09:26:14 +0000
219@@ -15,6 +15,7 @@
220 */
221
222 import QtQuick 2.0
223+import QtGraphicalEffects 1.0
224 import Ubuntu.Components 0.1
225 import Ubuntu.Components.ListItems 0.1
226 import "../Components"
227@@ -60,7 +61,7 @@
228 width: parent.width
229 spacing: units.gu(1)
230
231- Label {
232+ DropShadowText {
233 id: infoField
234 objectName: "infoTextLabel"
235 fontSize: "large"
236@@ -86,11 +87,24 @@
237
238 Repeater {
239 model: pinentryField.text.length
240- delegate: Rectangle {
241- color: root.foregroundColor
242+ delegate: Item {
243 width: Math.min(units.gu(2), (pinContainer.width - pinContainer.height*2 ) / (root.maxPinLength >= 0 ? root.maxPinLength : 16))
244 height: width
245- radius: width / 2
246+ Rectangle {
247+ id: pinItem
248+ color: root.foregroundColor
249+ anchors.fill: parent
250+ radius: width / 2
251+ }
252+
253+ DropShadow {
254+ anchors.fill: pinItem
255+ radius: 4
256+ samples: 8
257+ color: "#80000000"
258+ source: pinItem
259+ transparentBorder: true
260+ }
261 }
262 }
263
264@@ -111,7 +125,7 @@
265 pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)
266 }
267 }
268- Label {
269+ DropShadowText {
270 id: wrongNoticeLabel
271 objectName: "wrongNoticeLabel"
272 fontSize: "x-large"
273@@ -130,11 +144,20 @@
274 enabled: root.entryEnabled
275
276 Icon {
277+ id: backspaceIcon
278 anchors.fill: parent
279 name: "erase"
280 color: root.foregroundColor
281 }
282
283+ DropShadow {
284+ anchors.fill: backspaceIcon
285+ radius: 4
286+ samples: 8
287+ color: "#80000000"
288+ source: backspaceIcon
289+ }
290+
291 opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0
292
293 Behavior on opacity {
294@@ -145,7 +168,7 @@
295 }
296 }
297
298- Label {
299+ DropShadowText {
300 objectName: "retryLabel"
301 fontSize: "x-small"
302 color: root.foregroundColor
303
304=== modified file 'qml/Components/PinPadButton.qml'
305--- qml/Components/PinPadButton.qml 2015-03-18 17:27:30 +0000
306+++ qml/Components/PinPadButton.qml 2015-06-30 09:26:14 +0000
307@@ -15,6 +15,7 @@
308 */
309
310 import QtQuick 2.0
311+import QtGraphicalEffects 1.0
312 import Ubuntu.Components 1.1
313
314 AbstractButton {
315@@ -33,7 +34,7 @@
316 }
317 }
318
319- Label {
320+ DropShadowText {
321 id: label
322 anchors.centerIn: parent
323 horizontalAlignment: Text.AlignHCenter
324@@ -60,4 +61,13 @@
325 UbuntuNumberAnimation { duration: UbuntuAnimation.SlowDuration }
326 }
327 }
328+
329+ DropShadow {
330+ anchors.fill: icon
331+ radius: 4
332+ samples: 8
333+ color: "#80000000"
334+ visible: icon.visible
335+ source: icon
336+ }
337 }
338
339=== modified file 'qml/Greeter/Clock.qml'
340--- qml/Greeter/Clock.qml 2014-12-11 14:10:18 +0000
341+++ qml/Greeter/Clock.qml 2015-06-30 09:26:14 +0000
342@@ -17,6 +17,7 @@
343 import QtQuick 2.0
344 import Ubuntu.Components 0.1
345 import "../Panel/Indicators"
346+import "../Components"
347 import Unity.Indicators 0.1 as Indicators
348
349 Item {
350@@ -66,7 +67,7 @@
351 Column {
352 spacing: units.gu(0.5)
353
354- Label {
355+ DropShadowText {
356 id: timeLabel
357 objectName: "timeLabel"
358
359@@ -78,7 +79,7 @@
360 font.weight: Font.Light
361 }
362
363- Label {
364+ DropShadowText {
365 id: dateLabel
366 objectName: "dateLabel"
367
368
369=== modified file 'qml/Greeter/CoverPage.qml'
370--- qml/Greeter/CoverPage.qml 2015-05-11 14:36:03 +0000
371+++ qml/Greeter/CoverPage.qml 2015-06-30 09:26:14 +0000
372@@ -97,7 +97,7 @@
373 }
374 }
375
376- Label {
377+ DropShadowText {
378 id: swipeHint
379 property real baseOpacity: 0.5
380 opacity: 0.0
381
382=== modified file 'qml/Greeter/Infographics.qml'
383--- qml/Greeter/Infographics.qml 2015-02-12 14:48:06 +0000
384+++ qml/Greeter/Infographics.qml 2015-06-30 09:26:14 +0000
385@@ -356,7 +356,7 @@
386 }
387 }
388
389- Label {
390+ DropShadowText {
391 id: notification
392 objectName: "label"
393
394
395=== modified file 'qml/Greeter/LoginList.qml'
396--- qml/Greeter/LoginList.qml 2015-02-01 19:53:29 +0000
397+++ qml/Greeter/LoginList.qml 2015-06-30 09:26:14 +0000
398@@ -150,7 +150,7 @@
399 return 1 - Math.min(1, (Math.abs(highlightDist) + root.cellHeight) / ((root.numAboveBelow + 1) * root.cellHeight))
400 }
401
402- Label {
403+ DropShadowText {
404 objectName: "username" + index
405
406 anchors {
407@@ -195,7 +195,7 @@
408 }
409 }
410
411- Label {
412+ DropShadowText {
413 id: infoLabel
414 objectName: "infoLabel"
415 anchors {

Subscribers

People subscribed via source and target branches