Merge lp:~vanvugt/unity/fix-1024459 into lp:unity

Proposed by Daniel van Vugt on 2012-07-16
Status: Merged
Approved by: Łukasz Zemczak on 2012-07-16
Approved revision: 2505
Merged at revision: 2504
Proposed branch: lp:~vanvugt/unity/fix-1024459
Merge into: lp:unity
Diff against target: 45 lines (+25/-2)
2 files modified
manual-tests/Panel.txt (+18/-0)
plugins/unityshell/src/unityshell.cpp (+7/-2)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-1024459
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration 2012-07-16 Approve on 2012-07-16
Łukasz Zemczak 2012-07-16 Approve on 2012-07-16
Didier Roche 2012-07-16 Pending
Sebastien Bacher 2012-07-16 Pending
Review via email: mp+115120@code.launchpad.net

This proposal supersedes a proposal from 2012-07-16.

Commit message

Fix blinking/flickering of the launcher and panel, especially when running
LibreOffice or Emacs. (LP: #1024459)

Description of the change

Fix blinking/flickering of the launcher and panel, especially when running
LibreOffice or Emacs. (LP: #1024459)

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote : Posted in a previous version of this proposal

Works for me.

review: Approve
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal
review: Approve (continuous-integration)
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Seems to conflict with the fix for bug 1024911.

review: Needs Fixing
Łukasz Zemczak (sil2100) wrote :

Ok, tested - this time it seems fine in its finest.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manual-tests/Panel.txt'
2--- manual-tests/Panel.txt 2012-05-31 22:20:35 +0000
3+++ manual-tests/Panel.txt 2012-07-16 11:43:21 +0000
4@@ -79,3 +79,21 @@
5
6 Expected Results:
7 #. THe Go menu should NOT open.
8+
9+
10+Panel (and Launcher) blinking/flickering
11+-----------------------------------------
12+Setup:
13+#. Optionally install "emacs23"
14+
15+Actions:
16+#. Open LibreOffice Impress.
17+#. Click on "Click to add title" and "Click to add text" a few times.
18+#. Optionally: Run emacs23
19+#. Optionally: Open a large file in emacs23.
20+#. Optionally: Scroll to the bottom of the file using Page Down.
21+
22+Outcome:
23+ At no point during the actions should the panel (or launcher) blink or
24+ flicker out of existence.
25+
26
27=== modified file 'plugins/unityshell/src/unityshell.cpp'
28--- plugins/unityshell/src/unityshell.cpp 2012-07-16 04:01:30 +0000
29+++ plugins/unityshell/src/unityshell.cpp 2012-07-16 11:43:21 +0000
30@@ -1253,8 +1253,13 @@
31 * need to. Doing so on every frame causes Nux to hog the GPU and slow down
32 * ALL rendering. (LP: #988079)
33 */
34- bool force = forcePaintOnTop() || PluginAdapter::Default()->IsExpoActive();
35- doShellRepaint = force || !(region.isEmpty() || wt->GetDrawList().empty());
36+ bool force = forcePaintOnTop();
37+ doShellRepaint = force ||
38+ ( !region.isEmpty() &&
39+ ( !wt->GetDrawList().empty() ||
40+ (mask & PAINT_SCREEN_FULL_MASK)
41+ )
42+ );
43
44 allowWindowPaint = true;
45 _last_output = output;