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

[Michael Zanetti]

do it manually.. AbstractButton is not clever enough...

Unmerged revisions

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-04-27 17:24:33 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-05-07 21:45:06 +0000
@@ -37,6 +37,7 @@
                 notebookSelector.selectedIndex = i;
             }
         }
+        note.renderWidth = noteTextArea.width - noteTextArea.textMargin * 2
     }
 
     signal exitEditMode(var note)
@@ -84,7 +85,7 @@
         target: noteTextArea
         onWidthChanged: {
             note.richTextContent = noteTextArea.text;
-            note.renderWidth = noteTextArea.width - noteTextArea.textMargin
+            note.renderWidth = noteTextArea.width - noteTextArea.textMargin * 2
         }
     }
 
@@ -628,8 +629,8 @@
                 text: i18n.tr("Done")
                 height: parent.height
                 iconColor: UbuntuColors.green
-                activeFocusOnPress: true
                 onClicked: {
+                    forceActiveFocus();
                     saveNote();
                     root.exitEditMode(root.note);
                 }