X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fpopup%2Fpopup-example.cpp;h=9f6d3088a558425e9f87df5b2ea22e4588a3e4fc;hb=80cdb8fb6a112954c040613d61417b12185dc5bd;hp=cebffd9153dc8e371e869e98ecf410fe8768cde9;hpb=214f363041053a01ead590d0527dc6c08f7fe961;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/popup/popup-example.cpp b/examples/popup/popup-example.cpp index cebffd9..9f6d308 100644 --- a/examples/popup/popup-example.cpp +++ b/examples/popup/popup-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,9 +18,7 @@ #include "shared/view.h" #include #include -#include #include -#include using namespace Dali; @@ -117,11 +115,7 @@ public: Stage stage = Stage::GetCurrent(); // Respond to key events if not handled - Toolkit::KeyInputFocusManager keyInputFocusManager = Toolkit::KeyInputFocusManager::Get(); - if( keyInputFocusManager ) - { - keyInputFocusManager.UnhandledKeyEventSignal().Connect( this, &PopupExample::OnKeyEvent ); - } + stage.KeyEventSignal().Connect( this, &PopupExample::OnKeyEvent ); // Creates a default view with a default tool bar. // The view is added to the stage. @@ -141,24 +135,24 @@ public: // Create animation button. mAnimationButton = Toolkit::PushButton::New(); - mAnimationButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, ANIMATION_FADE_ICON_IMAGE ); - mAnimationButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, ANIMATION_ZOOM_ICON_IMAGE ); + mAnimationButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, ANIMATION_FADE_ICON_IMAGE ); + mAnimationButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, ANIMATION_ZOOM_ICON_IMAGE ); mAnimationButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true ); mAnimationButton.ClickedSignal().Connect( this, &PopupExample::OnAnimationClicked ); mToolBar.AddControl( mAnimationButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Create context button. mContextButton = Toolkit::PushButton::New(); - mContextButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CONTEXT_DISABLED_ICON_IMAGE ); - mContextButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CONTEXT_ENABLED_ICON_IMAGE ); + mContextButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CONTEXT_DISABLED_ICON_IMAGE ); + mContextButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CONTEXT_ENABLED_ICON_IMAGE ); mContextButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true ); mContextButton.ClickedSignal().Connect( this, &PopupExample::OnContextClicked ); mToolBar.AddControl( mContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Add title to the tool bar. mItemView = Toolkit::ItemView::New( *this ); - mItemView.SetParentOrigin( ParentOrigin::CENTER ); - mItemView.SetAnchorPoint( AnchorPoint::CENTER ); + mItemView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mItemView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mItemView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Use a grid layout for tests @@ -216,12 +210,12 @@ public: if( policyDimension == Dimension::WIDTH ) { stageDimensionSize = stageSize.x; - sizeModeFactor = popup.GetSizeModeFactor().x; + sizeModeFactor = popup.GetProperty< Vector3 >( Actor::Property::SIZE_MODE_FACTOR ).x; } else { stageDimensionSize = stageSize.y; - sizeModeFactor = popup.GetSizeModeFactor().y; + sizeModeFactor = popup.GetProperty< Vector3 >( Actor::Property::SIZE_MODE_FACTOR ).y; } bool modifyPolicy = false; @@ -340,9 +334,9 @@ public: const float POPUP_WIDTH_DP = stage.GetSize().width * 0.75f; Toolkit::Popup popup = Toolkit::Popup::New(); - popup.SetName( "popup" ); - popup.SetParentOrigin( ParentOrigin::CENTER ); - popup.SetAnchorPoint( AnchorPoint::CENTER ); + popup.SetProperty( Dali::Actor::Property::NAME, "popup" ); + popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); popup.SetSize( POPUP_WIDTH_DP, 0.0f ); popup.SetProperty( Toolkit::Popup::Property::TAIL_VISIBILITY, false ); @@ -355,38 +349,38 @@ public: Toolkit::Popup CreateConfirmationPopup( int numberOfButtons ) { Toolkit::Popup confirmationPopup = Toolkit::Popup::New(); - confirmationPopup.SetName( "MAIN-POPUP-SELF" ); + confirmationPopup.SetProperty( Dali::Actor::Property::NAME, "MAIN-POPUP-SELF" ); if( numberOfButtons > 0 ) { // Start with a control area image. Toolkit::ImageView footer = Toolkit::ImageView::New( DEFAULT_CONTROL_AREA_IMAGE_PATH ); - footer.SetName( "controlAreaImage" ); + footer.SetProperty( Dali::Actor::Property::NAME, "controlAreaImage" ); // Set up the container's layout. footer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); footer.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); footer.SetSize( 0.0f, 130.0f ); - footer.SetAnchorPoint( AnchorPoint::CENTER ); - footer.SetParentOrigin( ParentOrigin::CENTER ); + footer.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + footer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Actor okButton = CreateOKButton(); - okButton.SetParentOrigin( ParentOrigin::CENTER ); - okButton.SetAnchorPoint( AnchorPoint::CENTER ); + okButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + okButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); okButton.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); - okButton.SetSizeModeFactor( Vector3( -20.0f, -20.0f, 0.0 ) ); + okButton.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( -20.0f, -20.0f, 0.0 ) ); if( numberOfButtons > 1 ) { Toolkit::TableView controlLayout = Toolkit::TableView::New( 1, 2 ); - controlLayout.SetParentOrigin( ParentOrigin::CENTER ); - controlLayout.SetAnchorPoint( AnchorPoint::CENTER ); + controlLayout.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + controlLayout.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); controlLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); Actor cancelButton = CreateCancelButton(); - cancelButton.SetParentOrigin( ParentOrigin::CENTER ); - cancelButton.SetAnchorPoint( AnchorPoint::CENTER ); + cancelButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + cancelButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); cancelButton.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); - cancelButton.SetSizeModeFactor( Vector3( -20.0f, -20.0f, 0.0 ) ); + cancelButton.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( -20.0f, -20.0f, 0.0 ) ); controlLayout.SetCellPadding( Size( 10.0f, 10.0f ) ); @@ -416,7 +410,7 @@ public: Actor CreateTitle( std::string title ) { Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( title ); - titleActor.SetName( "titleActor" ); + titleActor.SetProperty( Dali::Actor::Property::NAME, "titleActor" ); titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); titleActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); @@ -427,8 +421,8 @@ public: Toolkit::PushButton CreateOKButton() { Toolkit::PushButton okayButton = Toolkit::PushButton::New(); - okayButton.SetName( POPUP_CONTROL_OK_NAME ); - okayButton.SetLabelText( "OK!" ); + okayButton.SetProperty( Dali::Actor::Property::NAME, POPUP_CONTROL_OK_NAME ); + okayButton.SetProperty( Toolkit::Button::Property::LABEL, "OK!" ); okayButton.ClickedSignal().Connect( this, &PopupExample::OnPopupButtonClicked ); @@ -438,8 +432,8 @@ public: Toolkit::PushButton CreateCancelButton() { Toolkit::PushButton cancelButton = Toolkit::PushButton::New(); - cancelButton.SetName( POPUP_CONTROL_CANCEL_NAME ); - cancelButton.SetLabelText( "Cancel" ); + cancelButton.SetProperty( Dali::Actor::Property::NAME, POPUP_CONTROL_CANCEL_NAME ); + cancelButton.SetProperty( Toolkit::Button::Property::LABEL, "Cancel" ); cancelButton.ClickedSignal().Connect( this, &PopupExample::OnPopupButtonClicked ); @@ -456,28 +450,28 @@ public: bool OnButtonClicked( Toolkit::Button button ) { // Handle menu items that create popups. - if( button.GetName() == POPUP_BUTTON_TITLE_ID ) + if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_TITLE_ID ) { mPopup = CreatePopup(); mPopup.SetTitle( CreateTitle( "Popup!" ) ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_BUTTONS_1_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_BUTTONS_1_ID ) { mPopup = CreateConfirmationPopup( 1 ); mPopup.SetTitle( CreateTitle( "Title" ) ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_BUTTONS_2_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_BUTTONS_2_ID ) { mPopup = CreateConfirmationPopup( 2 ); mPopup.SetTitle( CreateTitle( "Title" ) ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_TOAST_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_TOAST_ID ) { // Create a toast popup via the type registry (as it is a named-type). TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "PopupToast" ); @@ -494,79 +488,79 @@ public: } } } - else if( button.GetName() == POPUP_BUTTON_TITLE_CONTENT_BUTTONS_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_TITLE_CONTENT_BUTTONS_ID ) { mPopup = CreateConfirmationPopup( 2 ); mPopup.SetTitle( CreateTitle( "Erase image" ) ); Toolkit::TextLabel text = Toolkit::TextLabel::New( "This will erase the image permanently. Are you sure?" ); - text.SetName( "POPUP_CONTENT_TEXT" ); + text.SetProperty( Dali::Actor::Property::NAME, "POPUP_CONTENT_TEXT" ); text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); text.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); text.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); text.SetProperty( TextLabel::Property::MULTI_LINE, true ); - text.SetPadding( Padding( 10.0f, 10.0f, 20.0f, 0.0f ) ); + text.SetProperty( Actor::Property::PADDING, Padding( 10.0f, 10.0f, 20.0f, 0.0f ) ); mPopup.SetContent( text ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_CONTENT_TEXT_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_CONTENT_TEXT_ID ) { mPopup = CreatePopup(); TextLabel text = TextLabel::New( CONTENT_TEXT ); - text.SetName( "POPUP_CONTENT_TEXT" ); + text.SetProperty( Dali::Actor::Property::NAME, "POPUP_CONTENT_TEXT" ); text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); text.SetProperty( TextLabel::Property::MULTI_LINE, true ); text.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); text.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); text.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); text.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); - text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); + text.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); mPopup.Add( text ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_CONTENT_IMAGE_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_CONTENT_IMAGE_ID ) { mPopup = CreatePopup(); Toolkit::ImageView image = Toolkit::ImageView::New( IMAGE2 ); image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); image.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); - image.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); + image.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); mPopup.Add( image ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_TITLE_CONTENT_TEXT_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_TITLE_CONTENT_TEXT_ID ) { mPopup = CreatePopup(); mPopup.SetTitle( CreateTitle( "Popup!" ) ); Toolkit::TextLabel text = Toolkit::TextLabel::New( CONTENT_TEXT ); - text.SetName( "POPUP_CONTENT_TEXT" ); + text.SetProperty( Dali::Actor::Property::NAME, "POPUP_CONTENT_TEXT" ); text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); text.SetProperty( TextLabel::Property::MULTI_LINE, true ); text.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); text.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); - text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); + text.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); mPopup.Add( text ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_FIXED_SIZE_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_FIXED_SIZE_ID ) { mPopup = CreatePopup(); mPopup.SetTitle( CreateTitle( "Popup!" ) ); Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed size popup" ); - text.SetName( "POPUP_CONTENT_TEXT" ); + text.SetProperty( Dali::Actor::Property::NAME, "POPUP_CONTENT_TEXT" ); text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); text.SetProperty( TextLabel::Property::MULTI_LINE, true ); - text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); + text.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 20.0f, 20.0f, 20.0f ) ); mPopup.Add( text ); @@ -576,36 +570,36 @@ public: SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_TITLE_LARGE_CONTENT_BUTTONS_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_TITLE_LARGE_CONTENT_BUTTONS_ID ) { mPopup = CreateConfirmationPopup( 2 ); mPopup.SetTitle( CreateTitle( "Popup!" ) ); Toolkit::TextLabel text = Toolkit::TextLabel::New( CONTENT_TEXT ); - text.SetName( "POPUP_CONTENT_TEXT" ); + text.SetProperty( Dali::Actor::Property::NAME, "POPUP_CONTENT_TEXT" ); text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); text.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); text.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); text.SetProperty( TextLabel::Property::MULTI_LINE, true ); - text.SetPadding( Padding( 10.0f, 10.0f, 20.0f, 0.0f ) ); + text.SetProperty( Actor::Property::PADDING, Padding( 10.0f, 10.0f, 20.0f, 0.0f ) ); mPopup.Add( text ); SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_COMPLEX_ID ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_COMPLEX_ID ) { mPopup = CreateConfirmationPopup( 2 ); mPopup.SetTitle( CreateTitle( "Warning" ) ); // Content Toolkit::TableView content = Toolkit::TableView::New( 2, 2 ); - content.SetName( "COMPLEX_TABLEVIEW" ); + content.SetProperty( Dali::Actor::Property::NAME, "COMPLEX_TABLEVIEW" ); content.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); content.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); content.SetFitHeight( 0 ); content.SetFitHeight( 1 ); - content.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 0.0f ) ); + content.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 20.0f, 20.0f, 0.0f ) ); // Text { @@ -621,10 +615,10 @@ public: // Image { Toolkit::ImageView image = Toolkit::ImageView::New( IMAGE1 ); - image.SetName( "COMPLEX_IMAGE" ); + image.SetProperty( Dali::Actor::Property::NAME, "COMPLEX_IMAGE" ); image.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); image.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); - image.SetPadding( Padding( 20.0f, 0.0f, 0.0f, 0.0f ) ); + image.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 0.0f, 0.0f, 0.0f ) ); content.AddChild( image, Toolkit::TableView::CellPosition( 0, 1 ) ); } @@ -635,7 +629,7 @@ public: root.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); root.SetFitHeight( 0 ); root.SetFitWidth( 0 ); - root.SetPadding( Padding( 0.0f, 0.0f, 0.0f, 20.0f ) ); + root.SetProperty( Actor::Property::PADDING, Padding( 0.0f, 0.0f, 0.0f, 20.0f ) ); Toolkit::CheckBoxButton checkBox = Toolkit::CheckBoxButton::New(); checkBox.SetSize( 48, 48 ); @@ -644,7 +638,7 @@ public: Toolkit::TextLabel text = Toolkit::TextLabel::New( "Don't show again" ); text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); Actor textActor = text; - textActor.SetPadding( Padding( 20.0f, 0.0f, 0.0f, 10.0f ) ); + textActor.SetProperty( Actor::Property::PADDING, Padding( 20.0f, 0.0f, 0.0f, 10.0f ) ); root.AddChild( text, Toolkit::TableView::CellPosition( 0, 1 ) ); @@ -655,12 +649,12 @@ public: SetupPopup( mPopup, button ); } - else if( button.GetName() == POPUP_BUTTON_CUSTOM_STYLE ) + else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == POPUP_BUTTON_CUSTOM_STYLE ) { mPopup = CreateConfirmationPopup( 2 ); Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Styled Popup" ); - titleActor.SetName( "titleActor" ); + titleActor.SetProperty( Dali::Actor::Property::NAME, "titleActor" ); titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::RED ); titleActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); @@ -707,8 +701,8 @@ public: // From ItemFactory virtual Actor NewItem(unsigned int itemId) { Toolkit::PushButton popupButton = Toolkit::PushButton::New(); - popupButton.SetName( POPUP_BUTTON_ITEMS[ itemId ].name ); - popupButton.SetLabelText( POPUP_BUTTON_ITEMS[ itemId ].text ); + popupButton.SetProperty( Dali::Actor::Property::NAME, POPUP_BUTTON_ITEMS[ itemId ].name ); + popupButton.SetProperty( Toolkit::Button::Property::LABEL, POPUP_BUTTON_ITEMS[ itemId ].text ); popupButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); popupButton.ClickedSignal().Connect( this, &PopupExample::OnButtonClicked ); @@ -737,19 +731,10 @@ private: }; -void RunTest( Application& application ) -{ - PopupExample test( application ); - - application.MainLoop(); -} - -// Entry point for Linux & SLP applications int DALI_EXPORT_API main( int argc, char **argv ) { Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); - - RunTest( application ); - + PopupExample test( application ); + application.MainLoop(); return 0; }