Merge lp:~andrewsomething/notes-app/note-width into lp:notes-app

[Andrew Starr-Bochicchio]

When the width of the app is beyond a certain point, don't make notes fill the entire width.

As it is now, when the app is in a large window, the notes look wider than they should and stretched. This branch makes it so that when the width of the app is beyond a certain point, the notes don't fill the entire width.

The app could probably use some design guidance for when it is used on the desktop or on a tablet, but this at least makes it feel less awkward for now.

Unmerged revisions

231. By Andrew Starr-Bochicchio on 2013-11-27

When the wide of the app is beyond a certain point, don't make notes fill the entire width.

=== modified file 'Components/NoteItem.qml'
--- Components/NoteItem.qml	2013-10-07 15:20:27 +0000
+++ Components/NoteItem.qml	2013-11-27 01:48:23 +0000
@@ -32,6 +32,7 @@
     property real expandedHeight
     property real actualExpandedHeight: Math.max(noteContent.contentHeight + units.gu(2), expandedHeight)
     property bool isExpanded: false
+    property bool wideAspect: notesMainWindow.width > units.gu(60)
 
     signal noteDeleted
     signal activated
@@ -93,8 +94,9 @@
 
         MixedEdit {
             id: noteContent
-            width: parent.width
+            width: wideAspect ? parent.width * 3/4 : parent.width
             height: noteItem.height
+            anchors.horizontalCenter: parent.horizontalCenter
 
             opacity: noteItem.isExpanded ? 1.0 : 0.0
             visible: opacity > 0.0
@@ -111,7 +113,7 @@
 
         CollapsedNote {
             id: collapsedContent
-            anchors.fill: parent
+            anchors.fill: noteContent
             anchors.margins: units.gu(0.5)
 
             height: noteItem.collapsedHeight
@@ -119,7 +121,7 @@
         }
 
         CollapsedNoteDecorations {
-            anchors.fill: parent
+            anchors.fill: noteContent
             anchors.margins: units.gu(0.5)
 
             date: noteItem.dateText