From a6f2bba05b6db85066145ed10d882e9514f267da Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 23 Mar 2015 18:21:15 +0000 Subject: [PATCH] Work-around regression with vertical layout --- 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 b3ebbf2..842d9f8 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; + size.height += labelSize.height + 50.0f/*FIXME*/; } } @@ -90,7 +90,7 @@ float VerticalLayout::GetHeightForWidth( float width ) if( label ) { - height += label.GetHeightForWidth( width ); + height += label.GetHeightForWidth( width ) + 50.0f/*FIXME*/; } } @@ -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; + position.height += childSize.height + 50.0f/*FIXME*/; label.SetSize( childSize ); } -- libgit2 0.21.4