Peter M. Groen / dali-demo

Commit 22d0bd3fd68f3654788637921e6b7574748f97ef

Authored by Victor Cebollada
1 parent d0f6cea9

Fixes for text related actors after new size negotiation. 

Change-Id: I289af8a59b4b1f67fc1dbea92b0457194da6847a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
examples/text-field/text-field-example.cpp
  View file @22d0bd3
... ... @@ -76,9 +76,9 @@ public:
76 76 stage.Add( mContainer );
77 77  
78 78 TextField field = TextField::New();
79   - field.SetParentOrigin( ParentOrigin::CENTER );
80   - field.SetResizePolicy( FIXED, ALL_DIMENSIONS );
81   - field.SetPreferredSize( Vector2(stageSize.width*0.6f, stageSize.width*0.6f) );
  79 + field.SetAnchorPoint( AnchorPoint::TOP_LEFT );
  80 + field.SetDimensionDependency( HEIGHT, WIDTH );
  81 + field.SetResizePolicy( FILL_TO_PARENT, WIDTH );
82 82  
83 83 mContainer.Add( field );
84 84  
... ...
examples/text-label/text-label-example.cpp
  View file @22d0bd3
... ... @@ -127,7 +127,8 @@ public:
127 127 mLabel = TextLabel::New( "A Quick Brown Fox Jumps Over The Lazy Dog" );
128 128 mLabel.SetName( "TextLabel" );
129 129 mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
130   - mLabel.SetResizePolicy( FILL_TO_PARENT, HEIGHT );
  130 + mLabel.SetDimensionDependency( HEIGHT, WIDTH );
  131 + mLabel.SetResizePolicy( FILL_TO_PARENT, WIDTH );
131 132 mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true );
132 133 mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 1.0f, 1.0f ) );
133 134 mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK );
... ...