Merge lp:~nick-dedekind/unity/smart-scopes.scope-bar-tabbing into lp:~unity-team/unity/libunity-7.0-breakage

[Nick Dedekind]

Fixed inconsistent previous lens/scope keybinding behavior for non-visible scopes (command.scope) LP#1158236

Fixed inconsistent previous lens/scope keybinding behavior for non-visible scopes (command.scope) LP#1158236

[Brandon Schaefer (brandontschaefer)]

Cool LGTM and works!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/ScopeBar.cpp'
--- dash/ScopeBar.cpp	2013-03-20 13:14:31 +0000
+++ dash/ScopeBar.cpp	2013-03-22 18:22:20 +0000
@@ -278,13 +278,6 @@
 
 void ScopeBar::ActivateNext()
 {
-  // Special case when switching from the command scope.
-  if (GetActiveScopeId() == "commands.scope")
-  {
-    SetActive(icons_[0]);
-    return;
-  }
-
   bool activate_next = false;
   for (auto it = icons_.begin();
        it < icons_.end();
@@ -300,25 +293,27 @@
     if (icon->active)
       activate_next = true;
   }
-  SetActive(icons_[0]);
 
+  // fallback. select first visible icon.
+  for (auto it = icons_.begin(); it != icons_.end(); ++it)
+  {
+    ScopeBarIcon *icon = *it;
+    if (icon->IsVisible())
+    {
+      SetActive(icon);
+      break;
+    }
+  }
 }
 
 void ScopeBar::ActivatePrevious()
 {
-  // Special case when switching from the command scope.
-  if (GetActiveScopeId() == "commands.scope")
-  {
-    SetActive(icons_.back());
-    return;
-  }
-
   bool activate_previous = false;
-  for (auto it = icons_.rbegin();
-       it < icons_.rend();
-       ++it)
+  for (auto rit = icons_.rbegin();
+       rit < icons_.rend();
+       ++rit)
   {
-    ScopeBarIcon *icon = *it;
+    ScopeBarIcon *icon = *rit;
 
     if (activate_previous && icon->IsVisible())
     {
@@ -328,8 +323,17 @@
     if (icon->active)
       activate_previous = true;
   }
-  SetActive(icons_.back());
 
+  // fallback. select last visible icon.
+  for (auto rit = icons_.rbegin(); rit != icons_.rend(); ++rit)
+  {
+    ScopeBarIcon *icon = *rit;
+    if (icon->IsVisible())
+    {
+      SetActive(icon);
+      break;
+    }
+  }
 }
 
 // Keyboard navigation
@@ -360,15 +364,5 @@
   }
 }
 
-std::string ScopeBar::GetActiveScopeId() const
-{
-  for (auto icon : icons_)
-  {
-    if (icon->active)
-      return icon->id;
-  }
-  return "";
-}
-
 }
 }
 
=== modified file 'dash/ScopeBar.h'
--- dash/ScopeBar.h	2013-02-12 11:45:57 +0000
+++ dash/ScopeBar.h	2013-03-22 18:22:20 +0000
@@ -80,7 +80,6 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
-  std::string GetActiveScopeId() const;
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
 
   ScopeIcons icons_;