Merge lp:~gerboland/unity/add-option-to-fix-alt-tab into lp:unity

[Gerry Boland]

Add option to have Switcher strictly between applications, and not select the previously focused window as first selection (even if that window part of the same application)

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

Ok, looks good.
Thanks ;)

review: Approve

[Gerry Boland (gerboland)]

Hmm, it not working right. /me shouldn't code in bed.

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2014-03-26 03:09:23 +0000
+++ launcher/SwitcherController.cpp	2015-02-04 08:32:35 +0000
@@ -717,6 +717,12 @@
     return;
   }
 
+  if (model_->switch_strictly_between_applications)
+  {
+    model_->Select(second);
+    return;
+  }
+
   uint64_t first_highest = 0;
   uint64_t first_second = 0; // first icons second highest active
   uint64_t second_first = 0; // second icons first highest active
 
=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2014-01-03 18:06:23 +0000
+++ launcher/SwitcherModel.cpp	2015-02-04 08:32:35 +0000
@@ -34,6 +34,7 @@
   : detail_selection(false)
   , detail_selection_index(0)
   , only_detail_on_viewport(false)
+  , switch_strictly_between_applications(false)
   , applications_(icons)
   , index_(0)
   , last_index_(0)
@@ -78,6 +79,7 @@
   .add("detail-current-count", DetailXids().size())
   .add("detail-windows", glib::Variant::FromVector(DetailXids()))
   .add("only-detail-on-viewport", only_detail_on_viewport)
+  .add("switch_strictly_between_applications", switch_strictly_between_applications)
   .add("selection-index", SelectionIndex())
   .add("last-selection-index", LastSelectionIndex());
 }
 
=== modified file 'launcher/SwitcherModel.h'
--- launcher/SwitcherModel.h	2013-09-19 16:44:03 +0000
+++ launcher/SwitcherModel.h	2015-02-04 08:32:35 +0000
@@ -60,6 +60,7 @@
   nux::Property<bool>         detail_selection;
   nux::Property<unsigned int> detail_selection_index;
   nux::Property<bool>         only_detail_on_viewport;
+  nux::Property<bool>         switch_strictly_between_applications;
 
   SwitcherModel(std::vector<launcher::AbstractLauncherIcon::Ptr> const& icons);
   virtual ~SwitcherModel();
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2014-04-07 03:21:46 +0000
+++ plugins/unityshell/unityshell.xml.in	2015-02-04 08:32:35 +0000
@@ -565,6 +565,12 @@
                     <passive_grab>false</passive_grab>
                 </option>
 
+                <option name="switch_strictly_between_applications" type="bool">
+                    <_short>Switcher strictly changes between applications</_short>
+                    <_long>Disables the last focused window being the first entry in the Switcher, so Switcher strictly switches between applications</_long>
+                    <default>false</default>
+                </option>
+
                 <option name="show_minimized_windows" type="bool">
                     <_short>Show live previews of windows in the Switcher</_short>
                     <_long>Enables miniature live window previews in the Switcher.</_long>