Merge lp:~azzar1/unity/fix-1059562-6.0 into lp:unity/6.0

Proposed by Andrea Azzarone on 2012-10-01
Status: Merged
Approved by: Neil J. Patel on 2012-10-03
Approved revision: 2746
Merged at revision: 2760
Proposed branch: lp:~azzar1/unity/fix-1059562-6.0
Merge into: lp:unity/6.0
Diff against target: 21 lines (+11/-0)
1 file modified
unity-shared/SearchBar.cpp (+11/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1059562-6.0
Reviewer Review Type Date Requested Status
Neil J. Patel (community) 2012-10-01 Approve on 2012-10-03
Review via email: mp+127274@code.launchpad.net

Commit message

Fix rendering flaw in search entry. (LP: #1059562)

Description of the change

== Problem ==
[Dash] Rendering flaw of the dash search entry.

== Fix ==
Clear area below search entry if necessary.

---

The 6.0 version of https://code.launchpad.net/~andyrock/unity/fix-1059562/+merge/127272

To post a comment you must log in.
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/SearchBar.cpp'
2--- unity-shared/SearchBar.cpp 2012-09-28 13:29:51 +0000
3+++ unity-shared/SearchBar.cpp 2012-10-01 13:24:32 +0000
4@@ -363,6 +363,17 @@
5
6 graphics_engine.PushClippingRectangle(base);
7
8+ if (RedirectedAncestor())
9+ {
10+ unsigned int alpha = 0, src = 0, dest = 0;
11+ graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
12+ // This is necessary when doing redirected rendering.
13+ // Clean the area below this view before drawing anything.
14+ graphics_engine.GetRenderStates().SetBlend(false);
15+ graphics_engine.QRP_Color(base.x, base.y, last_width_, last_height_, nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
16+ graphics_engine.GetRenderStates().SetBlend(alpha, src, dest);
17+ }
18+
19 bg_layer_->SetGeometry(nux::Geometry(base.x, base.y, last_width_, last_height_));
20 nux::GetPainter().RenderSinglePaintLayer(graphics_engine,
21 bg_layer_->GetGeometry(),

Subscribers

People subscribed via source and target branches