Merge lp:~mzanetti/reminders-app/that-darn-focus into lp:reminders-app

[Michael Zanetti]

Take the focus on closing for real

[lp:~mzanetti/reminders-app/that-darn-focus]

417. By Michael Zanetti on 2015-04-27

merge trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:417
http://91.189.93.70:8080/job/reminders-app-ci/739/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2661
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/341
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/161

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/739/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Yup, that works.

review: Approve

=== modified file 'src/app/qml/components/RtfButton.qml'
--- src/app/qml/components/RtfButton.qml	2015-04-09 17:49:40 +0000
+++ src/app/qml/components/RtfButton.qml	2015-04-27 17:34:23 +0000
@@ -29,6 +29,7 @@
     property string color: "transparent"
     property alias iconColor: icon.color
     property alias horizontalAlignment: textField.horizontalAlignment
+    property alias activeFocusOnPress: mouseArea.activeFocusOnPress
 
     property alias font: textField.font
 

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-04-09 17:49:40 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-04-27 17:34:23 +0000
@@ -628,8 +628,8 @@
                 text: i18n.tr("Done")
                 height: parent.height
                 iconColor: UbuntuColors.green
+                activeFocusOnPress: true
                 onClicked: {
-                    noteTextArea.focus = false;
                     saveNote();
                     root.exitEditMode(root.note);
                 }