Merge lp:~phablet-team/messaging-app/fix-attachments-preview into lp:messaging-app/stable

Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 617
Merged at revision: 617
Proposed branch: lp:~phablet-team/messaging-app/fix-attachments-preview
Merge into: lp:messaging-app/stable
Prerequisite: lp:~phablet-team/messaging-app/fix-argument-parsing2
Diff against target: 23 lines (+8/-5)
1 file modified
src/qml/MessageDelegate.qml (+8/-5)
To merge this branch: bzr merge lp:~phablet-team/messaging-app/fix-attachments-preview
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Review via email: mp+314326@code.launchpad.net

Commit message

Fix attachments previewer.

Description of the change

Fix attachments previewer.

To post a comment you must log in.
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/MessageDelegate.qml'
--- src/qml/MessageDelegate.qml 2016-11-18 21:15:46 +0000
+++ src/qml/MessageDelegate.qml 2017-01-09 13:46:27 +0000
@@ -188,11 +188,14 @@
188 }188 }
189 highlightColor: "transparent"189 highlightColor: "transparent"
190190
191 onClicked: {191 MouseArea {
192 if (!selectMode) {192 anchors.fill: parent
193 // we only have actions for attachment items, so forward the click193 onClicked: {
194 if (attachmentsLoader.item) {194 if (!selectMode) {
195 attachmentsLoader.item.clicked(mouse)195 // we only have actions for attachment items, so forward the click
196 if (attachmentsLoader.item) {
197 attachmentsLoader.item.clicked(mouse)
198 }
196 }199 }
197 }200 }
198 }201 }

Subscribers

People subscribed via source and target branches

to all changes: