Merge lp:~townsend/unity/fix-dash-no-expand-category into lp:unity

[Christopher Townsend]

When using keyboard navigation in the Dash, skip category headers that are not expandable. Also, do not highlight the category header when the mouse cursor is over it.

Note: I ran the unity.tests.test_dash Autopilot tests against this branch with no failures.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3955
http://jenkins.qa.ubuntu.com/job/unity-ci/1220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/110

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1220/rebuild

review: Approve (continuous-integration)

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

Mh so now using tab on dash results, if the header is not expandable, then the tab highlights the first item on that category... Is this something expected?

I like it (I was worried this was causing the focus to jump to the next selectable category), but just to be sure...

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3956
http://jenkins.qa.ubuntu.com/job/unity-ci/1224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/114

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1224/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2015-03-20 18:03:15 +0000
+++ dash/DashView.cpp	2015-05-08 13:49:57 +0000
@@ -1546,6 +1546,32 @@
     ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
+nux::Area* DashView::SkipUnexpandableHeaderKeyNav()
+{
+  PlacesGroup::Ptr prev_view;
+  auto category_views = active_scope_view_->GetOrderedCategoryViews();
+
+  for (auto category : category_views)
+  {
+    if (category->GetLayout() != nullptr)
+    {
+      auto header = category->GetHeaderFocusableView();
+      if (header && header->HasKeyFocus() && !category->IsExpandable())
+      {
+        if (prev_view)
+          return prev_view->GetChildView();
+        else
+          return search_bar_->text_entry();
+      }
+
+      if (category->IsVisible())
+        prev_view = category;
+    }
+  }
+
+  return nullptr;
+}
+
 nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
                                       unsigned long x11_key_code,
                                       unsigned long special_keys_state)
@@ -1691,6 +1717,14 @@
     }
   }
 
+  if (direction == KEY_NAV_UP)
+  {
+    if (auto skip_view = SkipUnexpandableHeaderKeyNav())
+    {
+      return skip_view;
+    }
+  }
+
   bool search_key = false;
 
   if (direction == KEY_NAV_NONE)

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2015-02-03 09:46:48 +0000
+++ dash/DashView.h	2015-05-08 13:49:57 +0000
@@ -137,6 +137,8 @@
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
+  nux::Area* SkipUnexpandableHeaderKeyNav();
+
   UBusManager ubus_manager_;
   Scopes::Ptr scopes_;
   ScopeViews scope_views_;

=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2014-07-10 16:39:12 +0000
+++ dash/PlacesGroup.cpp	2015-05-08 13:49:57 +0000
@@ -212,7 +212,12 @@
     if(direction == nux::KEY_NAV_UP)
       nux::GetWindowCompositor().SetKeyFocusArea(_child_view, direction);
     else
-      nux::GetWindowCompositor().SetKeyFocusArea(GetHeaderFocusableView(), direction);
+    {
+      if (IsExpandable())
+        nux::GetWindowCompositor().SetKeyFocusArea(GetHeaderFocusableView(), direction);
+      else
+        nux::GetWindowCompositor().SetKeyFocusArea(_child_view, direction);
+    }
   });
 
   UpdatePlacesGroupSize();
@@ -567,6 +572,12 @@
 }
 
 bool
+PlacesGroup::IsExpandable() const
+{
+  return (_n_visible_items_in_unexpand_mode < _n_total_items);
+}
+
+bool
 PlacesGroup::GetExpanded() const
 {
   return _is_expanded;
@@ -649,7 +660,7 @@
 
 bool PlacesGroup::ShouldBeHighlighted() const
 {
-  return HeaderHasKeyFocus();
+  return (HeaderHasKeyFocus() && IsExpandable());
 }
 
 void PlacesGroup::SetResultsPreviewAnimationValue(float preview_animation)

=== modified file 'dash/PlacesGroup.h'
--- dash/PlacesGroup.h	2014-03-20 04:05:39 +0000
+++ dash/PlacesGroup.h	2015-05-08 13:49:57 +0000
@@ -77,6 +77,7 @@
 
   void SetCounts(unsigned n_total_items);
 
+  virtual bool IsExpandable() const;
   virtual void SetExpanded(bool is_expanded);
   virtual bool GetExpanded() const;