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

[Daniel van Vugt]

Keep the panel shadow attached to the panel at all times. Even under screen
transformations like the cube plugin.
(LP: #1011120)

Also fixes other panel shadow bugs (LP: #1061338) and (LP: #1061339)

See commit message.

[Sam Spilsbury (smspillaz)]

This code is correct - do we know if design wanted the panel shadow to be painted on top of the workspace switcher as well or should it still be hidden in that case? (Naturally, it looks better, but I'm not sure what the spec is).

[MC Return (mc-return)]

The Panel's shadow should IMHO be drawn if the Panel itself is drawn and should always stick with the Panel.

Great to see this nasty bug finally fixed, although what remains of the Cube is only a shadow of its former self in modern GLES Compiz (no 3d windows, no cube reflection and deformation, solid top and bottom caps).

+1 for this fix though.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Nice

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1421/console reported an error when processing this lp:~vanvugt/unity/fix-1011120 branch.
Not merging it.

[Daniel van Vugt (vanvugt)]

Added the old ugliness back in so there's no visible difference and we don't need to ask design.

[Daniel van Vugt (vanvugt)]

Fixing conflicts that have just appeared in lp:unity

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-10-10 18:10:34 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-11 07:28:19 +0000
@@ -584,10 +584,13 @@
 
   CompRegion redraw(clip);
   redraw &= shadowRect;
+  redraw -= panelShadowPainted;
 
   if (redraw.isEmpty())
     return;
 
+  panelShadowPainted |= redraw;
+
   // compiz doesn't use the same method of tracking monitors as our toolkit
   // we need to make sure we properly associate with the right monitor
   int current_monitor = -1;
@@ -1323,7 +1326,7 @@
 {
   allowWindowPaint = false;
   gScreen->glPaintTransformedOutput(attrib, transform, region, output, mask);
-
+  paintPanelShadow(region);
 }
 
 void UnityScreen::preparePaint(int ms)
@@ -1337,6 +1340,7 @@
     wi->HandleAnimations (ms);
 
   didShellRepaint = false;
+  panelShadowPainted = CompRegion();
   firstWindowAboveShell = NULL;
 }
 
@@ -2524,18 +2528,23 @@
     uScreen->paintDisplay();
   }
 
-  if (window->type() == CompWindowTypeDesktopMask)
+  bool screen_transformed = (mask & PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK);
+
+  if (window->type() == CompWindowTypeDesktopMask && !screen_transformed)
     uScreen->setPanelShadowMatrix(matrix);
 
   Window active_window = screen->activeWindow();
-  if (window->id() == active_window && window->type() != CompWindowTypeDesktopMask)
+  if (!screen_transformed &&
+      window->id() == active_window &&
+      window->type() != CompWindowTypeDesktopMask)
   {
     uScreen->paintPanelShadow(region);
   }
 
   bool ret = gWindow->glDraw(matrix, attrib, region, mask);
 
-  if ((active_window == 0 || active_window == window->id()) &&
+  if (!screen_transformed &&
+      (active_window == 0 || active_window == window->id()) &&
       (window->type() == CompWindowTypeDesktopMask))
   {
     uScreen->paintPanelShadow(region);

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-10-10 18:10:34 +0000
+++ plugins/unityshell/src/unityshell.h	2012-10-11 07:28:19 +0000
@@ -303,6 +303,7 @@
   bool    _key_nav_mode_requested;
   CompOutput* _last_output;
 
+  CompRegion panelShadowPainted;
   CompRegion nuxRegion;
   CompRegion fullscreenRegion;
   CompWindow* firstWindowAboveShell;