Merge lp:~gordallott/unity/fix-wrong-horizontal-see-more-size into lp:unity

[Gord Allott]

Fixes the incorrect item count in See x more results. see lp:934944

Fixes the attached bug, manual test supplied has instructions to test

No automatic test until I can figure out a nice way of doing it,
Feels like we need to run the AP tests with fake lenses to control the dash content
Which is entirely out of scope for this merge

[Alex Launi (alexlauni)]

15 +#. Open the dash, navigate to a lens that uses a horizontal renderer

give an example. don't expect testers to know the code base this well. Say "open the ____ lens"

Secondly. AUTOMATE THIS. This one is super easy to automate. You're just counting!

review: Needs Fixing

[Alex Launi (alexlauni)]

But you're right. Being able to control dash content would be an ace feature. Something that is really needed.

[Gord Allott (gordallott)]

> 15 +#. Open the dash, navigate to a lens that uses a horizontal renderer
>
> give an example. don't expect testers to know the code base this well. Say
> "open the ____ lens"
>
>
> Secondly. AUTOMATE THIS. This one is super easy to automate. You're just
> counting!

The issue really is that i'm not confident that i can say this lens will definately, 100% of the time, have enough content to run the test, which is why i'm saying we need to run our ap tests with fake lenses that provide what we need before I'm really confident enough to automate this

[Mirco Müller (macslow)]

Code look fine, but I can't verify its correct functioning with the described manual-test. With the music lens I always get one item more (in the expanded result-view) than the "see x more" + visible items (collapsed result-view).

review: Needs Fixing

[Mirco Müller (macslow)]

Now the number of items correctly adds up... with the filters being expanded or not. Approved.

review: Approve

[Unity Merger (unity-merger)]

No proposals found for merge of lp:~gordallott/unity/fix-standalone-dash-client-build into lp:unity.

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-03-20 21:25:06 +0000
+++ manual-tests/Dash.txt	2012-03-21 11:20:30 +0000
@@ -13,3 +13,16 @@
   The text previously selected is pasted on the search bar at mouse pointer
   position, if the operation is repeated the text is inserted where
   the mouse pointer is.
+
+
+Dash correct number of "see more" results with horizontal renderer
+---------------------------
+This test ensures a correct number of "see more" results in the dash when using a horizontal renderer
+(see lp:934944)
+
+#. Open the dash, navigate to a lens that uses a horizontal renderer such as the gwibber lens or music lens
+#. Ensure that a category in the results has a "See x more results" label
+#. Expand category that has "See x more results" label
+
+Outcome
+  The category will expand to show all the results, user should ensure that the X in "See x more categories" was valid. 

=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp	2012-03-13 16:19:52 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp	2012-03-21 11:20:30 +0000
@@ -22,6 +22,7 @@
 #include <sigc++/sigc++.h>
 
 #include <Nux/Nux.h>
+#include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
 #include <Nux/BaseWindow.h>
@@ -45,6 +46,12 @@
 #include "UBusMessages.h"
  #include "Introspectable.h"
 
+
+namespace
+{
+nux::logging::Logger logger("unity.dash.placesgroup");
+}
+
 namespace unity
 {
 namespace
@@ -259,13 +266,20 @@
 }
 
 void
-PlacesGroup::SetChildView(nux::View* view)
+PlacesGroup::SetChildView(dash::ResultView* view)
 {
   debug::Introspectable *i = dynamic_cast<debug::Introspectable*>(view);
   if (i)
     AddChild(i);
   _child_view = view;
   _group_layout->AddView(_child_view, 1);
+
+  view->results_per_row.changed.connect([&] (int results_per_row) 
+  {
+    _n_visible_items_in_unexpand_mode = results_per_row;  
+    RefreshLabel();
+  });
+
   QueueDraw();
 }
 
@@ -296,6 +310,7 @@
   }
   else
   {
+    LOG_DEBUG(logger) << _n_total_items << " - " << _n_visible_items_in_unexpand_mode;
     result_string = g_strdup_printf(g_dngettext(GETTEXT_PACKAGE,
                                                 "See one more result",
                                                 "See %d more results",
@@ -440,7 +455,6 @@
 void
 PlacesGroup::SetCounts(guint n_visible_items_in_unexpand_mode, guint n_total_items)
 {
-  _n_visible_items_in_unexpand_mode = n_visible_items_in_unexpand_mode;
   _n_total_items = n_total_items;
 
   Relayout();

=== modified file 'plugins/unityshell/src/PlacesGroup.h'
--- plugins/unityshell/src/PlacesGroup.h	2012-03-13 16:19:52 +0000
+++ plugins/unityshell/src/PlacesGroup.h	2012-03-21 11:20:30 +0000
@@ -32,6 +32,7 @@
 #include "Introspectable.h"
 #include "StaticCairoText.h"
 #include "UBusWrapper.h"
+#include "ResultView.h"
 
 namespace nux
 {
@@ -55,7 +56,7 @@
   nux::StaticCairoText* GetLabel();
   nux::StaticCairoText* GetExpandLabel();
 
-  void SetChildView(nux::View* view);
+  void SetChildView(dash::ResultView* view);
   nux::View* GetChildView();
 
   void SetChildLayout(nux::Layout* layout);

=== modified file 'plugins/unityshell/src/ResultView.h'
--- plugins/unityshell/src/ResultView.h	2012-02-28 01:41:34 +0000
+++ plugins/unityshell/src/ResultView.h	2012-03-21 11:20:30 +0000
@@ -58,6 +58,8 @@
   void SetPreview(PreviewBase* preview, Result& related_result);
 
   nux::Property<bool> expanded;
+  nux::Property<int> results_per_row;
+
   sigc::signal<void, std::string const&> UriActivated;
   sigc::signal<void, std::string const&> ChangePreview; // request a new preview, string is the uri
 

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2012-02-17 16:48:25 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2012-03-21 11:20:30 +0000
@@ -273,6 +273,7 @@
   PositionPreview();
 
   mouse_over_index_ = GetIndexAtPosition(mouse_last_x_, mouse_last_y_);
+  results_per_row = items_per_row;
 }
 
 void ResultViewGrid::PositionPreview()
@@ -611,7 +612,6 @@
   gPainter.PaintBackground(GfxContext, GetGeometry());
 
   int items_per_row = GetItemsPerRow();
-
   uint total_rows = (!expanded) ? 0 : (results_.size() / items_per_row) + 1;
 
   ResultView::ResultList::iterator it;

=== modified file 'standalone-clients/CMakeLists.txt'
--- standalone-clients/CMakeLists.txt	2012-02-24 17:17:14 +0000
+++ standalone-clients/CMakeLists.txt	2012-03-21 11:20:30 +0000
@@ -43,6 +43,8 @@
 #
 add_executable (dash
                 standalone_dash.cpp
+                ${UNITY_SRC}/AbstractPlacesGroup.cpp
+                ${UNITY_SRC}/AbstractPlacesGroup.h
                 ${UNITY_SRC}/BackgroundEffectHelper.cpp
                 ${UNITY_SRC}/BackgroundEffectHelper.h
                 ${UNITY_SRC}/BGHash.cpp
@@ -101,6 +103,8 @@
                 ${UNITY_SRC}/LensBarIcon.h
                 ${UNITY_SRC}/LensView.cpp
                 ${UNITY_SRC}/LensView.h
+                ${UNITY_SRC}/LensViewPrivate.cpp
+                ${UNITY_SRC}/LensViewPrivate.h
                 ${UNITY_SRC}/OverlayRenderer.cpp
                 ${UNITY_SRC}/PreviewApplications.cpp
                 ${UNITY_SRC}/PreviewBase.cpp