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

[Andrea Azzarone]

Fix hud expand animation.

== Problem ==
HUD Draws improperly while searching for results.

== Fix ==
We don't draw the buttons unless they fit in the currently available area. We do it using a flag.

== Test ==
Visual change. Not applicable.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2448
http://s-jenkins:8080/job/unity-ci/35/

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Looks good to me!

review: Approve

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

+1

review: Approve

=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2012-06-27 12:51:27 +0000
+++ hud/HudButton.cpp	2012-06-27 21:42:19 +0000
@@ -52,10 +52,13 @@
 namespace hud
 {
 
+NUX_IMPLEMENT_OBJECT_TYPE(HudButton);
+
 HudButton::HudButton(NUX_FILE_LINE_DECL)
   : nux::Button(NUX_FILE_LINE_PARAM)
   , is_rounded(false)
   , is_focused_(false)
+  , skip_draw_(true)
 {
   hlayout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   hlayout_->SetLeftAndRightPadding(hlayout_left_padding, -1);
@@ -130,6 +133,9 @@
 
 void HudButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
+  if (skip_draw_)
+    return;
+
   nux::Geometry const& geo = GetGeometry();
   GfxContext.PushClippingRectangle(geo);
   gPainter.PaintBackground(GfxContext, geo);
@@ -177,6 +183,9 @@
 
 void HudButton::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
+  if (skip_draw_)
+    return;
+
   if (IsFullRedraw())
   {
     GfxContext.PushClippingRectangle(GetGeometry());
@@ -207,6 +216,12 @@
   return query_;
 }
 
+void HudButton::SetSkipDraw(bool skip_draw)
+{
+  skip_draw_ = skip_draw;
+}
+
+
 // Introspectable
 std::string HudButton::GetName() const
 {
 
=== modified file 'hud/HudButton.h'
--- hud/HudButton.h	2012-05-30 14:33:07 +0000
+++ hud/HudButton.h	2012-06-27 21:42:19 +0000
@@ -38,8 +38,8 @@
 
 class HudButton : public nux::Button, public unity::debug::Introspectable 
 {
-  typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
-  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
+  NUX_DECLARE_OBJECT_TYPE(HudButton, nux::Button);
+
 public:
   typedef nux::ObjectPtr<HudButton> Ptr;
 
@@ -48,6 +48,8 @@
   void SetQuery(Query::Ptr query);
   std::shared_ptr<Query> GetQuery();
 
+  void SetSkipDraw(bool skip_draw);
+
   nux::Property<std::string> label;
   nux::Property<bool> is_rounded;
   nux::Property<bool> fake_focused;
@@ -65,9 +67,13 @@
   void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
 
 private:
+  typedef std::unique_ptr<nux::CairoWrapper> NuxCairoPtr;
+
   Query::Ptr query_;
   nux::Geometry cached_geometry_;
+
   bool is_focused_;
+  bool skip_draw_;
 
   NuxCairoPtr prelight_;
   NuxCairoPtr active_;
 
=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-06-27 12:51:27 +0000
+++ hud/HudView.cpp	2012-06-27 21:42:19 +0000
@@ -151,6 +151,11 @@
    current_height_ = new_height;
   }
 
+  for (auto button : buttons_)
+  {
+    button->SetSkipDraw((button->GetAbsoluteY() + button->GetBaseHeight()) > (GetAbsoluteY() + current_height_));
+  }
+
   QueueDraw();
 
   if (diff > grow_anim_length + pause_before_grow_length)