Peter M. Groen / dali-demo

Commit a6f2bba05b6db85066145ed10d882e9514f267da

Authored by Paul Wisbey
1 parent d6ad9aff

Work-around regression with vertical layout 

Change-Id: Ica4f357358704c12dd69e882efcb49c6dffd233e
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
examples/text-label-emojis/vertical-layout-impl.cpp
  View file @a6f2bba
... ... @@ -72,7 +72,7 @@ Vector3 VerticalLayout::GetNaturalSize()
72 72 Vector3 labelSize = label.GetNaturalSize();
73 73  
74 74 size.width = ( labelSize.width > size.width ) ? labelSize.width : size.width;
75   - size.height += labelSize.height;
  75 + size.height += labelSize.height + 50.0f/*FIXME*/;
76 76 }
77 77 }
78 78  
... ... @@ -90,7 +90,7 @@ float VerticalLayout::GetHeightForWidth( float width )
90 90  
91 91 if( label )
92 92 {
93   - height += label.GetHeightForWidth( width );
  93 + height += label.GetHeightForWidth( width ) + 50.0f/*FIXME*/;
94 94 }
95 95 }
96 96  
... ... @@ -121,7 +121,7 @@ void VerticalLayout::OnRelayout( const Vector2& size, ActorSizeContainer& contai
121 121 label.SetPosition( position );
122 122  
123 123 childSize.height = label.GetHeightForWidth( size.width );
124   - position.height += childSize.height;
  124 + position.height += childSize.height + 50.0f/*FIXME*/;
125 125  
126 126 label.SetSize( childSize );
127 127 }
... ...