Merge lp:~robertcarr/unity/tab-lens-navigation into lp:unity

[Robert Carr]

Implement tab and shift tab navigation support to switch between lenses. Depends on https://code.launchpad.net/~robertcarr/nux/nux-keynav-tabprev/+merge/74916 to work.

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2011-09-08 12:43:05 +0000
+++ plugins/unityshell/src/DashView.cpp	2011-09-11 17:02:15 +0000
@@ -820,6 +820,14 @@
 void DashView::AddProperties(GVariantBuilder* builder)
 {}
 
+nux::Area * DashView::KeyNavIteration(nux::KeyNavDirection direction)
+{
+  if (direction == KEY_NAV_TAB_NEXT)
+    lens_bar_->ActivateNext();
+  else if (direction == KEY_NAV_TAB_PREVIOUS)
+    lens_bar_->ActivatePrevious();
+  return this;
+}
 
 }
 }

=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h	2011-09-08 11:23:14 +0000
+++ plugins/unityshell/src/DashView.h	2011-09-11 17:02:15 +0000
@@ -93,6 +93,8 @@
   bool InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character);
   const gchar* GetName();
   void AddProperties(GVariantBuilder* builder);
+  
+  nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
 private:
   UBusManager ubus_manager_;

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2011-09-07 17:03:52 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2011-09-11 17:02:15 +0000
@@ -193,6 +193,10 @@
   {
     Paste();
   }
+  else if (keyval == NUX_VK_TAB || keyval == NUX_VK_LEFT_TAB)
+  {
+    return true;
+  }
   else
   {
     return false;

=== modified file 'plugins/unityshell/src/LensBar.cpp'
--- plugins/unityshell/src/LensBar.cpp	2011-09-07 21:45:10 +0000
+++ plugins/unityshell/src/LensBar.cpp	2011-09-11 17:02:15 +0000
@@ -140,6 +140,49 @@
   lens_activated.emit(activated->id);
 }
 
+void LensBar::ActivateNext()
+{
+  bool activate_next = false; 
+  for (auto it = icons_.begin();
+       it < icons_.end();
+       it++)
+  {
+    LensBarIcon *icon = *it;
+    
+    if (activate_next && icon->IsVisible())
+    {
+      SetActive(icon);
+      return;
+    }
+    if (icon->active)
+      activate_next = true;
+  }
+  SetActive(icons_[0]);
+
+}
+
+void LensBar::ActivatePrevious()
+{
+  bool activate_previous = false;
+  
+  for (auto it = icons_.rbegin();
+       it < icons_.rend();
+       ++it)
+  {
+    LensBarIcon *icon = *it;
+    
+    if (activate_previous && icon->IsVisible())
+    {
+	SetActive(icon);
+	return;
+    }
+    if (icon->active)
+      activate_previous = true;
+  }
+  SetActive(icons_.back());
+  
+}
+
 // Keyboard navigation
 bool LensBar::AcceptKeyNavFocus()
 {

=== modified file 'plugins/unityshell/src/LensBar.h'
--- plugins/unityshell/src/LensBar.h	2011-08-22 17:17:26 +0000
+++ plugins/unityshell/src/LensBar.h	2011-09-11 17:02:15 +0000
@@ -48,6 +48,9 @@
 
   void AddLens(Lens::Ptr& lens);
   void Activate(std::string id);
+  void ActivateNext();
+  void ActivatePrevious();
+
 
   sigc::signal<void, std::string const&> lens_activated;