Merge lp:~renatofilho/ubuntu-calendar-app/destroy-bottom-edge-page into lp:ubuntu-calendar-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Arthur Mello
Approved revision: 821
Merged at revision: 821
Proposed branch: lp:~renatofilho/ubuntu-calendar-app/destroy-bottom-edge-page
Merge into: lp:ubuntu-calendar-app
Diff against target: 32 lines (+8/-7)
1 file modified
NewEventBottomEdge.qml (+8/-7)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-calendar-app/destroy-bottom-edge-page
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+291824@code.launchpad.net

Commit message

Make sure that bottom edge page is destroyed after collapse it.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
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 'NewEventBottomEdge.qml'
2--- NewEventBottomEdge.qml 2016-03-18 00:40:37 +0000
3+++ NewEventBottomEdge.qml 2016-04-13 21:24:53 +0000
4@@ -63,13 +63,6 @@
5 implicitWidth: bottomEdge.width
6 implicitHeight: bottomEdge.height
7 children: bottomEdge._realPage
8- Component.onDestruction: {
9- if (bottomEdge._realPage) {
10- bottomEdge._realPage.destroy()
11- bottomEdge._realPage = null
12- _realPage = editorPageBottomEdge.createObject(null)
13- }
14- }
15 }
16
17 onCommitStarted: {
18@@ -77,6 +70,14 @@
19 updateNewEventInfo(bottomEdge.date ? bottomEdge.date : new Date(), false)
20 }
21
22+ onCollapseCompleted: {
23+ if (bottomEdge._realPage) {
24+ bottomEdge._realPage.destroy()
25+ bottomEdge._realPage = null
26+ _realPage = editorPageBottomEdge.createObject(null)
27+ }
28+ }
29+
30 Component.onCompleted: {
31 if (eventModel)
32 _realPage = editorPageBottomEdge.createObject(null)

Subscribers

People subscribed via source and target branches

to status/vote changes: