Merge lp:~mzanetti/reminders-app/textarea into lp:reminders-app

[Michael Zanetti]

Switch to uitk's TextArea

WARNING: This depends on a not yet merged branch in UITK. Also it will introduce a dependency to Framework 15.04 when merged.

Also I hope to get rid of the "+ units.gu(2)" in line 13 as IMO that should be taken into account by the TextArea's paintedHeight property.

[Michael Zanetti (mzanetti)]

this change was done with another branch

Unmerged revisions

384. By Michael Zanetti on 2015-03-17

switch to uitk's TextArea

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-03-05 18:23:25 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-03-17 22:17:13 +0000
@@ -174,18 +174,20 @@
                          values: Notebooks {}
                      }
 
-                     TextEdit {
+                     TextArea {
                          id: noteTextArea
                          width: flick.width
-                         height: Math.max(flick.height - notebookSelector.height, paintedHeight)
+                         height: Math.max(flick.height - notebookSelector.height, paintedHeight + units.gu(2))
                          focus: true
                          wrapMode: TextEdit.Wrap
                          textFormat: TextEdit.RichText
                          text: root.note ? root.note.richTextContent : ""
                          onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
                          selectByMouse: toolbox.charFormatExpanded
-                         textMargin: units.gu(1)
                          selectionColor: UbuntuColors.blue
+                         style: TextAreaStyle {
+                             background: null
+                         }
 
                          // Due to various things updating when creating the view,
                          // we need to set the focus in the next event loop pass