Merge lp:~3v1n0/unity/panel-shadow-over-off-windows into lp:unity

[Marco Trevisan (Treviño)]

UnityWindow: paint the panel shadow over a window if it's under the panel.

When drawing the panel shadow, we now follow a simple rule:

if a window is maximized or below its display panel, then we draw the panel shadow under it, otherwise we draw it over it.

Result: http://ubuntuone.com/4qbARJX46ZrO6TbrFOfgeb

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3302
http://jenkins.qa.ubuntu.com/job/unity-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/18

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/18/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

Code looks good to me. Works here.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/6

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/8

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Jenkins job was broken. Reapproving to land again.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-12 11:30:35 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-04-15 15:49:44 +0000
@@ -2598,28 +2598,52 @@
     uScreen->paintDisplay();
   }
 
-  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 (!screen_transformed &&
-      window->id() == active_window &&
-      window->type() != CompWindowTypeDesktopMask)
-  {
+  enum class DrawPanelShadow
+  {
+    NO,
+    BELOW_WINDOW,
+    OVER_WINDOW,
+  };
+
+  auto draw_panel_shadow = DrawPanelShadow::NO;
+
+  if (!(mask & PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK))
+  {
+    Window active_window = screen->activeWindow();
+
+    if (G_UNLIKELY(window->type() == CompWindowTypeDesktopMask))
+    {
+      uScreen->setPanelShadowMatrix(matrix);
+
+      if (active_window == 0 || active_window == window->id())
+        draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
+    }
+    else
+    {
+      if (window->id() == active_window)
+      {
+        draw_panel_shadow = DrawPanelShadow::BELOW_WINDOW;
+
+        if (!(window->state() & MAXIMIZE_STATE))
+        {
+          auto const& output = uScreen->screen->currentOutputDev();
+
+          if (window->y() - window->border().top < output.y() + uScreen->panel_style_.panel_height)
+          {
+            draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
+          }
+        }
+      }
+    }
+  }
+
+  if (draw_panel_shadow == DrawPanelShadow::BELOW_WINDOW)
     uScreen->paintPanelShadow(region);
-  }
 
   bool ret = gWindow->glDraw(matrix, attrib, region, mask);
 
-  if (!screen_transformed &&
-      (active_window == 0 || active_window == window->id()) &&
-      (window->type() == CompWindowTypeDesktopMask))
-  {
+  if (draw_panel_shadow == DrawPanelShadow::OVER_WINDOW)
     uScreen->paintPanelShadow(region);
-  }
 
   return ret;
 }