Merge lp:~tiagosh/messaging-app/fix-highlight_current_item into lp:messaging-app

[Tiago Salem Herrmann]

set highlightFollowsCurrentItem to false to avoid unexpected behaviors with qt5.2

set highlightFollowsCurrentItem to false to avoid unexpected behaviors with qt5.2

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/168/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3607
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3218/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3611
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3220
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3220/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5597/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4401

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/168/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-highlight_current_item]

71. By Tiago Salem Herrmann on 2014-02-28

scroll view when sending a new message.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/169/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3613
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3222
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5600
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4404

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/169/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved. works as expected under qt5.2 and has no effect on Qt5.0

review: Approve

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-02-18 21:12:44 +0000
+++ src/qml/Messages.qml	2014-02-28 22:13:35 +0000
@@ -38,6 +38,7 @@
     // FIXME: MainView should provide if the view is in portait or landscape
     property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
     property bool landscape: orientationAngle == 90 || orientationAngle == 270
+    property bool pendingMessage: false
     flickable: null
     title: {
         if (landscape) {
@@ -392,6 +393,7 @@
         listModel: threadId !== "" ? sortProxy : null
         verticalLayoutDirection: ListView.BottomToTop
         spacing: units.gu(2)
+        highlightFollowsCurrentItem: false
         listDelegate: MessageDelegate {
             id: messageDelegate
             incoming: senderId != "self"
@@ -428,6 +430,12 @@
                 eventModel.removeEvent(event.accountId, event.threadId, event.eventId, event.type)
             }
         }
+        onCountChanged: {
+            if (messages.pendingMessage) {
+                messageList.contentY = 0
+                messages.pendingMessage = false
+            } 
+        }
     }
 
     Item {
@@ -501,6 +509,7 @@
                                                                             HistoryThreadModel.MatchPhoneNumber,
                                                                             true)
                 }
+                messages.pendingMessage = true
                 chatManager.sendMessage(participants, textEntry.text)
                 textEntry.text = ""
             }