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

Proposed by Samer Masterson
Status: Merged
Approved by: David Planella
Approved revision: 189
Merged at revision: 190
Proposed branch: lp:~samertm/ubuntu-calendar-app/fixes-1272625
Merge into: lp:ubuntu-calendar-app
Diff against target: 43 lines (+4/-4)
2 files modified
DayView.qml (+3/-3)
WeekView.qml (+1/-1)
To merge this branch: bzr merge lp:~samertm/ubuntu-calendar-app/fixes-1272625
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Victor Thompson (community) Approve
Review via email: mp+203448@code.launchpad.net

Commit message

* 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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

Looks right on my device. Nice work!

review: Approve
Revision history for this message
David Planella (dpm) wrote :

Looks good to me too, thanks!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
7 id: root7 id: root
8 objectName: "DayView"8 objectName: "DayView"
99
10 anchors.fill: parent
11
12 property var currentDay: new Date()10 property var currentDay: new Date()
1311
14 Column {12 Column {
@@ -18,6 +16,8 @@
18 width: parent.width; height: parent.height16 width: parent.width; height: parent.height
19 spacing: units.gu(1)17 spacing: units.gu(1)
2018
19 anchors.fill: parent
20
21 ViewHeader{21 ViewHeader{
22 id: viewHeader22 id: viewHeader
23 date: currentDay23 date: currentDay
@@ -47,7 +47,7 @@
47 preferredHighlightEnd: 0.547 preferredHighlightEnd: 0.5
4848
49 width: parent.width49 width: parent.width
50 height: column.height - viewHeader.height - dayHeader.height50 height: column.height - dayViewPath.y
5151
52 path: Path {52 path: Path {
53 startX: -(dayViewPath.width/1.75); startY: dayViewPath.height/253 startX: -(dayViewPath.width/1.75); startY: dayViewPath.height/2
5454
=== 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 @@
34 property var weekStart: weekViewPath.visibleWeek.addDays(-7)34 property var weekStart: weekViewPath.visibleWeek.addDays(-7)
3535
36 width: parent.width36 width: parent.width
37 height: root.height - viewHeader.height - weekHeader.height37 height: root.height - weekViewPath.y
3838
39 onNextItemHighlighted: {39 onNextItemHighlighted: {
40 nextWeek();40 nextWeek();

Subscribers

People subscribed via source and target branches

to status/vote changes: