Unity

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

  1. fix-1036587
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: no longer in the source branch.
Merged at revision: 2562
Proposed branch: lp:~vanvugt/unity/fix-1036587
Merge into: lp:unity
Diff against target: 15 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-1036587
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
Review via email: mp+119507@code.launchpad.net

Commit message

When building with USE_MODERN_COMPIZ_GL, we still need the same fullscreen
windowing logic. Otherwise the unity shell will appear on top of fullscreen
windows. (LP: #1036587)

Description of the change

When building with USE_MODERN_COMPIZ_GL, we still need the same fullscreen
windowing logic. Otherwise the unity shell will appear on top of fullscreen
windows. (LP: #1036587)

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

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-08-13 20:16:28 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-08-14 10:54:25 +0000
4@@ -1303,10 +1303,10 @@
5 /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
6 ret = gScreen->glPaintOutput(attrib, transform, region, output, mask);
7
8-#ifndef USE_MODERN_COMPIZ_GL
9 if (doShellRepaint && !force && fullscreenRegion.contains(*output))
10 doShellRepaint = false;
11
12+#ifndef USE_MODERN_COMPIZ_GL
13 if (doShellRepaint)
14 paintDisplay(region, transform, mask);
15 #endif