Merge lp:~brandontschaefer/unity/overlay-scrollbar-filter-results-fix into lp:~unity-team/unity/libunity-7.0-breakage

[Brandon Schaefer]

The FilterResults was using the PlacesVScrollbar which doesn't have the Overlayscroll bar. So just change it to use PlacesOverlayVScrollbar.

The FilterResults was using the PlacesVScrollbar which doesn't have the Overlayscroll bar. So just change it to use PlacesOverlayVScrollbar.

[Nick Dedekind (nick-dedekind)]

I've seen the bug.
LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2013-03-20 11:25:53 +0000
+++ dash/ScopeView.cpp	2013-03-22 17:58:19 +0000
@@ -32,7 +32,6 @@
 #include "ResultRendererHorizontalTile.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/PlacesVScrollBar.h"
 #include "unity-shared/PlacesOverlayVScrollBar.h"
 #include "unity-shared/GraphicsUtils.h"
 
@@ -260,7 +259,7 @@
   no_results_->SetVisible(false);
   scroll_layout_->AddView(no_results_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
-  fscroll_view_ = new ScopeScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION), NUX_TRACKER_LOCATION);
+  fscroll_view_ = new ScopeScrollView(new PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION), NUX_TRACKER_LOCATION);
   fscroll_view_->EnableVerticalScrollBar(true);
   fscroll_view_->EnableHorizontalScrollBar(false);
   fscroll_view_->SetVisible(false);