Work-around regression with vertical layout 69/37269/3
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 23 Mar 2015 18:21:15 +0000 (18:21 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Mon, 23 Mar 2015 18:29:16 +0000 (18:29 +0000)
Change-Id: Ica4f357358704c12dd69e882efcb49c6dffd233e

examples/text-label-emojis/vertical-layout-impl.cpp

index b3ebbf2..842d9f8 100644 (file)
@@ -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 );
     }