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

Proposed by Christopher Townsend
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
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
Marco Trevisan (Treviño) Approve
Brandon Schaefer (community) Approve
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.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

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

Right, sorry for the regression I caused :/

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2013-09-20 18:25:21 +0000
+++ plugins/unityshell/src/unityshell.cpp 2013-09-23 21:17:28 +0000
@@ -1344,18 +1344,19 @@
13441344
1345 if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)1345 if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
1346 {1346 {
1347 wi->DeleteHandler();
1347 it = ShowdesktopHandler::animating_windows.erase(it);1348 it = ShowdesktopHandler::animating_windows.erase(it);
1348 continue;1349 continue;
1349 }1350 }
1350 else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)1351 else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)
1351 {1352 {
1352 wi->AddDamage ();1353 wi->AddDamage();
1353 }1354 }
13541355
1355 ++it;1356 ++it;
1356 }1357 }
13571358
1358 cScreen->donePaint ();1359 cScreen->donePaint();
1359}1360}
13601361
1361void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)1362void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)