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

[Christopher Townsend]

Fix yet another regression in revno. 3381 where the Panel shadow is not drawn when in Show Desktop mode by using PluginAdapter::IsWindowOnTop() instead of the new GetTopVisibleWindow(). Remove GetTopVisibleWindow() to get rid of code duplication.

= Issue =
Yet another regression from the work done in rev. 3381 has been found where the Panel shadow is not drawn when in Show Desktop mode.

= Fix =
Use PluginAdapter::IsWindowOnTop() instead of the GetTopVisibleWindow() I wrote for the original bug. Removed GetTopVisibleWindow() for get rid of code duplication.

= Test =
Visual only, so a manual test is needed. Enter Show Desktop by any of the means available and observe that the Panel shadow is now drawn.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3432
http://jenkins.qa.ubuntu.com/job/unity-ci/269/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/157

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

review: Approve (continuous-integration)

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

Looks fine... Looking at the branch merged on 3381, you added a function to get top window... That's fine, Just one thing wasn't PluginAdapter::GetTopMostValidWindowInViewport good for that case?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3433
http://jenkins.qa.ubuntu.com/job/unity-ci/278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/166

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3434
http://jenkins.qa.ubuntu.com/job/unity-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/167

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

I can't reproduce the bug. Do I need something special?

[Christopher Townsend (townsend)]

@andyrock

The way I reproduce this is to have some windows open and then Super-Ctrl-D and observe that the Panel shadow is not there. I just confirmed this still happens on my updated Saucy machine.

[Brandon Schaefer (brandontschaefer)]

While im not able to reproduce the bug, this is a great clean up as is anyway. LGTM

review: Approve

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/202/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/158
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/158/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/158

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-07-19 17:37:10 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-07-26 15:02:27 +0000
@@ -969,25 +969,6 @@
   return false;
 }
 
-CompWindow * GetTopVisibleWindow()
-{
-  CompWindow *top_visible_window = NULL;
-
-  for (CompWindow *w : screen->windows ())
-  {
-    if (w->isViewable() && 
-        !w->minimized() && 
-        !w->resName().empty() && 
-        (w->resName() != "unity-panel-service") &&
-        (w->resName() != "notify-osd"))
-    {
-      top_visible_window = w;
-    }
-  }
-
-  return top_visible_window;
-}
-  
 void UnityWindow::enterShowDesktop ()
 {
   if (!mShowdesktopHandler)
@@ -2632,17 +2613,13 @@
   {
     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()))
+        if (PluginAdapter::Default().IsWindowOnTop(window->id()))
         {
           draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
         }
@@ -2672,9 +2649,7 @@
       {
         if (uScreen->is_desktop_active_)
         {
-          top_visible_window = GetTopVisibleWindow();
-
-          if (top_visible_window && (window->id() == top_visible_window->id()))
+          if (PluginAdapter::Default().IsWindowOnTop(window->id()))
           {
             draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
             uScreen->panelShadowPainted = CompRegion();

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2013-07-19 17:37:10 +0000
+++ plugins/unityshell/src/unityshell.h	2013-07-26 15:02:27 +0000
@@ -250,8 +250,6 @@
 
   void UpdateCloseWindowKey(CompAction::KeyBinding const&);
 
-  CompWindow * GetTopVisibleWindow();
-
   std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;