← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 

Michael Zanetti has proposed merging lp:~mzanetti/reminders-app/textarea into lp:reminders-app.

Commit message:
Switch to uitk's TextArea

Requested reviews:
  Ubuntu Reminders app developers (reminders-app-dev)
Related bugs:
  Bug #1392276 in Ubuntu Reminders app: "TextArea does not export TextEdit's textDocument property"
  https://bugs.launchpad.net/reminders-app/+bug/1392276

For more details, see:
https://code.launchpad.net/~mzanetti/reminders-app/textarea/+merge/253286

WARNING: This depends on a not yet merged branch in UITK. Also it will introduce a dependency to Framework 15.04 when merged.
-- 
Your team Ubuntu Reminders app developers is requested to review the proposed merge of lp:~mzanetti/reminders-app/textarea into lp:reminders-app.
=== 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


References