Merge lp:~vthompson/music-app/remix-update-listitem-background-color into lp:music-app/remix

Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 719
Merged at revision: 719
Proposed branch: lp:~vthompson/music-app/remix-update-listitem-background-color
Merge into: lp:music-app/remix
Diff against target: 64 lines (+20/-20)
1 file modified
common/ListItemWithActions.qml (+20/-20)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-update-listitem-background-color
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+239937@code.launchpad.net

This proposal supersedes a proposal from 2014-10-29.

Commit message

* Update ListItemWithActions background color

Description of the change

* Update ListItemWithActions background color

Currently the background in the pages that have list items is slightly off, this fixes that.

To post a comment you must log in.
719. By Victor Thompson

Re-enable dim effect

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM! and makes the Dim work again :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/ListItemWithActions.qml'
2--- common/ListItemWithActions.qml 2014-10-23 17:40:04 +0000
3+++ common/ListItemWithActions.qml 2014-10-29 03:22:33 +0000
4@@ -30,7 +30,7 @@
5 property Action activeAction: null
6 property var activeItem: null
7 property bool triggerActionOnMouseRelease: false
8- property color color: Theme.palette.normal.background
9+ property color color: "#1e1e23"
10 property color selectedColor: "#3d3d45" // "#E6E6E6" // CUSTOM
11 property bool selected: false
12 property bool selectionMode: false
13@@ -280,25 +280,6 @@
14 selectionMode = root.parent.parent.state === "multiselectable"
15 }
16
17- /* CUSTOM Dim Component */
18- Rectangle {
19- id: listItemDim
20- anchors {
21- fill: parent
22- }
23-
24- color: mouseArea.pressed ? styleMusic.common.black : "transparent"
25- opacity: 0.1
26-
27- property bool dim: false
28-
29- Behavior on color {
30- ColorAnimation {
31- duration: UbuntuAnimation.SlowDuration
32- }
33- }
34- }
35-
36 // CUSTOM remove animation
37 SequentialAnimation {
38 id: removeAnimation
39@@ -496,6 +477,25 @@
40 }
41 }
42
43+ /* CUSTOM Dim Component */
44+ Rectangle {
45+ id: listItemDim
46+ anchors {
47+ fill: parent
48+ }
49+
50+ color: mouseArea.pressed ? styleMusic.common.black : "transparent"
51+ opacity: 0.1
52+
53+ property bool dim: false
54+
55+ Behavior on color {
56+ ColorAnimation {
57+ duration: UbuntuAnimation.SlowDuration
58+ }
59+ }
60+ }
61+
62 /* CUSTOM Reorder Component */
63 Loader {
64 id: actionReorderLoader

Subscribers

People subscribed via source and target branches