Merge lp:~vanvugt/unity/fix-1057528-6 into lp:unity/6.0

[Daniel van Vugt]

Draw the panel shadow only within the redraw region. Using a bounding box
allowed parts to get redrawn when they should not, appearing as small chunks
of extra-dark panel shadow.
(LP: #1057528)

Backport to Unity 6.x. Already committed to Unity 7.0

[Łukasz Zemczak (sil2100)]

Tested, code looking good, manual test enough. +1

review: Approve

[Unity Merger (unity-merger)]

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

=== modified file 'manual-tests/Panel.txt'
--- manual-tests/Panel.txt	2012-08-23 16:55:54 +0000
+++ manual-tests/Panel.txt	2012-10-11 01:42:37 +0000
@@ -95,3 +95,19 @@
   At no point during the actions should the panel (or launcher) blink or
   flicker out of existence.
 
+
+Panel shadow overdraw
+---------------------
+Setup:
+#. Install Google Chrome or Chromium.
+
+Actions:
+#. Maximize a Chrome window.
+#. Open several tabs so that the titles of some tabs are not fully visible
+   and fade out to the right.
+#. Hover the mouse over the very top part of some tabs so tooltips appear.
+
+Expected Result:
+  No part of the panel shadow should ever appear on top of the maximized
+  Chrome window.
+

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-10-05 16:39:02 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-10-11 01:42:37 +0000
@@ -548,6 +548,9 @@
 
 void UnityScreen::paintPanelShadow(const CompRegion& clip)
 {
+  if (panel_controller_->opacity() == 0.0f)
+    return;
+
   if (sources_.GetSource(local::RELAYOUT_TIMEOUT))
     return;
 
@@ -573,22 +576,6 @@
   if (redraw.isEmpty())
     return;
 
-  const CompRect& bounds(redraw.boundingRect());
-
-  // Sub-rectangle of the shadow needing redrawing:
-  float x1 = bounds.x1();
-  float y1 = bounds.y1();
-  float x2 = bounds.x2();
-  float y2 = bounds.y2();
-
-  // Texture coordinates of the above rectangle:
-  float tx1 = (x1 - shadowX) / shadowWidth;
-  float ty1 = (y1 - shadowY) / shadowHeight;
-  float tx2 = (x2 - shadowX) / shadowWidth;
-  float ty2 = (y2 - shadowY) / shadowHeight;
-
-  nuxPrologue();
-
   // 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;
@@ -604,8 +591,14 @@
     i++;
   }
 
-  if (!(launcher_controller_->IsOverlayOpen() && current_monitor == overlay_monitor_)
-      && panel_controller_->opacity() > 0.0f)
+  if (launcher_controller_->IsOverlayOpen() && current_monitor == overlay_monitor_)
+    return;
+
+  nuxPrologue();
+
+  const CompRect::vector& rects = redraw.rects();
+
+  for (auto const& r : rects)
   {
     foreach(GLTexture * tex, _shadow_texture)
     {
@@ -627,6 +620,18 @@
                     (GLushort)(panel_controller_->opacity() * 0xFFFF)
                   };
 
+      // Sub-rectangle of the shadow needing redrawing:
+      float x1 = r.x1();
+      float y1 = r.y1();
+      float x2 = r.x2();
+      float y2 = r.y2();
+
+      // Texture coordinates of the above rectangle:
+      float tx1 = (x1 - shadowX) / shadowWidth;
+      float ty1 = (y1 - shadowY) / shadowHeight;
+      float tx2 = (x2 - shadowX) / shadowWidth;
+      float ty2 = (y2 - shadowY) / shadowHeight;
+
       vertexData = {
         x1, y1, 0,
         x1, y2, 0,