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
=== modified file 'AgendaView.qml'
--- AgendaView.qml 2016-03-03 22:32:56 +0000
+++ AgendaView.qml 2016-03-14 16:24:41 +0000
@@ -112,7 +112,10 @@
112 id: eventList112 id: eventList
113 objectName: "eventList"113 objectName: "eventList"
114114
115 anchors.fill: parent115 anchors{
116 fill: parent
117 bottomMargin: root.bottomEdgeHeight
118 }
116 visible: eventListModel.itemCount > 0119 visible: eventListModel.itemCount > 0
117 model: eventListModel120 model: eventListModel
118 delegate: listDelegate121 delegate: listDelegate
119122
=== modified file 'DayView.qml'
--- DayView.qml 2016-03-07 13:40:30 +0000
+++ DayView.qml 2016-03-14 16:24:41 +0000
@@ -146,6 +146,7 @@
146 anchors {146 anchors {
147 fill: parent147 fill: parent
148 topMargin: header.height148 topMargin: header.height
149 bottomMargin: dayViewPage.bottomEdgeHeight
149 }150 }
150151
151 delegate: TimeLineBaseComponent {152 delegate: TimeLineBaseComponent {
152153
=== modified file 'MonthView.qml'
--- MonthView.qml 2016-03-02 19:55:52 +0000
+++ MonthView.qml 2016-03-14 16:24:41 +0000
@@ -89,6 +89,7 @@
89 anchors {89 anchors {
90 fill: parent90 fill: parent
91 topMargin: header.height91 topMargin: header.height
92 bottomMargin: monthViewPage.bottomEdgeHeight
92 }93 }
9394
94 delegate: MonthWithEventsComponent {95 delegate: MonthWithEventsComponent {
9596
=== modified file 'PageWithBottomEdge.qml'
--- PageWithBottomEdge.qml 2016-03-07 17:57:04 +0000
+++ PageWithBottomEdge.qml 2016-03-14 16:24:41 +0000
@@ -24,6 +24,7 @@
24 property alias model: bottomEdge.eventModel24 property alias model: bottomEdge.eventModel
25 property alias createEventAt: bottomEdge.date25 property alias createEventAt: bottomEdge.date
26 property bool bootomEdgeEnabled: bottomEdge.enabled26 property bool bootomEdgeEnabled: bottomEdge.enabled
27 readonly property int bottomEdgeHeight: bottomEdge.hint.height
2728
28 signal bottomEdgeCommitStarted()29 signal bottomEdgeCommitStarted()
29 signal eventCreated(var event)30 signal eventCreated(var event)
3031
=== modified file 'WeekView.qml'
--- WeekView.qml 2016-03-04 16:10:56 +0000
+++ WeekView.qml 2016-03-14 16:24:41 +0000
@@ -156,6 +156,7 @@
156 anchors {156 anchors {
157 fill: parent157 fill: parent
158 topMargin: header.height158 topMargin: header.height
159 bottomMargin: weekViewPage.bottomEdgeHeight
159 }160 }
160161
161 onCurrentIndexChanged: {162 onCurrentIndexChanged: {
162163
=== modified file 'YearView.qml'
--- YearView.qml 2016-03-02 19:55:52 +0000
+++ YearView.qml 2016-03-14 16:24:41 +0000
@@ -107,6 +107,7 @@
107 anchors {107 anchors {
108 fill: parent108 fill: parent
109 topMargin: header.height109 topMargin: header.height
110 bottomMargin: yearViewPage.bottomEdgeHeight
110 }111 }
111112
112 delegate: Loader {113 delegate: Loader {

Subscribers

People subscribed via source and target branches

to status/vote changes: