Merge lp:~townsend/unity/fix-broken-decors-regression into lp:unity

Proposed by Christopher Townsend on 2013-09-23
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2013-09-24
Approved revision: 3529
Merged at revision: 3528
Proposed branch: lp:~townsend/unity/fix-broken-decors-regression
Merge into: lp:unity
Diff against target: 25 lines (+3/-2)
1 file modified
plugins/unityshell/src/unityshell.cpp (+3/-2)
To merge this branch: bzr merge lp:~townsend/unity/fix-broken-decors-regression
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-09-24
Marco Trevisan (Treviño) Approve on 2013-09-24
Brandon Schaefer (community) 2013-09-23 Approve on 2013-09-23
Review via email: mp+187110@code.launchpad.net

Commit message

The ShowDesktopHandleWindowInterface teardown was missing it's call to DeleteHandler() in a recent commit that refactored the handling of some Show Desktop code.

Description of the change

= Issue =
Revno. 3515 caused a regression when leaving Show Desktop caused all window decorations to become unusuable.

= Fix =
The ShowDesktopHandleWindowInterface teardown was missing it's call to DeleteHandler().

To post a comment you must log in.
3529. By Christopher Townsend on 2013-09-23

Fix some formatting.

Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Marco Trevisan (Treviño) (3v1n0) wrote :

Right, sorry for the regression I caused :/

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2013-09-20 18:25:21 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2013-09-23 21:17:28 +0000
4@@ -1344,18 +1344,19 @@
5
6 if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
7 {
8+ wi->DeleteHandler();
9 it = ShowdesktopHandler::animating_windows.erase(it);
10 continue;
11 }
12 else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)
13 {
14- wi->AddDamage ();
15+ wi->AddDamage();
16 }
17
18 ++it;
19 }
20
21- cScreen->donePaint ();
22+ cScreen->donePaint();
23 }
24
25 void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)