Merge lp:~azzar1/unity/fix-1050959 into lp:unity

[Andrea Azzarone]

== Problem ==
Bug #1050959: Dash - Fix Dash scrollbar so that it does not displace Dash background texture.

== Test ==
Visual change. Not applicable.

Depends on: lp:~andyrock/nux/fix-1050959

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

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

Unmerged revisions

2818. By Andrea Azzarone on 2012-10-11

Use overlay scrollbars in the lens view.

2817. By Andrea Azzarone on 2012-10-09

Cleanup PlacesVScrollBar.cpp

=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-10-08 06:36:17 +0000
+++ dash/LensView.cpp	2012-10-11 14:11:21 +0000
@@ -57,6 +57,7 @@
     , right_area_(nullptr)
     , up_area_(nullptr)
   {
+    SetScrollBarStyle(nux::ScrollBarStyle::OVERLAY);
     SetVScrollBar(scroll_bar);
   }
 

=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2012-10-08 06:36:17 +0000
+++ dash/PlacesGroup.cpp	2012-10-11 14:11:21 +0000
@@ -59,7 +59,7 @@
 const int kCategoryIconSize = 22;
 // Category  highlight
 const int kHighlightHeight = 24;
-const int kHighlightRightPadding = 10 - 3; // -3 because the scrollbar is not a real overlay scrollbar!
+const int kHighlightRightPadding = 10;
 const int kHighlightLeftPadding = 10;
 
 // Font

=== modified file 'unity-shared/PlacesVScrollBar.cpp'
--- unity-shared/PlacesVScrollBar.cpp	2012-09-14 18:28:02 +0000
+++ unity-shared/PlacesVScrollBar.cpp	2012-10-11 14:11:21 +0000
@@ -51,60 +51,63 @@
     _slider_texture->UnReference();
 }
 
-void
-PlacesVScrollBar::PreLayoutManagement()
-{
-  nux::VScrollBar::PreLayoutManagement();
-}
-
 long
 PlacesVScrollBar::PostLayoutManagement(long LayoutResult)
 {
   long ret = nux::VScrollBar::PostLayoutManagement(LayoutResult);
 
-  UpdateTexture();
+  nux::Geometry const& geo = _slider->GetGeometry();
+
+  if (_cached_geometry.GetWidth() != geo.GetWidth() ||
+      _cached_geometry.GetHeight() != geo.GetHeight())
+  {
+    UpdateTexture();
+    _cached_geometry = geo;
+  }
+
   return ret;
 }
 
 void
 PlacesVScrollBar::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
-  nux::Color color = nux::color::White;
+  // check if textures have been computed... if they haven't, exit function
+  if (!_slider_texture)
+    return;
+
   nux::Geometry const& base  = GetGeometry();
-  nux::TexCoordXForm texxform;
-
   graphics_engine.PushClippingRectangle(base);
+
   unsigned int alpha = 0, src = 0, dest = 0;
   graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
 
-  if(RedirectedAncestor())
-  {
-    // This is necessary when doing redirected rendering.
-    // Clean the area below this view before drawing anything.
-    graphics_engine.GetRenderStates().SetBlend(false);
-    graphics_engine.QRP_Color(GetX(), GetY(), GetWidth(), GetHeight(), nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
-  }
-
-  // check if textures have been computed... if they haven't, exit function
-  if (!_slider_texture)
-    return;
-
-  texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_SCALE_COORD);
-
-  graphics_engine.GetRenderStates().SetBlend(true);
-  graphics_engine.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
-
   if (content_height_ > container_height_)
   {
+    if(RedirectedAncestor())
+    {
+      // This is necessary when doing redirected rendering.
+      // Clean the area below this view before drawing anything.
+      nux::Geometry const& slider_geo = _slider->GetGeometry();
+
+      graphics_engine.GetRenderStates().SetBlend(false);
+      graphics_engine.QRP_Color(slider_geo.x, slider_geo.y,
+                                slider_geo.width, slider_geo.height,
+                                nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
+    }
+  
+    nux::TexCoordXForm texxform;
+    texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_SCALE_COORD);
+
+    graphics_engine.GetRenderStates().SetBlend(true);
+    graphics_engine.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+
     nux::Geometry const& slider_geo = _slider->GetGeometry();
+    nux::Color color = nux::color::White;
 
-    graphics_engine.QRP_1Tex(slider_geo.x,
-                        slider_geo.y,
-                        slider_geo.width,
-                        slider_geo.height,
-                        _slider_texture->GetDeviceTexture(),
-                        texxform,
-                        color);
+    graphics_engine.QRP_1Tex(slider_geo.x, slider_geo.y,
+                             slider_geo.width, slider_geo.height,
+                             _slider_texture->GetDeviceTexture(),
+                             texxform, color);
   }
 
   graphics_engine.PopClippingRectangle();

=== modified file 'unity-shared/PlacesVScrollBar.h'
--- unity-shared/PlacesVScrollBar.h	2012-07-20 13:28:26 +0000
+++ unity-shared/PlacesVScrollBar.h	2012-10-11 14:11:21 +0000
@@ -39,17 +39,16 @@
   ~PlacesVScrollBar();
 
 protected:
-  virtual void PreLayoutManagement();
   virtual long PostLayoutManagement(long LayoutResult);
 
-  void Draw(nux::GraphicsEngine& gfxContext,
-            bool                 forceDraw);
+  void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
 
 private:
   void UpdateTexture();
 
 private:
   nux::BaseTexture* _slider_texture;
+  nux::Geometry _cached_geometry;
 };
 
 } // namespace dash