Merge lp:~townsend/unity/fix-dash-page-up-down into lp:unity

[Christopher Townsend]

Enable real page up/page down key navigation in the Dash. When using these keys the view scrolls the length of the visible view.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3955
http://jenkins.qa.ubuntu.com/job/unity-ci/1213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/103

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3956
http://jenkins.qa.ubuntu.com/job/unity-ci/1214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/101
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/104

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

review: Approve (continuous-integration)

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

Code looks fine, but... I'm not that favourable to the usage of a bool signature on those methods.

Couldn't we use something else (ScrollDir probably can't be exported easily, but maybe nux::KeyNavDirection could be fine).

[Christopher Townsend (townsend)]

I would have to add a couple of new KeyNavDirection enum types to handle this and I'm a bit loathe to touch Nux which is why I did it the way I did.

What is the reason why your not in favor of the bool?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3957
http://jenkins.qa.ubuntu.com/job/unity-ci/1215/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/105

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3958
http://jenkins.qa.ubuntu.com/job/unity-ci/1219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/109

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

review: Approve (continuous-integration)

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

+1

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2015-03-20 18:03:15 +0000
+++ dash/DashView.cpp	2015-05-05 13:08:22 +0000
@@ -1576,11 +1576,9 @@
     direction = KEY_NAV_RIGHT;
     break;
   case NUX_VK_LEFT_TAB:
-  case NUX_VK_PAGE_UP:
     direction = KEY_NAV_TAB_PREVIOUS;
     break;
   case NUX_VK_TAB:
-  case NUX_VK_PAGE_DOWN:
     direction = KEY_NAV_TAB_NEXT;
     break;
   case NUX_VK_ENTER:
@@ -1588,6 +1586,14 @@
     // Not sure if Enter should be a navigation key
     direction = KEY_NAV_ENTER;
     break;
+  case NUX_VK_PAGE_UP:
+  case NUX_VK_PAGE_DOWN:
+    if (!preview_displaying_)
+    {
+      active_scope_view_->PerformPageNavigation((x11_key_code == NUX_VK_PAGE_UP) ? ScrollDir::UP : ScrollDir::DOWN);
+      return nux::GetWindowCompositor().GetKeyFocusArea();
+    }
+    break;
   default:
     auto const& close_key = WindowManager::Default().close_window_key();
 

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2014-07-11 22:26:26 +0000
+++ dash/ScopeView.cpp	2015-05-05 13:08:22 +0000
@@ -1007,6 +1007,11 @@
   scroll_view_->ScrollToPosition(nux::Geometry(0, 0, 0, 0));
 }
 
+void ScopeView::PerformPageNavigation(ScrollDir dir)
+{
+  scroll_view_->page_direction.emit(dir);
+}
+
 void ScopeView::ActivateFirst()
 {
   if (!scope_)

=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2015-02-03 09:46:48 +0000
+++ dash/ScopeView.h	2015-05-05 13:08:22 +0000
@@ -37,6 +37,7 @@
 #include "ResultViewGrid.h"
 #include "unity-shared/NuxObjectPtrHash.h"
 #include "unity-shared/UBusWrapper.h"
+#include "unity-shared/PlacesOverlayVScrollBar.h"
 
 namespace unity
 {
@@ -62,6 +63,7 @@
   int GetNumRows();
   void AboutToShow();
   void JumpToTop();
+  void PerformPageNavigation(ScrollDir dir);
 
   virtual void ActivateFirst();
 

=== modified file 'unity-shared/OverlayScrollView.cpp'
--- unity-shared/OverlayScrollView.cpp	2014-07-11 22:57:51 +0000
+++ unity-shared/OverlayScrollView.cpp	2015-05-05 13:08:22 +0000
@@ -50,7 +50,11 @@
   scale.changed.connect([this] (double scale) {
     m_MouseWheelScrollSize = MOUSE_WHEEL_SCROLL_SIZE.CP(scale);
   });
+
+  page_direction.connect([scrollbar] (ScrollDir dir) {
+      scrollbar->PerformPageNavigation(dir);
+  });
 }
 
 } // dash namespace
-} // unity namespace
\ No newline at end of file
+} // unity namespace

=== modified file 'unity-shared/OverlayScrollView.h'
--- unity-shared/OverlayScrollView.h	2014-07-11 22:24:13 +0000
+++ unity-shared/OverlayScrollView.h	2015-05-05 13:08:22 +0000
@@ -21,6 +21,7 @@
 #define _UNITY_SCROLL_VIEW_H_
 
 #include <Nux/Nux.h>
+#include "PlacesOverlayVScrollBar.h"
 
 namespace unity
 {
@@ -33,6 +34,7 @@
   ScrollView(NUX_FILE_LINE_PROTO);
 
   nux::RWProperty<double> scale;
+  sigc::signal<void, ScrollDir> page_direction;
 
   using nux::ScrollView::SetVScrollBar;
 };

=== modified file 'unity-shared/PlacesOverlayVScrollBar.cpp'
--- unity-shared/PlacesOverlayVScrollBar.cpp	2014-07-11 22:43:08 +0000
+++ unity-shared/PlacesOverlayVScrollBar.cpp	2015-05-05 13:08:22 +0000
@@ -121,6 +121,11 @@
   animation_.SetFinishValue(stop);
 }
 
+void PlacesOverlayVScrollBar::PerformPageNavigation(ScrollDir dir)
+{
+  StartScrollAnimation(dir, _slider->GetBaseHeight());
+}
+
 void PlacesOverlayVScrollBar::StartScrollAnimation(ScrollDir dir, int stop)
 {
   if (animation_.CurrentState() == nux::animation::Animation::State::Stopped)

=== modified file 'unity-shared/PlacesOverlayVScrollBar.h'
--- unity-shared/PlacesOverlayVScrollBar.h	2014-07-11 22:43:08 +0000
+++ unity-shared/PlacesOverlayVScrollBar.h	2015-05-05 13:08:22 +0000
@@ -34,22 +34,24 @@
 namespace dash
 {
 
+enum class ScrollDir : unsigned int
+{
+  UP,
+  DOWN,
+};
+
 class PlacesOverlayVScrollBar: public PlacesVScrollBar
 {
 public:
   PlacesOverlayVScrollBar(NUX_FILE_LINE_PROTO);
   virtual ~PlacesOverlayVScrollBar() {}
 
+  void PerformPageNavigation(ScrollDir dir);
+
 protected:
   void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw);
 
 private:
-  enum class ScrollDir : unsigned int
-  {
-    UP,
-    DOWN,
-  };
-
   void OnTrackGeometryChanged(nux::Area* area, nux::Geometry& geo);
   void OnVisibilityChanged(nux::Area* area, bool visible);
   void OnSensitivityChanged(nux::Area* area, bool sensitive);