Merge lp:~libqtelegram-team/telegram-app/app-dev-fix-1399679 into lp:telegram-app/app-dev

Proposed by Giulio Collura
Status: Merged
Approved by: Michał Karnicki
Approved revision: 195
Merged at revision: 195
Proposed branch: lp:~libqtelegram-team/telegram-app/app-dev-fix-1399679
Merge into: lp:telegram-app/app-dev
Diff against target: 36 lines (+4/-3)
2 files modified
components/TelegramDialogsListItem.qml (+2/-2)
components/listitems/ListItemWithActions.qml (+2/-1)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/app-dev-fix-1399679
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+244021@code.launchpad.net

Description of the change

Fix bug #1399679. Make the ThinDivider a little more visible. Restore the pressed state background.

To post a comment you must log in.
Revision history for this message
Michał Karnicki (karni) wrote :

I can't repro the problem, so I can't verify the fix, but the code is fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/TelegramDialogsListItem.qml'
2--- components/TelegramDialogsListItem.qml 2014-12-03 23:07:09 +0000
3+++ components/TelegramDialogsListItem.qml 2014-12-08 17:05:24 +0000
4@@ -89,9 +89,9 @@
5 top: parent.top
6 left: imageShape.right
7
8- topMargin: units.gu(1)
9+ topMargin: units.dp(10)
10 leftMargin: units.gu(1)
11- rightMargin: units.gu(1)
12+ // rightMargin: units.gu(1)
13 }
14 width: visible ? units.gu(2) : 0
15 fillMode: Image.PreserveAspectFit
16
17=== modified file 'components/listitems/ListItemWithActions.qml'
18--- components/listitems/ListItemWithActions.qml 2014-12-04 16:36:28 +0000
19+++ components/listitems/ListItemWithActions.qml 2014-12-08 17:05:24 +0000
20@@ -33,6 +33,7 @@
21 property color selectedColor: "#E6E6E6"
22 property bool selected: false
23 property bool selectionMode: false
24+ property alias pressed: mouseArea.pressed
25 property alias showDivider: divider.visible
26 property alias internalAnchors: mainContents.anchors
27 default property alias contents: mainContents.children
28@@ -427,7 +428,7 @@
29 left: parent.left
30 right: parent.right
31 bottom: parent.bottom
32- bottomMargin: units.gu(-0.15)
33+ bottomMargin: units.gu(-0.1)
34 }
35 }
36 }

Subscribers

People subscribed via source and target branches

to all changes: