Unity

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

  1. lp-1055126
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3298
Proposed branch: lp:~azzar1/unity/lp-1055126
Merge into: lp:unity
Diff against target: 34 lines (+5/-3)
2 files modified
dash/DashView.cpp (+1/-1)
unity-shared/OverlayRenderer.cpp (+4/-2)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1055126
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+158667@code.launchpad.net

Commit message

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

Description of the change

== 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.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

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
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
692 renderer_geo.y += panel_style.panel_height;692 renderer_geo.y += panel_style.panel_height;
693 renderer_geo.height += panel_style.panel_height;693 renderer_geo.height += panel_style.panel_height;
694694
695 renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, true);695 renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, false);
696}696}
697697
698void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)698void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
699699
=== 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 @@
800 texxform,800 texxform,
801 nux::color::White);801 nux::color::White);
802 }802 }
803
804 gfx_context.GetRenderStates().SetBlend(false);
805 }803 }
806 804
807 gfx_context.PopClippingRectangle();805 gfx_context.PopClippingRectangle();
808 }806 }
809807
808 gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
809 gfx_context.GetRenderStates().SetColorMask(true, true, true, true);
810 gfx_context.GetRenderStates().SetBlend(false);
811
810}812}
811813
812void OverlayRendererImpl::DrawContent(nux::GraphicsEngine& gfx_context, nux::Geometry const& content_geo, nux::Geometry const& absolute_geo, nux::Geometry const& geometry)814void OverlayRendererImpl::DrawContent(nux::GraphicsEngine& gfx_context, nux::Geometry const& content_geo, nux::Geometry const& absolute_geo, nux::Geometry const& geometry)