Merge lp:~mzanetti/unity8/quicklist-unset-model-before-closing into lp:unity8

Proposed by Michael Zanetti
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 240
Merged at revision: 256
Proposed branch: lp:~mzanetti/unity8/quicklist-unset-model-before-closing
Merge into: lp:unity8
Prerequisite: lp:~mzanetti/unity8/theme-quicklist
Diff against target: 24 lines (+5/-1)
1 file modified
Launcher/LauncherPanel.qml (+5/-1)
To merge this branch: bzr merge lp:~mzanetti/unity8/quicklist-unset-model-before-closing
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Michał Sawicz Approve
Review via email: mp+181517@code.launchpad.net

Commit message

unset model in quicklist before closing it

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
240. By Michael Zanetti

merge trunk

Revision history for this message
Albert Astals Cid (aacid) wrote :

Ok :-)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Launcher/LauncherPanel.qml'
2--- Launcher/LauncherPanel.qml 2013-08-26 23:35:13 +0000
3+++ Launcher/LauncherPanel.qml 2013-08-27 07:02:25 +0000
4@@ -492,6 +492,7 @@
5 height: childrenRect.height
6
7 Repeater {
8+ id: popoverRepeater
9 model: popover.model
10
11 ListItems.Standard {
12@@ -502,8 +503,11 @@
13 if (!model.clickable) {
14 return;
15 }
16+ PopupUtils.close(popover);
17+ // Unsetting model to prevent showing changing entries during fading out
18+ // that may happen because of triggering an action.
19 LauncherModel.quickListActionInvoked(appId, index);
20- PopupUtils.close(popover);
21+ popoverRepeater.model = undefined;
22 }
23 }
24 }

Subscribers

People subscribed via source and target branches