Merge lp:~azzar1/unity/damage-screen-when-animating into lp:unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Didier Roche
Approved revision: 2766
Merged at revision: 2766
Proposed branch: lp:~azzar1/unity/damage-screen-when-animating
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/damage-screen-when-animating
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+126978@code.launchpad.net

Commit message

Make sure we call damageScreen when we have running animations.

Description of the change

Rev 2765 removed code duplication but with using a fullscreen dash + high resolution display preview fade out animation can hangs occasionally.

To post a comment you must log in.
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1405/console reported an error when processing this lp:~andyrock/unity/damage-screen-when-animating branch.
Not merging it.

Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1408/console reported an error when processing this lp:~andyrock/unity/damage-screen-when-animating branch.
Not merging it.

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 2012-09-28 11:48:08 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-09-28 14:27:31 +0000
4@@ -1449,7 +1449,7 @@
5 * stop it. Then maybe we can revert back to the old code below #else.
6 */
7 std::vector<nux::Geometry> const& dirty = wt->GetDrawList();
8- if (!dirty.empty())
9+ if (!dirty.empty() || animation_controller_->HasRunningAnimations())
10 {
11 cScreen->damageRegionSetEnabled(this, false);
12 cScreen->damageScreen();