Merge lp:~nick-dedekind/unity/lp1039462.preview-track-scrolling into lp:unity

[Nick Dedekind]

Fixed no vertical scrollbar in music preview tracks view. (LP#1039462)

Fixed no vertical scrollbar in music preview tracks view. (LP#1039462)

- Removed drawing override for Tracks view.

[Brandon Schaefer (brandontschaefer)]

Confirmed fix, and code changes look good. +1

review: Approve

=== modified file 'dash/previews/Tracks.cpp'
--- dash/previews/Tracks.cpp	2012-08-20 14:21:31 +0000
+++ dash/previews/Tracks.cpp	2012-08-22 12:19:12 +0000
@@ -81,6 +81,7 @@
 void Tracks::SetupViews()
 {
   SetVScrollBar(new dash::PlacesVScrollBar(NUX_TRACKER_LOCATION));
+  EnableHorizontalScrollBar(false);
   layout_ = new nux::VLayout();
   layout_->SetPadding(0, previews::Style::Instance().GetDetailsRightMargin(), 0, 0);
   layout_->SetSpaceBetweenChildren(1);
@@ -131,27 +132,6 @@
   layout_->RemoveChildObject(pos->second.GetPointer());
 }
 
-void Tracks::Draw(nux::GraphicsEngine& gfx_engine, bool force_draw)
-{
-  nux::Geometry const& base = GetGeometry();
-
-  gfx_engine.PushClippingRectangle(base);
-  nux::GetPainter().PaintBackground(gfx_engine, base);
-
-  gfx_engine.PopClippingRectangle();
-}
-
-void Tracks::DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw)
-{
-  nux::Geometry const& base = GetGeometry();
-  gfx_engine.PushClippingRectangle(base);
-
-  if (GetCompositionLayout())
-    GetCompositionLayout()->ProcessDraw(gfx_engine, force_draw);
-
-  gfx_engine.PopClippingRectangle();
-}
-
 } // namespace previews
 } // namespace dash
 } // namespace unity

=== modified file 'dash/previews/Tracks.h'
--- dash/previews/Tracks.h	2012-08-22 10:03:52 +0000
+++ dash/previews/Tracks.h	2012-08-22 12:19:12 +0000
@@ -60,9 +60,6 @@
   sigc::signal<void, std::string const&> pause;
 
 protected:
-  virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
-  virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
- 
   virtual bool AcceptKeyNavFocus() { return false; }
 
   void SetupViews();