From 532fff98247c7cc98a646c45dd72b10fbf7d95d8 Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Tue, 24 Mar 2015 02:27:59 -0700
Subject: [PATCH] Revert "Work-around regression with vertical layout"
This reverts commit a6f2bba05b6db85066145ed10d882e9514f267da.
Change-Id: I7c0993c884a61cf7d906f2da64fab0677d92774b
---
examples/text-label-emojis/vertical-layout-impl.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/text-label-emojis/vertical-layout-impl.cpp b/examples/text-label-emojis/vertical-layout-impl.cpp
index 842d9f8..b3ebbf2 100644
--- a/examples/text-label-emojis/vertical-layout-impl.cpp
+++ b/examples/text-label-emojis/vertical-layout-impl.cpp
@@ -72,7 +72,7 @@ Vector3 VerticalLayout::GetNaturalSize()
Vector3 labelSize = label.GetNaturalSize();
size.width = ( labelSize.width > size.width ) ? labelSize.width : size.width;
- size.height += labelSize.height + 50.0f/*FIXME*/;
+ size.height += labelSize.height;
}
}
@@ -90,7 +90,7 @@ float VerticalLayout::GetHeightForWidth( float width )
if( label )
{
- height += label.GetHeightForWidth( width ) + 50.0f/*FIXME*/;
+ height += label.GetHeightForWidth( width );
}
}
@@ -121,7 +121,7 @@ void VerticalLayout::OnRelayout( const Vector2& size, ActorSizeContainer& contai
label.SetPosition( position );
childSize.height = label.GetHeightForWidth( size.width );
- position.height += childSize.height + 50.0f/*FIXME*/;
+ position.height += childSize.height;
label.SetSize( childSize );
}
--
2.7.4