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

[Andrea Azzarone]

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

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

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

[Nick Dedekind (nick-dedekind)]

There are other checks for RedirectedAncestor in SearchBar::Draw which I believe you can now remove.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> There are other checks for RedirectedAncestor in SearchBar::Draw which I
> believe you can now remove.

Done.

[Nick Dedekind (nick-dedekind)]

LGTM

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1499/console reported an error when processing this lp:~andyrock/unity/fix-1059562 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1500/console reported an error when processing this lp:~andyrock/unity/fix-1059562 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1503/console reported an error when processing this lp:~andyrock/unity/fix-1059562 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1505/console reported an error when processing this lp:~andyrock/unity/fix-1059562 branch.
Not merging it.

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2012-09-24 15:46:08 +0000
+++ unity-shared/SearchBar.cpp	2012-10-08 10:44:19 +0000
@@ -363,6 +363,17 @@
 
   graphics_engine.PushClippingRectangle(base);
 
+  if (RedirectedAncestor())
+  {
+    unsigned int alpha = 0, src = 0, dest = 0;
+    graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
+    // This is necessary when doing redirected rendering.
+    // Clean the area below this view before drawing anything.
+    graphics_engine.GetRenderStates().SetBlend(false);
+    graphics_engine.QRP_Color(base.x, base.y, base.width, base.height, nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
+    graphics_engine.GetRenderStates().SetBlend(alpha, src, dest);
+  }
+
   bg_layer_->SetGeometry(nux::Geometry(base.x, base.y, last_width_, last_height_));
   nux::GetPainter().RenderSinglePaintLayer(graphics_engine,
                                            bg_layer_->GetGeometry(),
@@ -380,38 +391,10 @@
     if (!highlight_layer_)
       highlight_layer_.reset(style.FocusOverlay(geo.width, geo.height));
 
-    if (RedirectedAncestor())
-    {
-      unsigned int alpha = 0, src = 0, dest = 0;
-      graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
-      // This is necessary when doing redirected rendering.
-      // Clean the area below this view before drawing anything.
-      graphics_engine.GetRenderStates().SetBlend(false);
-      graphics_engine.QRP_Color(geo.x, geo.y, geo.width, geo.height, nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
-      graphics_engine.GetRenderStates().SetBlend(alpha, src, dest);
-    }
-
     highlight_layer_->SetGeometry(geo);
     highlight_layer_->Renderlayer(graphics_engine);
   }
-  else if (expander_view_ && expander_view_->IsVisible())
-  {
-    nux::Geometry geo(expander_view_->GetGeometry());
-
-    geo.y -= (HIGHLIGHT_HEIGHT- geo.height) / 2;
-    geo.height = HIGHLIGHT_HEIGHT;
-
-    if (RedirectedAncestor())
-    {
-      unsigned int alpha = 0, src = 0, dest = 0;
-      graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
-      // This is necessary when doing redirected rendering.
-      // Clean the area below this view before drawing anything.
-      graphics_engine.GetRenderStates().SetBlend(false);
-      graphics_engine.QRP_Color(geo.x, geo.y, geo.width, geo.height, nux::Color(0.0f, 0.0f, 0.0f, 0.0f));
-      graphics_engine.GetRenderStates().SetBlend(alpha, src, dest);
-    }
-  }
+
   graphics_engine.PopClippingRectangle();
 }