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

[Daniel van Vugt]

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

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

[Łukasz Zemczak (sil2100)]

Works for me.

review: Approve

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2503
http://jenkins.qa.ubuntu.com/job/unity-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/81/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Seems to conflict with the fix for bug 1024911.

review: Needs Fixing

=== modified file 'manual-tests/Panel.txt'
--- manual-tests/Panel.txt	2012-05-31 22:20:35 +0000
+++ manual-tests/Panel.txt	2012-07-16 11:36:58 +0000
@@ -79,3 +79,21 @@
 
 Expected Results:
 #. THe Go menu should NOT open.
+
+
+Panel (and Launcher) blinking/flickering
+-----------------------------------------
+Setup:
+#. Optionally install "emacs23"
+
+Actions:
+#. Open LibreOffice Impress.
+#. Click on "Click to add title" and "Click to add text" a few times.
+#. Optionally: Run emacs23
+#. Optionally: Open a large file in emacs23.
+#. Optionally: Scroll to the bottom of the file using Page Down.
+
+Outcome:
+  At no point during the actions should the panel (or launcher) blink or
+  flicker out of existence.
+

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-07-16 04:01:30 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-07-16 11:36:58 +0000
@@ -1253,8 +1253,13 @@
    * need to. Doing so on every frame causes Nux to hog the GPU and slow down
    * ALL rendering. (LP: #988079)
    */
-  bool force = forcePaintOnTop() || PluginAdapter::Default()->IsExpoActive();
-  doShellRepaint = force || !(region.isEmpty() || wt->GetDrawList().empty());
+  bool force = forcePaintOnTop();
+  doShellRepaint = force ||
+                   ( !region.isEmpty() &&
+                     ( !wt->GetDrawList().empty() ||
+                       (mask & PAINT_SCREEN_FULL_MASK)
+                     )
+                   );
 
   allowWindowPaint = true;
   _last_output = output;