Merge lp:~hikiko/unity/unity.1281925 into lp:unity

[Eleni Maria Stea]

fixes bug: #1281925

fixes bug: #1281925

[Eleni Maria Stea (hikiko)]

@John:
From bug #1281925 description:
"it would be nice if the first item in the Dash would be visually highlighted somehow, to make clear that pressing Enter will activate it right from the search field."

I'd just like you to confirm that the branch is ok from a design perspective. Here's a video of the dash after the change: https://www.youtube.com/watch?v=yzfkaLdJKVM

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3690
http://jenkins.qa.ubuntu.com/job/unity-ci/777/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/311

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

review: Approve (continuous-integration)

[John Lea (johnlea)]

@hikiko; thanks for looking into this!

At 0:58 in the attached youtube video there is a brief moment when both the category header and the first search result are both highlighted at the same time. We have an issue in that there should only every be one item highlighted at any one time. When we looked at this issue before we couldn't find a clean way around this issue and that is why the first search result is not currently highlighted by default.

If the first search result is highlighted by default, obvious solution to this problem (when the user presses the down arrow, the highlight moves up) would be confusing because the focus would be going the the opposite direction from the key press. Jumping the first category header would also be inconsistent.

See if you can find a clean solution around the problem given that A) there can only be one focused item at any one time B) when the user presses the down arrow for the first time they expect the focus to go one step downwards from the text entry box they were typing in. The current implementation in 13.10 is the best solution we could find to this problem, but there may be a better solution and we are open to suggestions.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3691
http://jenkins.qa.ubuntu.com/job/unity-ci/778/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/312

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

review: Approve (continuous-integration)

[Eleni Maria Stea (hikiko)]

I see... Thanks for the review :) I'll ping you if I come up with any fresh ideas...

Unmerged revisions

3691. By Eleni Maria Stea on 2014-03-10

removed empty line, commented out NeedRedraw (avoid delay during the 1st
    search, convenience with lambdas in the constructor)

3690. By Eleni Maria Stea on 2014-03-07

fixed :)

3689. By Eleni Maria Stea on 2014-03-07

quick backup

3688. By Eleni Maria Stea on 2014-02-28

works sometimes

3687. By Eleni Maria Stea on 2014-02-27

fixing 1281925 in progress

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-03-05 14:18:31 +0000
+++ dash/DashView.cpp	2014-03-10 09:39:59 +0000
@@ -1192,6 +1192,8 @@
   if (scope_pos == scope_views_.end() || scope_pos->second != active_scope_view_)
     return;
 
+  active_scope_view_->SelectFirstResultOfFirstScope();
+
   if (search_string == search_bar_->search_string)
   {
     if (err)

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-11-19 18:48:35 +0000
+++ dash/ResultViewGrid.cpp	2014-03-10 09:39:59 +0000
@@ -307,6 +307,13 @@
   rows = result_model_ ? ceil(static_cast<double>(result_model_->count()) / static_cast<double>(std::max<int>(1, columns))) : 0.0;
 }
 
+void ResultViewGrid::SelectFirst()
+{
+    focused_result_ = (*GetIteratorAtRow(0));
+    selected_index_ = 0;
+    NeedRedraw();
+}
+
 void ResultViewGrid::SetModelRenderer(ResultRenderer* renderer)
 {
   ResultView::SetModelRenderer(renderer);

=== modified file 'dash/ResultViewGrid.h'
--- dash/ResultViewGrid.h	2013-09-24 20:18:42 +0000
+++ dash/ResultViewGrid.h	2014-03-10 09:39:59 +0000
@@ -60,6 +60,8 @@
 
   virtual void GetResultDimensions(int& rows, int& columns);
 
+  void SelectFirst();
+
 protected:
   void MouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
   void MouseClick(int x, int y, unsigned long button_flags, unsigned long key_flags);

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2013-11-19 18:48:35 +0000
+++ dash/ScopeView.cpp	2014-03-10 09:39:59 +0000
@@ -1101,6 +1101,20 @@
     result_view->RenderResultTexture(result_texture);
 }
 
+void ScopeView::SelectFirstResultOfFirstScope()
+{
+  if (!scope_)
+    return;
+
+  Results::Ptr results = scope_->results;
+  if (results->count())
+  {
+    PlacesGroup::Ptr group = category_views_[(unsigned int)*category_order_.begin()];
+    ResultViewGrid* result_view = static_cast<ResultViewGrid*>(group->GetChildView());
+    result_view->SelectFirst();
+  }
+}
+
 void ScopeView::PushFilterExpansion(bool expand)
 {
   filter_expansion_pushed_ = filters_expanded;

=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2013-09-19 16:44:03 +0000
+++ dash/ScopeView.h	2014-03-10 09:39:59 +0000
@@ -86,6 +86,8 @@
   std::vector<ResultViewTexture::Ptr> GetResultTextureContainers();
   void RenderResultTexture(ResultViewTexture::Ptr const& result_texture);
 
+  void SelectFirstResultOfFirstScope();
+
 private:
   void SetupViews(nux::Area* show_filters);
   void SetupCategories(Categories::Ptr const& categories);