Merge lp:~azzar1/unity/fix-scale-activation-show-desktop into lp:unity

[Andrea Azzarone]

Fix scale window activation if in show desktop mode.

Fix scale window activation if in show desktop mode.

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

+1

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-05-17 02:56:14 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-05-31 11:54:24 +0000
@@ -221,6 +221,7 @@
   , key_nav_mode_requested_(false)
   , big_tick_(0)
   , back_buffer_age_(0)
+  , next_active_window_(0)
 {
   Timer timer;
 #ifndef USE_GLES
@@ -1214,6 +1215,8 @@
 
 void UnityWindow::activate ()
 {
+  uScreen->SetNextActiveWindow(window->id());
+
   ShowdesktopHandler::InhibitLeaveShowdesktopMode (window->id ());
   window->activate ();
   ShowdesktopHandler::AllowLeaveShowdesktopMode (window->id ());
@@ -4245,6 +4248,16 @@
   });
 }
 
+Window UnityScreen::GetNextActiveWindow() const
+{
+  return next_active_window_;
+}
+
+void UnityScreen::SetNextActiveWindow(Window next_active_window)
+{
+  next_active_window_ = next_active_window;
+}
+
 /* Window init */
 
 namespace
@@ -4604,7 +4617,7 @@
 
   if (IsInShowdesktopMode())
   {
-    if (!(screen->activeWindow() == window->id()))
+    if (uScreen->GetNextActiveWindow() != window->id())
     {
       if (!mShowdesktopHandler)
         mShowdesktopHandler.reset(new ShowdesktopHandler(static_cast <ShowdesktopHandlerWindowInterface *>(this),

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2016-05-10 23:03:20 +0000
+++ plugins/unityshell/src/unityshell.h	2016-05-31 11:54:24 +0000
@@ -298,6 +298,9 @@
   void SpreadAppWindows(bool anywhere);
   bool queryForShader();
 
+  Window GetNextActiveWindow() const;
+  void SetNextActiveWindow(Window next_active_window);
+
   /* We store these  to avoid unecessary calls to ::get */
   CompScreen* screen;
   CompositeScreen* cScreen;
@@ -413,6 +416,8 @@
   uint64_t big_tick_;
   unsigned int back_buffer_age_;
 
+  Window next_active_window_;
+
   friend class UnityWindow;
   friend class debug::ScreenIntrospection;
   friend class decoration::Manager;