Peter M. Groen / dali-demo

Commit 744c1c68a168145de2a228c41812d7fef0b0233a

Authored by Kingsley Stephens
1 parent 8054811c

Fix size negotiation example label centering and wrapping text 

Change-Id: I3f19359887fc598f3681b4ddcf55527bddceb7ca
Inline Side-by-side
Showing 1 changed file with 76 additions and 4 deletions
examples/size-negotiation/size-negotiation-example.cpp
  View file @744c1c6
... ... @@ -430,7 +430,6 @@ public:
430 430 text.SetProperty( TextLabel::Property::MULTI_LINE, true );
431 431 text.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
432 432 text.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
433   - text.SetResizePolicy( FILL_TO_PARENT, Dali::HEIGHT );
434 433 text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) );
435 434  
436 435 mPopup.Add( text );
... ... @@ -503,6 +502,7 @@ public:
503 502 text.SetName( "POPUP_CONTENT_TEXT" );
504 503 text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
505 504 text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT );
  505 + text.SetProperty( TextLabel::Property::MULTI_LINE, true );
506 506 text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) );
507 507  
508 508 mPopup.Add( text );
... ... @@ -518,6 +518,7 @@ public:
518 518 text.SetName( "POPUP_CONTENT_TEXT" );
519 519 text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
520 520 text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT );
  521 + text.SetProperty( TextLabel::Property::MULTI_LINE, true );
521 522 text.SetPadding( Padding( 10.0f, 10.0f, 20.0f, 0.0f ) );
522 523  
523 524 mPopup.Add( text );
... ... @@ -563,6 +564,7 @@ public:
563 564 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Do you really want to quit?" );
564 565 text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
565 566 text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT );
  567 + text.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
566 568  
567 569 content.AddChild( text, Toolkit::TableView::CellPosition( 0, 0 ) );
568 570 }
... ... @@ -772,8 +774,10 @@ public:
772 774 Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
773 775 backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
774 776 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
775   - text.SetAnchorPoint( AnchorPoint::CENTER );
776 777 text.SetParentOrigin( ParentOrigin::CENTER );
  778 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  779 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  780 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
777 781 backing.Add( text );
778 782 table.Add( backing );
779 783 }
... ... @@ -781,8 +785,10 @@ public:
781 785 Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
782 786 backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
783 787 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
784   - text.SetAnchorPoint( AnchorPoint::CENTER );
  788 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
785 789 text.SetParentOrigin( ParentOrigin::CENTER );
  790 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  791 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
786 792 backing.Add( text );
787 793 table.Add( backing );
788 794 }
... ... @@ -790,8 +796,10 @@ public:
790 796 Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
791 797 backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
792 798 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
793   - text.SetAnchorPoint( AnchorPoint::CENTER );
  799 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
794 800 text.SetParentOrigin( ParentOrigin::CENTER );
  801 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  802 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
795 803 backing.Add( text );
796 804 table.Add( backing );
797 805 }
... ... @@ -818,6 +826,10 @@ public:
818 826 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
819 827 text.SetAnchorPoint( AnchorPoint::CENTER );
820 828 text.SetParentOrigin( ParentOrigin::CENTER );
  829 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  830 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  831 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  832 +
821 833 backing.Add( text );
822 834 table.Add( backing );
823 835 }
... ... @@ -827,6 +839,10 @@ public:
827 839 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
828 840 text.SetAnchorPoint( AnchorPoint::CENTER );
829 841 text.SetParentOrigin( ParentOrigin::CENTER );
  842 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  843 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  844 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  845 +
830 846 backing.Add( text );
831 847 table.Add( backing );
832 848 }
... ... @@ -836,6 +852,10 @@ public:
836 852 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
837 853 text.SetAnchorPoint( AnchorPoint::CENTER );
838 854 text.SetParentOrigin( ParentOrigin::CENTER );
  855 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  856 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  857 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  858 +
839 859 backing.Add( text );
840 860 table.Add( backing );
841 861 }
... ... @@ -864,6 +884,10 @@ public:
864 884 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
865 885 text.SetAnchorPoint( AnchorPoint::CENTER );
866 886 text.SetParentOrigin( ParentOrigin::CENTER );
  887 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  888 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  889 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  890 +
867 891 backing.Add( text );
868 892  
869 893 table.Add( backing );
... ... @@ -875,6 +899,10 @@ public:
875 899 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
876 900 text.SetAnchorPoint( AnchorPoint::CENTER );
877 901 text.SetParentOrigin( ParentOrigin::CENTER );
  902 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  903 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  904 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  905 +
878 906 backing.Add( text );
879 907  
880 908 table.Add( backing );
... ... @@ -887,6 +915,10 @@ public:
887 915 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
888 916 text.SetAnchorPoint( AnchorPoint::CENTER );
889 917 text.SetParentOrigin( ParentOrigin::CENTER );
  918 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  919 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  920 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  921 +
890 922 backing.Add( text );
891 923  
892 924 table.Add( backing );
... ... @@ -913,6 +945,10 @@ public:
913 945 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
914 946 text.SetAnchorPoint( AnchorPoint::CENTER );
915 947 text.SetParentOrigin( ParentOrigin::CENTER );
  948 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  949 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  950 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  951 +
916 952 backing.Add( text );
917 953  
918 954 table.Add( backing );
... ... @@ -923,6 +959,10 @@ public:
923 959 backing.SetSize( 0.0f, 200.0f );
924 960  
925 961 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
  962 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  963 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  964 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  965 +
926 966 text.SetAnchorPoint( AnchorPoint::CENTER );
927 967 text.SetParentOrigin( ParentOrigin::CENTER );
928 968 backing.Add( text );
... ... @@ -936,6 +976,10 @@ public:
936 976 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
937 977 text.SetAnchorPoint( AnchorPoint::CENTER );
938 978 text.SetParentOrigin( ParentOrigin::CENTER );
  979 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  980 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  981 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  982 +
939 983 backing.Add( text );
940 984  
941 985 table.Add( backing );
... ... @@ -967,6 +1011,10 @@ public:
967 1011 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
968 1012 text.SetAnchorPoint( AnchorPoint::CENTER );
969 1013 text.SetParentOrigin( ParentOrigin::CENTER );
  1014 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1015 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1016 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1017 +
970 1018 backing.Add( text );
971 1019  
972 1020 table.Add( backing );
... ... @@ -979,6 +1027,10 @@ public:
979 1027 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
980 1028 text.SetAnchorPoint( AnchorPoint::CENTER );
981 1029 text.SetParentOrigin( ParentOrigin::CENTER );
  1030 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1031 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1032 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1033 +
982 1034 backing.Add( text );
983 1035  
984 1036 table.Add( backing );
... ... @@ -991,6 +1043,10 @@ public:
991 1043 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
992 1044 text.SetAnchorPoint( AnchorPoint::CENTER );
993 1045 text.SetParentOrigin( ParentOrigin::CENTER );
  1046 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1047 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1048 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1049 +
994 1050 backing.Add( text );
995 1051  
996 1052 table.Add( backing );
... ... @@ -1022,6 +1078,10 @@ public:
1022 1078 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
1023 1079 text.SetAnchorPoint( AnchorPoint::CENTER );
1024 1080 text.SetParentOrigin( ParentOrigin::CENTER );
  1081 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1082 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1083 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1084 +
1025 1085 backing.Add( text );
1026 1086  
1027 1087 table.Add( backing );
... ... @@ -1034,6 +1094,10 @@ public:
1034 1094 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
1035 1095 text.SetAnchorPoint( AnchorPoint::CENTER );
1036 1096 text.SetParentOrigin( ParentOrigin::CENTER );
  1097 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1098 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1099 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1100 +
1037 1101 backing.Add( text );
1038 1102  
1039 1103 table.Add( backing );
... ... @@ -1063,6 +1127,10 @@ public:
1063 1127 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
1064 1128 text.SetAnchorPoint( AnchorPoint::CENTER );
1065 1129 text.SetParentOrigin( ParentOrigin::CENTER );
  1130 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1131 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1132 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1133 +
1066 1134 backing.Add( text );
1067 1135  
1068 1136 table.Add( backing );
... ... @@ -1075,6 +1143,10 @@ public:
1075 1143 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
1076 1144 text.SetAnchorPoint( AnchorPoint::CENTER );
1077 1145 text.SetParentOrigin( ParentOrigin::CENTER );
  1146 + text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
  1147 + text.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  1148 + text.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
  1149 +
1078 1150 backing.Add( text );
1079 1151  
1080 1152 table.Add( backing );
... ...