Merge lp:~gordallott/unity/fix-results-keynav-scrolling into lp:unity

[Gord Allott]

So nux doesn't really support model views very well so this is a hack to get scrolling
on keynav working again, we'll fix it in a nicer way for P but yeah

[Neil J. Patel (njpatel)]

Makes sense for now, approved. Nice workaround :)

review: Approve

=== modified file 'plugins/unityshell/src/LensView.cpp'
--- plugins/unityshell/src/LensView.cpp	2011-09-07 20:04:18 +0000
+++ plugins/unityshell/src/LensView.cpp	2011-09-27 14:22:23 +0000
@@ -26,6 +26,7 @@
 #include "ResultRendererTile.h"
 #include "ResultRendererHorizontalTile.h"
 #include "UBusMessages.h"
+#include "UBusWrapper.h"
 
 namespace unity
 {
@@ -37,6 +38,45 @@
 nux::logging::Logger logger("unity.dash.lensview");
 }
 
+  // this is so we can access some protected members in scrollview
+class LensScrollView: public nux::ScrollView
+{
+public:
+  LensScrollView(NUX_FILE_LINE_DECL)
+    : nux::ScrollView(NUX_FILE_LINE_PARAM)
+  {
+
+  }
+
+  void ScrollToPosition(nux::Geometry & position)
+  {
+    // much of this code is copied from Nux/ScrollView.cpp
+    int child_y = position.y - GetGeometry ().y;
+    int child_y_diff = child_y - abs (_delta_y);
+
+    if (child_y_diff + position.height < GetGeometry ().height && child_y_diff >= 0)
+    {
+      return;
+    }
+
+    if (child_y_diff < 0)
+    {
+      ScrollUp (1, abs (child_y_diff));
+    }
+    else
+    {
+      int size = child_y_diff - GetGeometry ().height;
+
+      // always keeps the top of a view on the screen
+      size += position.height;
+
+      ScrollDown (1, size);
+    }
+  }
+
+};
+
+
 NUX_IMPLEMENT_OBJECT_TYPE(LensView);
 
 LensView::LensView()
@@ -59,12 +99,37 @@
   SetupResults();
   SetupFilters();
 
- PlacesStyle::GetDefault()->columns_changed.connect(sigc::mem_fun(this, &LensView::OnColumnsChanged));
+  PlacesStyle::GetDefault()->columns_changed.connect(sigc::mem_fun(this, &LensView::OnColumnsChanged));
 
   lens_->connected.changed.connect([&](bool is_connected) { if (is_connected) initial_activation_ = true; });
   search_string.changed.connect([&](std::string const& search) { lens_->Search(search);  });
   filters_expanded.changed.connect([&](bool expanded) { fscroll_view_->SetVisible(expanded); QueueRelayout(); OnColumnsChanged(); });
   active.changed.connect(sigc::mem_fun(this, &LensView::OnActiveChanged));
+
+  ubus_.RegisterInterest(UBUS_RESULT_VIEW_KEYNAV_CHANGED, [this] (GVariant* data) {
+    // we get this signal when a result view keynav changes,
+    // its a bad way of doing this but nux ABI needs to be broken
+    // to do it properly
+    nux::Geometry focused_pos;
+    g_variant_get (data, "(iiii)", &focused_pos.x, &focused_pos.y, &focused_pos.width, &focused_pos.height);
+
+    for (auto it = categories_.begin(); it != categories_.end(); it++)
+    {
+      if ((*it)->GetLayout() != nullptr)
+      {
+        nux::View *child = (*it)->GetChildView();
+        if (child->HasKeyFocus())
+        {
+          focused_pos.x += child->GetGeometry().x;
+          focused_pos.y += child->GetGeometry().y - 30;
+          focused_pos.height += 30;
+          static_cast<LensScrollView *>(scroll_view_)->ScrollToPosition(focused_pos);
+          break;
+        }
+      }
+    }
+  });
+
 }
 
 LensView::~LensView()
@@ -77,7 +142,7 @@
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  scroll_view_ = new nux::ScrollView(NUX_TRACKER_LOCATION);
+  scroll_view_ = new LensScrollView(NUX_TRACKER_LOCATION);
   scroll_view_->EnableVerticalScrollBar(true);
   scroll_view_->EnableHorizontalScrollBar(false);
   layout_->AddView(scroll_view_);

=== modified file 'plugins/unityshell/src/LensView.h'
--- plugins/unityshell/src/LensView.h	2011-08-25 10:18:58 +0000
+++ plugins/unityshell/src/LensView.h	2011-09-27 14:22:23 +0000
@@ -51,7 +51,7 @@
   virtual ~LensView();
 
   Lens::Ptr lens() const;
-  
+
   virtual void ActivateFirst();
 
   nux::Property<std::string> search_string;
@@ -82,7 +82,7 @@
   virtual long ProcessEvent(nux::IEvent& ievent, long traverse_info, long event_info);
   virtual void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw);
-  
+
   virtual bool AcceptKeyNavFocus();
   virtual const gchar* GetName();
   virtual void AddProperties(GVariantBuilder* builder);
@@ -102,6 +102,8 @@
   FilterBar* filter_bar_;
 
   guint fix_renderering_id_;
+
+  UBusManager ubus_;
 };
 
 

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2011-09-26 10:41:01 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2011-09-27 14:22:23 +0000
@@ -467,6 +467,13 @@
   selected_index_ = std::max(0, selected_index_);
   selected_index_ = std::min(static_cast<int>(results_.size() - 1), selected_index_);
   focused_uri_ = results_[selected_index_].uri;
+
+  int focused_x = (renderer_->width + horizontal_spacing) * (selected_index_ % items_per_row);
+  int focused_y = (renderer_->height + vertical_spacing) * (selected_index_ / items_per_row);
+
+  ubus_.SendMessage(UBUS_RESULT_VIEW_KEYNAV_CHANGED,
+                    g_variant_new("(iiii)", focused_x, focused_y, renderer_->width(), renderer_->height()));
+
   NeedRedraw();
 }
 
@@ -484,6 +491,13 @@
     focused_uri_ = results_.front().uri;
     selected_index_ = 0;
     NeedRedraw();
+
+    int items_per_row = GetItemsPerRow();
+    int focused_x = (renderer_->width + horizontal_spacing) * (selected_index_ % items_per_row);
+    int focused_y = (renderer_->height + vertical_spacing) * (selected_index_ / items_per_row);
+
+    ubus_.SendMessage(UBUS_RESULT_VIEW_KEYNAV_CHANGED,
+                      g_variant_new("(iiii)", focused_x, focused_y, renderer_->width(), renderer_->height()));
   }
   else
   {

=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2011-09-22 09:46:55 +0000
+++ plugins/unityshell/src/UBusMessages.h	2011-09-27 14:22:23 +0000
@@ -68,5 +68,7 @@
 #define UBUS_BACKGROUND_REQUEST_COLOUR_EMIT "REQUEST_BACKGROUND_COLOUR_EMIT"
 
 #define UBUS_DASH_SIZE_CHANGED "DASH_SIZE_CHANGED"
+// FIXME - fix the nux focus api so we don't need this
+#define UBUS_RESULT_VIEW_KEYNAV_CHANGED "RESULT_VIEW_KEYNAV_CHANGED"
 
 #endif // UBUS_MESSAGES_H