Merge lp:~mzanetti/reminders-app/fix-renderwidth into lp:reminders-app

[Michael Zanetti]

Fix setting the note's renderwidth

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

FAILED: Continuous integration, rev:430
http://91.189.93.70:8080/job/reminders-app-ci/741/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2723
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/343
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/163/console

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/435/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2725
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2725/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/213
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/157

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== 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:33:33 +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
         }
     }