Merge lp:~michael-sheldon/content-hub/fix-1384490-safe into lp:content-hub

Proposed by Michael Sheldon
Status: Merged
Approved by: Ken VanDine
Approved revision: 180
Merged at revision: 180
Proposed branch: lp:~michael-sheldon/content-hub/fix-1384490-safe
Merge into: lp:content-hub
Diff against target: 65 lines (+8/-6)
2 files modified
import/Ubuntu/Content/ContentPeerPicker10.qml (+4/-3)
import/Ubuntu/Content/ContentPeerPicker11.qml (+4/-3)
To merge this branch: bzr merge lp:~michael-sheldon/content-hub/fix-1384490-safe
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+247313@code.launchpad.net

Commit message

Use the theme background so that fonts are visible with dark apps

Description of the change

Use the theme background so that fonts are visible with dark apps

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

The following click can be used for viewing the peer picker when embedded in an app with both a light and a dark background: http://mikeasoft.com/~mike/content-hub/com.ubuntu.developer.michael-sheldon.test-picker-style_0.2_all.click

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import/Ubuntu/Content/ContentPeerPicker10.qml'
2--- import/Ubuntu/Content/ContentPeerPicker10.qml 2014-12-01 13:09:16 +0000
3+++ import/Ubuntu/Content/ContentPeerPicker10.qml 2015-01-22 16:05:51 +0000
4@@ -39,8 +39,9 @@
5 signal cancelPressed
6
7 Rectangle {
8+ id: background
9 anchors.fill: parent
10- color: Theme.palette.normal.overlay
11+ color: Theme.palette.normal.background
12 }
13
14 Header {
15@@ -161,7 +162,7 @@
16
17 Rectangle {
18 id: apps
19- color: "#FFFFFF"
20+ color: ColorUtils.luminance(background.color) >= 0.85 ? "#FFFFFF" : Qt.darker(background.color)
21 clip: true
22 anchors {
23 left: parent.left
24@@ -215,7 +216,7 @@
25 id: devices
26 // TODO: make this visible when we have a way to populate devices
27 visible: false
28- color: "#FFFFFF"
29+ color: ColorUtils.luminance(background.color) >= 0.85 ? "#FFFFFF" : Qt.darker(background.color)
30 width: parent.width
31 radius: 0
32 anchors {
33
34=== modified file 'import/Ubuntu/Content/ContentPeerPicker11.qml'
35--- import/Ubuntu/Content/ContentPeerPicker11.qml 2014-12-01 13:09:16 +0000
36+++ import/Ubuntu/Content/ContentPeerPicker11.qml 2015-01-22 16:05:51 +0000
37@@ -40,8 +40,9 @@
38 signal cancelPressed
39
40 Rectangle {
41+ id: background
42 anchors.fill: parent
43- color: Theme.palette.normal.overlay
44+ color: Theme.palette.normal.background
45 }
46
47 Header {
48@@ -178,7 +179,7 @@
49
50 Rectangle {
51 id: apps
52- color: "#FFFFFF"
53+ color: ColorUtils.luminance(background.color) >= 0.85 ? "#FFFFFF" : Qt.darker(background.color)
54 clip: true
55 anchors {
56 left: parent.left
57@@ -232,7 +233,7 @@
58 id: devices
59 // TODO: make this visible when we have a way to populate devices
60 visible: false
61- color: "#FFFFFF"
62+ color: ColorUtils.luminance(background.color) >= 0.85 ? "#FFFFFF" : Qt.darker(background.color)
63 width: parent.width
64 radius: 0
65 anchors {

Subscribers

People subscribed via source and target branches