summaryrefslogtreecommitdiff
diff options
authorGord Allott <gord.allott@canonical.com>2012-09-11 10:20:50 +0100
committerGord Allott <gord.allott@canonical.com>2012-09-11 10:20:50 +0100
commitb6894da04e778c0a0cb96c688c3fc70a887d49e0 (patch)
tree7ce60ea842e68f08a0ce1495292ae1d868a8558b
parent4bd168dfdf417aeae1a1a92c19cead59bfc645d9 (diff)
dash gradient background added
(bzr r2637.8.9)
-rw-r--r--plugins/unityshell/resources/refine_gradient_dash.pngbin22279 -> 22279 bytes
-rw-r--r--unity-shared/OverlayRenderer.cpp9
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/unityshell/resources/refine_gradient_dash.png b/plugins/unityshell/resources/refine_gradient_dash.png
index cc0529093..8f90736c0 100644
--- a/plugins/unityshell/resources/refine_gradient_dash.png
+++ b/plugins/unityshell/resources/refine_gradient_dash.png
Binary files differ
diff --git a/unity-shared/OverlayRenderer.cpp b/unity-shared/OverlayRenderer.cpp
index bd07d32ab..cfae7a607 100644
--- a/unity-shared/OverlayRenderer.cpp
+++ b/unity-shared/OverlayRenderer.cpp
@@ -532,9 +532,12 @@ void OverlayRendererImpl::Draw(nux::GraphicsEngine& gfx_context, nux::Geometry c
larger_content_geo.width, larger_content_geo.height,
bg_shine_texture_, texxform_absolute_bg, nux::color::White);
+ gfx_context.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
nux::TexCoordXForm refine_texxform;
- gfx_context.QRP_1Tex(larger_content_geo.x, larger_content_geo.y,
- larger_content_geo.width, larger_content_geo.height,
+ gfx_context.QRP_1Tex(larger_content_geo.x + larger_content_geo.width - bg_refine_tex_->GetWidth(),
+ larger_content_geo.y,
+ bg_refine_tex_->GetWidth(),
+ bg_refine_tex_->GetHeight(),
bg_refine_tex_->GetDeviceTexture(),
refine_texxform,
nux::color::White
@@ -883,7 +886,7 @@ void OverlayRendererImpl::DrawContent(nux::GraphicsEngine& gfx_context, nux::Geo
nux::Geometry refine_geo = larger_content_geo;
- refine_geo.x = larger_content_geo.width - bg_refine_tex_->GetWidth();
+ refine_geo.x += larger_content_geo.width - bg_refine_tex_->GetWidth();
refine_geo.width = bg_refine_tex_->GetWidth();
refine_geo.height = bg_refine_tex_->GetHeight();