1
=== modified file 'src/qml/Messages.qml'
2
--- src/qml/Messages.qml	2014-02-18 21:12:44 +0000
3
+++ src/qml/Messages.qml	2014-02-28 22:13:35 +0000
4
@@ -38,6 +38,7 @@
5
38
    // FIXME: MainView should provide if the view is in portait or landscape
38
    // FIXME: MainView should provide if the view is in portait or landscape
6
39
    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
39
    property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
7
40
    property bool landscape: orientationAngle == 90 || orientationAngle == 270
40
    property bool landscape: orientationAngle == 90 || orientationAngle == 270
8
41
    property bool pendingMessage: false
9
41
    flickable: null
42
    flickable: null
10
42
    title: {
43
    title: {
11
43
        if (landscape) {
44
        if (landscape) {
12
@@ -392,6 +393,7 @@
13
392
        listModel: threadId !== "" ? sortProxy : null
393
        listModel: threadId !== "" ? sortProxy : null
14
393
        verticalLayoutDirection: ListView.BottomToTop
394
        verticalLayoutDirection: ListView.BottomToTop
15
394
        spacing: units.gu(2)
395
        spacing: units.gu(2)
16
396
        highlightFollowsCurrentItem: false
17
395
        listDelegate: MessageDelegate {
397
        listDelegate: MessageDelegate {
18
396
            id: messageDelegate
398
            id: messageDelegate
19
397
            incoming: senderId != "self"
399
            incoming: senderId != "self"
20
@@ -428,6 +430,12 @@
21
428
                eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
430
                eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
22
429
            }
431
            }
23
430
        }
432
        }
24
433
        onCountChanged: {
25
434
            if (messages.pendingMessage) {
26
435
                messageList.contentY = 0
27
436
                messages.pendingMessage = false
28
437
            } 
29
438
        }
30
431
    }
439
    }
31
432
440
32
433
    Item {
441
    Item {
33
@@ -501,6 +509,7 @@
34
501
                                                                            HistoryThreadModel.MatchPhoneNumber,
509
                                                                            HistoryThreadModel.MatchPhoneNumber,
35
502
                                                                            true)
510
                                                                            true)
36
503
                }
511
                }
37
512
                messages.pendingMessage = true
38
504
                chatManager.sendMessage(participants, textEntry.text)
513
                chatManager.sendMessage(participants, textEntry.text)
39
505
                textEntry.text = ""
514
                textEntry.text = ""
40
506
            }
515
            }
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-02-28	Approve on 2014-03-04
PS Jenkins bot	continuous-integration		Approve on 2014-02-28
Review via email: mp+208871@code.launchpad.net