X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fsize-negotiation%2Fsize-negotiation-example.cpp;h=c9a50265e3401ccf35aa1eedb940500407476ce0;hb=3429cdb9f1fc3864dff4505bf42012e2f09fb6f4;hp=4e6aa162beb6b687f9bc1aa5bdf41ba217ed3f24;hpb=8d340ec58c16b97556054c21170120003e01244a;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp index 4e6aa16..c9a5026 100644 --- a/examples/size-negotiation/size-negotiation-example.cpp +++ b/examples/size-negotiation/size-negotiation-example.cpp @@ -21,6 +21,8 @@ using namespace Dali; +using Dali::Toolkit::TextLabel; + // Define this so that it is interchangeable // "DP" stands for Device independent Pixels #define DP(x) DemoHelper::ScalePointSize(x) @@ -155,6 +157,8 @@ public: { // The Init signal is received once (only) during the Application lifetime + DemoHelper::RequestThemeChange(); + Stage stage = Stage::GetCurrent(); // Respond to key events @@ -169,8 +173,7 @@ public: TOOLBAR_IMAGE, std::string("") ); - mTitleActor = Dali::Toolkit::TextView::New(); - mTitleActor.SetName( "CUSTOM_TOOLBAR_TITLE" ); + mTitleActor = DemoHelper::CreateToolBarLabel( "CUSTOM_TOOLBAR_TITLE" ); SetTitle(); @@ -231,8 +234,7 @@ public: } } - mTitleActor.SetText( std::string( TOOLBAR_TITLE ) + ": " + subTitle ); - mTitleActor.SetStyleToCurrentText( DemoHelper::GetDefaultTextStyle() ); + mTitleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, std::string( std::string( TOOLBAR_TITLE ) + ": " + subTitle ) ); } bool OnMenu( Toolkit::Button button ) @@ -423,14 +425,12 @@ public: { mPopup = CreatePopup(); - Toolkit::TextView text = Toolkit::TextView::New(); + TextLabel text = TextLabel::New( CONTENT_TEXT ); text.SetName( "POPUP_CONTENT_TEXT" ); - text.SetText( CONTENT_TEXT ); - text.SetMultilinePolicy( Toolkit::TextView::SplitByWord ); - text.SetWidthExceedPolicy( Toolkit::TextView::Split ); - text.SetLineJustification( Toolkit::TextView::Center ); - text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); - text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); + 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 ); @@ -499,12 +499,8 @@ public: mPopup = CreatePopup(); mPopup.SetTitle( "Popup!" ); - Toolkit::TextView text = Toolkit::TextView::New(); + Toolkit::TextLabel text = Toolkit::TextLabel::New( CONTENT_TEXT ); text.SetName( "POPUP_CONTENT_TEXT" ); - text.SetText( CONTENT_TEXT ); - text.SetMultilinePolicy( Toolkit::TextView::SplitByWord ); - text.SetWidthExceedPolicy( Toolkit::TextView::Split ); - text.SetLineJustification( Toolkit::TextView::Center ); text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); @@ -518,12 +514,8 @@ public: mPopup = CreatePopup(); mPopup.SetTitle( "Popup!" ); - Toolkit::TextView text = Toolkit::TextView::New(); + Toolkit::TextLabel text = Toolkit::TextLabel::New( CONTENT_TEXT ); text.SetName( "POPUP_CONTENT_TEXT" ); - text.SetText( CONTENT_TEXT ); - text.SetMultilinePolicy( Toolkit::TextView::SplitByWord ); - text.SetWidthExceedPolicy( Toolkit::TextView::Split ); - text.SetLineJustification( Toolkit::TextView::Left ); text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); text.SetPadding( Padding( 10.0f, 10.0f, 20.0f, 0.0f ) ); @@ -568,11 +560,7 @@ public: // Text { - Toolkit::TextView text = Toolkit::TextView::New(); - text.SetText( "Do you really want to quit?" ); - text.SetMultilinePolicy( Toolkit::TextView::SplitByWord ); - text.SetWidthExceedPolicy( Toolkit::TextView::Split ); - text.SetLineJustification( Toolkit::TextView::Left ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Do you really want to quit?" ); text.SetResizePolicy( FILL_TO_PARENT, WIDTH ); text.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); @@ -607,9 +595,7 @@ public: root.AddChild( checkBox, Toolkit::TableView::CellPosition( 0, 0 ) ); - Toolkit::TextView text = Toolkit::TextView::New(); - text.SetText( "Don't show again" ); - text.SetLineJustification( Toolkit::TextView::Left ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Don't show again" ); Actor textActor = text; textActor.SetPadding( Padding( 20.0f, 0.0f, 0.0f, 10.0f ) ); @@ -785,7 +771,7 @@ public: { Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fixed" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -794,7 +780,7 @@ public: { Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fill" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -803,7 +789,7 @@ public: { Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fill" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -829,7 +815,7 @@ public: { Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fixed" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -838,7 +824,7 @@ public: { Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fill" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -847,7 +833,7 @@ public: { Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fixed" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -875,7 +861,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 100.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -886,7 +872,7 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fill" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -898,7 +884,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 100.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -924,7 +910,7 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fill" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -936,7 +922,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 200.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -947,7 +933,7 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fill" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -978,7 +964,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 100.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -990,7 +976,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 200.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -1002,7 +988,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 300.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -1033,7 +1019,7 @@ public: backing.SetResizePolicy( FIXED, HEIGHT ); backing.SetSize( 0.0f, 100.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -1045,7 +1031,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 200.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -1074,7 +1060,7 @@ public: Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) ); backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - TextActor text = TextActor::New( "Fixed" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -1086,7 +1072,7 @@ public: backing.SetResizePolicy( FILL_TO_PARENT, WIDTH ); backing.SetSize( 0.0f, 200.0f ); - TextActor text = TextActor::New( "Fit" ); + Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" ); text.SetAnchorPoint( AnchorPoint::CENTER ); text.SetParentOrigin( ParentOrigin::CENTER ); backing.Add( text ); @@ -1219,7 +1205,7 @@ private: Toolkit::ToolBar mToolBar; ///< The View's Toolbar. Layer mContentLayer; ///< Content layer - Toolkit::TextView mTitleActor; ///< Title text + Toolkit::TextLabel mTitleActor; ///< Title text Toolkit::Popup mMenu; ///< The navigation menu bool mMenuShown; ///< If the navigation menu is currently being displayed or not