From 22d0bd3fd68f3654788637921e6b7574748f97ef Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Wed, 1 Apr 2015 16:08:52 +0100 Subject: [PATCH] Fixes for text related actors after new size negotiation. Change-Id: I289af8a59b4b1f67fc1dbea92b0457194da6847a Signed-off-by: Victor Cebollada --- examples/text-field/text-field-example.cpp | 6 +++--- examples/text-label/text-label-example.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 814ee3d..a738b18 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -76,9 +76,9 @@ public: stage.Add( mContainer ); TextField field = TextField::New(); - field.SetParentOrigin( ParentOrigin::CENTER ); - field.SetResizePolicy( FIXED, ALL_DIMENSIONS ); - field.SetPreferredSize( Vector2(stageSize.width*0.6f, stageSize.width*0.6f) ); + field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + field.SetDimensionDependency( HEIGHT, WIDTH ); + field.SetResizePolicy( FILL_TO_PARENT, WIDTH ); mContainer.Add( field ); diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index fa7e67e..a8476bf 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -127,7 +127,8 @@ public: mLabel = TextLabel::New( "A Quick Brown Fox Jumps Over The Lazy Dog" ); mLabel.SetName( "TextLabel" ); mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mLabel.SetResizePolicy( FILL_TO_PARENT, HEIGHT ); + mLabel.SetDimensionDependency( HEIGHT, WIDTH ); + mLabel.SetResizePolicy( FILL_TO_PARENT, WIDTH ); mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true ); mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 1.0f, 1.0f ) ); mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK ); -- 2.7.4