Merge lp:~azzar1/unity/fix-high-cpu-when-locked into lp:unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4159
Proposed branch: lp:~azzar1/unity/fix-high-cpu-when-locked
Merge into: lp:unity
Diff against target: 12 lines (+3/-0)
1 file modified
plugins/unityshell/src/unityshell.cpp (+3/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-high-cpu-when-locked
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+300853@code.launchpad.net

Commit message

When locked discard damages from windows below lockscreen.

Description of the change

When locked discard damages from windows below lockscreen.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

See the comment, just a small improvement.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

> See the comment, just a small improvement.

Done.

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 2016-07-15 10:24:40 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2016-07-25 11:46:11 +0000
4@@ -3189,6 +3189,9 @@
5
6 bool UnityWindow::damageRect(bool initial, CompRect const& rect)
7 {
8+ if (uScreen->lockscreen_controller_->IsLocked() && !CanBypassLockScreen())
9+ return true;
10+
11 if (initial)
12 deco_win_->Update();
13