Merge lp:~samertm/ubuntu-calendar-app/fixes-1272625 into lp:ubuntu-calendar-app

[Samer Masterson]

* Changes the height of the frame to fit the window.
* Moves "anchors.fill: parent" into the Column scope in
  DayView.qml to keep it consistent with WeekView.qml

Changes the height so that it's relative to the top of the view path, so that it will still be correct if the heights of the other views are changed.

There is no need for spacing because "anchors.fill: parent" was moved from the Item scope to the Column scope in DayView.qml. This keeps the anchors in DayView and WeekView consistent.

[Victor Thompson (vthompson)]

Looks right on my device. Nice work!

review: Approve

[David Planella (dpm)]

Looks good to me too, thanks!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'DayView.qml'
--- DayView.qml	2013-10-16 14:36:51 +0000
+++ DayView.qml	2014-01-28 01:57:06 +0000
@@ -7,8 +7,6 @@
     id: root
     objectName: "DayView"
 
-    anchors.fill: parent
-
     property var currentDay: new Date()
 
     Column {
@@ -18,6 +16,8 @@
         width: parent.width; height: parent.height
         spacing: units.gu(1)
 
+        anchors.fill: parent
+
         ViewHeader{
             id: viewHeader
             date: currentDay
@@ -47,7 +47,7 @@
             preferredHighlightEnd: 0.5
 
             width: parent.width
-            height: column.height - viewHeader.height - dayHeader.height
+            height: column.height - dayViewPath.y
 
             path: Path {
                 startX: -(dayViewPath.width/1.75); startY: dayViewPath.height/2

=== modified file 'WeekView.qml'
--- WeekView.qml	2014-01-09 23:15:57 +0000
+++ WeekView.qml	2014-01-28 01:57:06 +0000
@@ -34,7 +34,7 @@
         property var weekStart: weekViewPath.visibleWeek.addDays(-7)
 
         width: parent.width
-        height: root.height - viewHeader.height - weekHeader.height
+        height: root.height - weekViewPath.y
 
         onNextItemHighlighted: {
             nextWeek();