Merge lp:~libqtelegram-team/telegram-app/long-press-on-photo-will-enter-the-preview-mode into lp:telegram-app

Proposed by Jin
Status: Merged
Approved by: Roberto Mier Escandon
Approved revision: 229
Merged at revision: 228
Proposed branch: lp:~libqtelegram-team/telegram-app/long-press-on-photo-will-enter-the-preview-mode
Merge into: lp:telegram-app
Diff against target: 37 lines (+8/-1)
2 files modified
telegram/app/qml/AccountMessageList.qml (+2/-1)
telegram/app/qml/PickerPage.qml (+6/-0)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/long-press-on-photo-will-enter-the-preview-mode
Reviewer Review Type Date Requested Status
Roberto Mier Escandon Pending
Review via email: mp+304891@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'telegram/app/qml/AccountMessageList.qml'
2--- telegram/app/qml/AccountMessageList.qml 2016-07-22 06:27:59 +0000
3+++ telegram/app/qml/AccountMessageList.qml 2016-09-05 07:49:25 +0000
4@@ -304,7 +304,6 @@
5 else
6 mlist.selectItem(message_item);
7 }
8- message_item.click();
9 }
10
11 onClicked: {
12@@ -314,6 +313,8 @@
13 selected = false;
14 else
15 selected = true;
16+ } else {
17+ message_item.click();
18 }
19 }
20 else
21
22=== modified file 'telegram/app/qml/PickerPage.qml'
23--- telegram/app/qml/PickerPage.qml 2016-08-10 07:40:12 +0000
24+++ telegram/app/qml/PickerPage.qml 2016-09-05 07:49:25 +0000
25@@ -31,6 +31,12 @@
26 }
27
28 ContentPeerPicker {
29+ anchors {
30+ top: picker.bottom
31+ left: parent.left
32+ right: parent.right
33+ margins: units.gu(6)
34+ }
35 visible: parent.visible
36 contentType: picker.contentType
37 handler: picker.handler

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: