Merge lp:~azzar1/unity/fix-1016239-5.0 into lp:unity/5.0

[Andrea Azzarone]

Backport lp:~andyrock/unity/fix-1016239

Backport lp:~andyrock/unity/fix-1016239

== Problem ==
Searching in the HUD freezes unity.
== Fix ==
Set a min/max width for the hudbutton to avoid layout issues.

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

[Unity Merger (unity-merger)]

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

=== modified file 'plugins/unityshell/src/HudButton.cpp'
--- plugins/unityshell/src/HudButton.cpp	2012-05-31 09:03:00 +0000
+++ plugins/unityshell/src/HudButton.cpp	2012-06-27 12:34:50 +0000
@@ -132,6 +132,7 @@
 void HudButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   nux::Geometry const& geo = GetGeometry();
+  GfxContext.PushClippingRectangle(geo);
   gPainter.PaintBackground(GfxContext, geo);
   // set up our texture mode
   nux::TexCoordXForm texxform;
@@ -169,12 +170,18 @@
                       nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
 
   GfxContext.GetRenderStates().SetBlend(alpha, src, dest);
+
+  GfxContext.PopClippingRectangle();
 }
 
 void HudButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   if (IsFullRedraw())
+  {
+    GfxContext.PushClippingRectangle(GetGeometry());
     hlayout_->ProcessDraw(GfxContext, force_draw);
+    GfxContext.PopClippingRectangle();
+  }
 }
 
 void HudButton::SetQuery(Query::Ptr query)
@@ -187,7 +194,7 @@
   hlayout_->Clear();
   for (auto item : items)
   {
-    nux::StaticCairoText* text = new nux::StaticCairoText(item.first.c_str());
+    nux::StaticCairoText* text = new nux::StaticCairoText(item.first);
     text->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, item.second ? 1.0f : 0.5f));
     text->SetFont(button_font);
     hlayout_->AddView(text, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-06-25 21:55:49 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-06-27 12:34:50 +0000
@@ -244,6 +244,8 @@
 
     HudButton::Ptr button(new HudButton());
     buttons_.push_front(button);
+    button->SetMinimumWidth(content_width);
+    button->SetMaximumWidth(content_width);
     button->SetQuery(query);
 
     button_views_->AddView(button.GetPointer(), 0, nux::MINOR_POSITION_LEFT);
@@ -261,7 +263,6 @@
         query_selected.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
 
-    button->SetMinimumWidth(content_width);
     ++found_items;
   }