Merge lp:~nick-dedekind/unity/lp1059607.dash-filter-redraw into lp:unity

[Nick Dedekind]

Fixed dash filter redraw issue (LP: #1059607)

Fixed dash filter redraw issue (LP: #1059607)

Redirected parent redraw check in Lens view.

[Brandon Schaefer (brandontschaefer)]

Normally things should get merged with trunk first, then backported.

Looks good.

review: Approve

=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-09-19 18:45:56 +0000
+++ dash/LensView.cpp	2012-10-02 10:22:22 +0000
@@ -22,6 +22,8 @@
 #include <boost/lexical_cast.hpp>
 
 #include <NuxCore/Logger.h>
+#include <Nux/HScrollBar.h>
+#include <Nux/VScrollBar.h>
 
 #include "unity-shared/DashStyle.h"
 #include "CoverflowResultView.h"
@@ -96,6 +98,14 @@
     up_area_ = area;
   }
 
+  void RedrawScrollbars()
+  {
+    if (m_horizontal_scrollbar_enable)
+     _hscrollbar->QueueDraw();
+    if (m_vertical_scrollbar_enable)
+      _vscrollbar->QueueDraw();
+  }
+
 protected:
 
   // This is so we can break the natural key navigation path.
@@ -662,6 +672,16 @@
   nux::Geometry const& geo = GetGeometry();
 
   gfx_context.PushClippingRectangle(geo);
+
+  if (RedirectedAncestor())
+  {
+    unsigned int alpha = 0, src = 0, dest = 0;
+    gfx_context.GetRenderStates().GetBlend(alpha, src, dest);
+    gfx_context.GetRenderStates().SetBlend(false);
+    gfx_context.QRP_Color(GetX(), GetY(), GetWidth(), GetHeight(), nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
+    gfx_context.GetRenderStates().SetBlend(alpha, src, dest);
+  }
+
   nux::GetPainter().PaintBackground(gfx_context, geo);
   gfx_context.PopClippingRectangle();
 }
@@ -669,6 +689,22 @@
 void LensView::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)
 {
   gfx_context.PushClippingRectangle(GetGeometry());
+
+  // This is necessary when doing redirected rendering.
+  // Clean the area below this view before drawing anything.
+  if (RedirectedAncestor() && !IsFullRedraw())
+  {
+    // scrollbars are drawn in Draw, not DrawContent, so we need to flag them to redraw.
+    scroll_view_->RedrawScrollbars();
+    fscroll_view_->RedrawScrollbars();
+
+    unsigned int alpha = 0, src = 0, dest = 0;
+    gfx_context.GetRenderStates().GetBlend(alpha, src, dest);
+    gfx_context.GetRenderStates().SetBlend(false);
+    gfx_context.QRP_Color(GetX(), GetY(), GetWidth(), GetHeight(), nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
+    gfx_context.GetRenderStates().SetBlend(alpha, src, dest);
+  }
+
   layout_->ProcessDraw(gfx_context, force_draw);
   gfx_context.PopClippingRectangle();
 }