Merge lp:~azzar1/unity/lp-1133338 into lp:unity

[Andrea Azzarone]

Switcher must focus the last active window in detail mode (using alt+grave too)

== Problem ==
Switcher does not focus the last active window in detail mode (using alt+grave)

== Test ==
Fix a failing AP test. See bug description.

[MC Return (mc-return)]

LGTM.

review: Approve

[Łukasz Zemczak (sil2100)]

Looking good +1

review: Approve

[Łukasz Zemczak (sil2100)]

It's fine for now. I've been wondering though if we shouldn't maybe just handle it better in the switcher controller then, instead of doing it in the plugin. And maybe we should take a look at altTabPrevWindowInitiate() as well.

But this is good as it is anyway!

review: Approve

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-02-18 18:31:45 +0000
+++ launcher/SwitcherController.cpp	2013-02-26 16:29:26 +0000
@@ -139,6 +139,11 @@
   return impl_->GetView();
 }
 
+bool Controller::IsDetailViewShown()
+{
+  return impl_->IsDetailViewShown();
+}
+
 void Controller::SetDetail(bool value, unsigned int min_windows)
 {
   impl_->SetDetail(value, min_windows);
@@ -522,6 +527,11 @@
   return view_;
 }
 
+bool Controller::Impl::IsDetailViewShown()
+{
+  return model_ && model_->detail_selection();
+}
+
 void Controller::Impl::SetDetail(bool value, unsigned int min_windows)
 {
   if (value && model_->DetailXids().size() >= min_windows)

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2013-02-07 17:06:56 +0000
+++ launcher/SwitcherController.h	2013-02-26 16:29:26 +0000
@@ -98,6 +98,7 @@
 
   void Select(int index);
 
+  bool IsDetailViewShown();
   void SetDetail(bool detail,
                  unsigned int min_windows = 1);
 

=== modified file 'launcher/SwitcherControllerImpl.h'
--- launcher/SwitcherControllerImpl.h	2013-02-07 17:06:56 +0000
+++ launcher/SwitcherControllerImpl.h	2013-02-26 16:29:26 +0000
@@ -56,6 +56,7 @@
   void NextDetail();
   void PrevDetail();
 
+  bool IsDetailViewShown();
   void SetDetail(bool detail, unsigned int min_windows = 1);
 
   void SelectFirstItem();

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-02-21 16:43:01 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-02-26 16:29:26 +0000
@@ -2064,10 +2064,14 @@
     switcher_controller_->Select((switcher_controller_->StartIndex())); // always select the current application
     switcher_controller_->InitiateDetail();
   }
-  else
+  else if (switcher_controller_->IsDetailViewShown())
   {
     switcher_controller_->NextDetail();
   }
+  else
+  {
+    switcher_controller_->SetDetail(true);
+  }
 
   action->setState(action->state() | CompAction::StateTermKey);
   return true;