From 744c1c68a168145de2a228c41812d7fef0b0233a Mon Sep 17 00:00:00 2001 From: Kingsley Stephens Date: Thu, 9 Apr 2015 16:15:21 +0100 Subject: [PATCH] Fix size negotiation example label centering and wrapping text Change-Id: I3f19359887fc598f3681b4ddcf55527bddceb7ca --- .../size-negotiation/size-negotiation-example.cpp | 80 ++++++++++++++++++++-- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp index c9a5026..4e5c16b 100644 --- a/examples/size-negotiation/size-negotiation-example.cpp +++ b/examples/size-negotiation/size-negotiation-example.cpp @@ -430,7 +430,6 @@ public: text.SetProperty( TextLabel::Property::MULTI_LINE, true ); text.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); text.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); - text.SetResizePolicy( FILL_TO_PARENT, Dali::HEIGHT ); text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); mPopup.Add( text ); @@ -503,6 +502,7 @@ public: text.SetName( "POPUP_CONTENT_TEXT" ); text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); + text.SetProperty( TextLabel::Property::MULTI_LINE, true ); text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); mPopup.Add( text ); @@ -518,6 +518,7 @@ public: text.SetName( "POPUP_CONTENT_TEXT" ); text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); + text.SetProperty( TextLabel::Property::MULTI_LINE, true ); text.SetPadding( Padding( 10.0f, 10.0f, 20.0f, 0.0f ) ); mPopup.Add( text ); @@ -563,6 +564,7 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Do you really want to quit?" ); text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); + text.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); content.AddChild( text, Toolkit::TableView::CellPosition( 0, 0 ) ); } @@ -772,8 +774,10 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); - text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); backing.Add( text ); table.Add( backing ); } @@ -781,8 +785,10 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); - text.SetAnchorPoint( AnchorPoint::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); backing.Add( text ); table.Add( backing ); } @@ -790,8 +796,10 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); - text.SetAnchorPoint( AnchorPoint::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); backing.Add( text ); table.Add( backing ); } @@ -818,6 +826,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); } @@ -827,6 +839,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); } @@ -836,6 +852,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); } @@ -864,6 +884,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -875,6 +899,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -887,6 +915,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -913,6 +945,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -923,6 +959,10 @@ public: backing.SetSize( 0.0f, 200.0f ); Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -936,6 +976,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -967,6 +1011,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -979,6 +1027,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -991,6 +1043,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -1022,6 +1078,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -1034,6 +1094,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -1063,6 +1127,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); @@ -1075,6 +1143,10 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + backing.Add( text ); table.Add( backing ); -- 2.7.4