Merge lp:~azzar1/unity/lp-1055126 into lp:unity

[Andrea Azzarone]

Don't force edge drawing in DashView. Fixes bug 1055126 here.

== Problem ==
Bug #1055126: dash preview animation is slow on high resolution screens (also fullscreen mode).

== Fix ==
Maybe there is a problem with (partially) offscreen texture (I need to investigate better), btw there is no need to force edge drawing in DashView.

== Test ==
N/A.

[Brandon Schaefer (brandontschaefer)]

Awesome, just a note there are some bluring problems still and possible loading problems at the start that makes it slow. After the lenses have loaded things are faaast :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-10 18:26:42 +0000
+++ dash/DashView.cpp	2013-04-12 16:20:39 +0000
@@ -692,7 +692,7 @@
   renderer_geo.y += panel_style.panel_height;
   renderer_geo.height += panel_style.panel_height;
 
-  renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, true);
+  renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, false);
 }
 
 void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)

=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2013-04-09 01:12:21 +0000
+++ unity-shared/OverlayRenderer.cpp	2013-04-12 16:20:39 +0000
@@ -800,13 +800,15 @@
                              texxform,
                              nux::color::White);
       }
-
-      gfx_context.GetRenderStates().SetBlend(false);
     }
     
     gfx_context.PopClippingRectangle();
   }
 
+  gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
+  gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
+  gfx_context.GetRenderStates().SetBlend(false);
+
 }
 
 void OverlayRendererImpl::DrawContent(nux::GraphicsEngine& gfx_context, nux::Geometry const& content_geo, nux::Geometry const& absolute_geo, nux::Geometry const& geometry)