Merge lp:~townsend/unity/fix-panel-shadow-regressions into lp:unity

[Christopher Townsend]

Fixes some panel shadow regressions caused by rev. 3381.
- No panel shadow when logging in, ie, no windows are opened.
- Indicator drop down menus have the panel shadow painted over them.
- Notification bubbles cause the panel shadow to be drawn on top of everything.
- Minimizing all windows caused the panel shadow to not be drawn.

== Issue ==
The changes I introduced in revno. 3381 has caused some panel shadow regressions. These include:

1. No panel shadow when logging in, ie, no windows are opened.
2. Indicator drop down menus have the panel shadow painted over them.
3. Notification bubbles cause the panel shadow to be drawn on top of everything.
4. Minimizing all windows caused the panel shadow to not be drawn.

== Fix ==
1. Check if the "desktop window" is the top window and draw the panel shadow if it is.
2. In the GetTopVisibleWindow() function also check:
   a. If the window is not minimized.
   b. If the window resName is not empty.
   c. If the window resName is not "unity-panel-service".
   d. If the window resName is not "notify-osd".

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3385
http://jenkins.qa.ubuntu.com/job/unity-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/47
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/47/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/47

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-06-27 10:16:04 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-06-27 16:27:29 +0000
@@ -960,7 +960,11 @@
 
   for (CompWindow *w : screen->windows ())
   {
-    if (w->isViewable())
+    if (w->isViewable() && 
+        !w->minimized() && 
+        !w->resName().empty() && 
+        (w->resName() != "unity-panel-service") &&
+        (w->resName() != "notify-osd"))
     {
       top_visible_window = w;
     }
@@ -2611,12 +2615,22 @@
   {
     Window active_window = screen->activeWindow();
 
+    CompWindow *top_visible_window;
+
     if (G_UNLIKELY(window->type() == CompWindowTypeDesktopMask))
     {
       uScreen->setPanelShadowMatrix(matrix);
 
       if (active_window == 0 || active_window == window->id())
+      {
+        top_visible_window = GetTopVisibleWindow();
+
+        if (top_visible_window && (window->id() == top_visible_window->id()))
+        {
+          draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
+        }
         uScreen->is_desktop_active_ = true;
+      } 
     }
     else
     {
@@ -2641,15 +2655,12 @@
       {
         if (uScreen->is_desktop_active_)
         {
-          CompWindow *top_visible_window = GetTopVisibleWindow();
+          top_visible_window = GetTopVisibleWindow();
 
-          if (top_visible_window)
+          if (top_visible_window && (window->id() == top_visible_window->id()))
           {
-            if (window->id() == top_visible_window->id())
-            {
-              draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
-              uScreen->panelShadowPainted = CompRegion();
-            }
+            draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
+            uScreen->panelShadowPainted = CompRegion();
           }
         }
       }