Merge lp:~smspillaz/unity/unity.fix_864503 into lp:unity

[Sam Spilsbury]

Mark hidden showdesktop'd windows as "hidden"

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-30 15:55:29 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-10-02 08:25:28 +0000
@@ -773,8 +773,15 @@
   mState = UnityShowdesktopHandler::FadeOut;
   mProgress = 1.0f;
 
-  mRemover->save ();
-  mRemover->remove ();
+  mWasHidden = mWindow->state () & CompWindowStateHiddenMask;
+
+  if (!mWasHidden)
+  {
+    mWindow->changeState (mWindow->state () | CompWindowStateHiddenMask);
+    mWindow->windowNotify (CompWindowNotifyHide);
+    mRemover->save ();
+    mRemover->remove ();
+  }
 
   CompositeWindow::get (mWindow)->addDamage ();
 
@@ -788,7 +795,12 @@
 {
   mState = UnityShowdesktopHandler::FadeIn;
 
-  mRemover->restore ();
+  if (!mWasHidden)
+  {
+    mWindow->changeState (mWindow->state () & ~CompWindowStateHiddenMask);
+    mWindow->windowNotify (CompWindowNotifyShow);
+    mRemover->restore ();
+  }
 
   CompositeWindow::get (mWindow)->addDamage ();
 }
@@ -850,6 +862,20 @@
   }
 }
 
+void UnityShowdesktopHandler::windowNotify (CompWindowNotify n)
+{
+  if (n == CompWindowNotifyFocusChange && mWindow->minimized ())
+  {
+    for (CompWindow *w : animating_windows)
+      w->focusSetEnabled (UnityWindow::get (w), false);
+
+    mWindow->moveInputFocusToOtherWindow ();
+
+    for (CompWindow *w : animating_windows)
+      w->focusSetEnabled (UnityWindow::get (w), true);
+  }
+}
+
 void UnityShowdesktopHandler::updateFrameRegion (CompRegion &r)
 {
   unsigned int oldUpdateFrameRegionIndex;
@@ -1711,6 +1737,10 @@
         boost::dynamic_pointer_cast <minimized_window_handler_unity> (mMinimizeHandler);
     compizMinimizeHandler->windowNotify (n);
   }
+  else if (mShowdesktopHandler)
+  {
+    mShowdesktopHandler->windowNotify (n);
+  }
 
   // We do this after the notify to ensure input focus has actually been moved.
   if (n == CompWindowNotifyFocusChange)

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-09-30 15:55:29 +0000
+++ plugins/unityshell/src/unityshell.h	2011-10-02 08:25:28 +0000
@@ -100,6 +100,7 @@
   void paintAttrib (GLWindowPaintAttrib &attrib);
   unsigned int getPaintMask ();
   void handleEvent (XEvent *);
+  void windowNotify (CompWindowNotify n);
   void updateFrameRegion (CompRegion &r);
 
   UnityShowdesktopHandler::State state ();
@@ -114,6 +115,7 @@
   compiz::WindowInputRemover     *mRemover;
   UnityShowdesktopHandler::State mState;
   float                          mProgress;
+  bool                           mWasHidden;
 };