Merge lp:~renatofilho/ubuntu-calendar-app/fix-1373945A into lp:ubuntu-calendar-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Arthur Mello
Approved revision: 779
Merged at revision: 781
Proposed branch: lp:~renatofilho/ubuntu-calendar-app/fix-1373945A
Merge into: lp:ubuntu-calendar-app
Diff against target: 75 lines (+9/-1)
6 files modified
AgendaView.qml (+4/-1)
DayView.qml (+1/-0)
MonthView.qml (+1/-0)
PageWithBottomEdge.qml (+1/-0)
WeekView.qml (+1/-0)
YearView.qml (+1/-0)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-calendar-app/fix-1373945A
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
Ubuntu Calendar Developers Pending
Review via email: mp+288955@code.launchpad.net

Commit message

Does not overlap the view with bottom edge hint.

To post a comment you must log in.
Revision history for this message
Arthur Mello (artmello) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AgendaView.qml'
2--- AgendaView.qml 2016-03-03 22:32:56 +0000
3+++ AgendaView.qml 2016-03-14 16:24:41 +0000
4@@ -112,7 +112,10 @@
5 id: eventList
6 objectName: "eventList"
7
8- anchors.fill: parent
9+ anchors{
10+ fill: parent
11+ bottomMargin: root.bottomEdgeHeight
12+ }
13 visible: eventListModel.itemCount > 0
14 model: eventListModel
15 delegate: listDelegate
16
17=== modified file 'DayView.qml'
18--- DayView.qml 2016-03-07 13:40:30 +0000
19+++ DayView.qml 2016-03-14 16:24:41 +0000
20@@ -146,6 +146,7 @@
21 anchors {
22 fill: parent
23 topMargin: header.height
24+ bottomMargin: dayViewPage.bottomEdgeHeight
25 }
26
27 delegate: TimeLineBaseComponent {
28
29=== modified file 'MonthView.qml'
30--- MonthView.qml 2016-03-02 19:55:52 +0000
31+++ MonthView.qml 2016-03-14 16:24:41 +0000
32@@ -89,6 +89,7 @@
33 anchors {
34 fill: parent
35 topMargin: header.height
36+ bottomMargin: monthViewPage.bottomEdgeHeight
37 }
38
39 delegate: MonthWithEventsComponent {
40
41=== modified file 'PageWithBottomEdge.qml'
42--- PageWithBottomEdge.qml 2016-03-07 17:57:04 +0000
43+++ PageWithBottomEdge.qml 2016-03-14 16:24:41 +0000
44@@ -24,6 +24,7 @@
45 property alias model: bottomEdge.eventModel
46 property alias createEventAt: bottomEdge.date
47 property bool bootomEdgeEnabled: bottomEdge.enabled
48+ readonly property int bottomEdgeHeight: bottomEdge.hint.height
49
50 signal bottomEdgeCommitStarted()
51 signal eventCreated(var event)
52
53=== modified file 'WeekView.qml'
54--- WeekView.qml 2016-03-04 16:10:56 +0000
55+++ WeekView.qml 2016-03-14 16:24:41 +0000
56@@ -156,6 +156,7 @@
57 anchors {
58 fill: parent
59 topMargin: header.height
60+ bottomMargin: weekViewPage.bottomEdgeHeight
61 }
62
63 onCurrentIndexChanged: {
64
65=== modified file 'YearView.qml'
66--- YearView.qml 2016-03-02 19:55:52 +0000
67+++ YearView.qml 2016-03-14 16:24:41 +0000
68@@ -107,6 +107,7 @@
69 anchors {
70 fill: parent
71 topMargin: header.height
72+ bottomMargin: yearViewPage.bottomEdgeHeight
73 }
74
75 delegate: Loader {

Subscribers

People subscribed via source and target branches

to status/vote changes: