diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index e72fba7..bbe7495 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -88,10 +88,10 @@ const float BUBBLE_MAX_Z = 0.0f; /** * Creates the background image */ -ImageActor CreateBackground( std::string imagePath ) +ImageView CreateBackground( std::string imagePath ) { Image image = ResourceImage::New( imagePath ); - ImageActor background = ImageActor::New( image ); + ImageView background = ImageView::New( image ); background.SetName( "BACKGROUND" ); background.SetAnchorPoint( AnchorPoint::CENTER ); background.SetParentOrigin( ParentOrigin::CENTER ); @@ -153,7 +153,6 @@ DaliTableView::DaliTableView( Application& application ) mBackgroundLayer(), mRootActor(), mRotateAnimation(), - mBackground(), mPressedAnimation(), mScrollViewLayer(), mScrollView(), @@ -209,7 +208,7 @@ void DaliTableView::Initialize( Application& application ) const Vector2 stageSize = Stage::GetCurrent().GetSize(); // Background - Actor background = CreateBackground( mBackgroundImagePath ); + ImageView background = CreateBackground( mBackgroundImagePath ); Stage::GetCurrent().Add( background ); // Render entire content as overlays, as is all on same 2D plane. @@ -230,7 +229,7 @@ void DaliTableView::Initialize( Application& application ) mRootActor.SetFitHeight( 0 ); // Add logo - Dali::ImageActor logo = CreateLogo( LOGO_PATH ); + ImageView logo = CreateLogo( LOGO_PATH ); logo.SetName( "LOGO_IMAGE" ); logo.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); const float paddingHeight = ( ( 1.f-TABLE_RELATIVE_SIZE.y ) * stageSize.y ); @@ -848,10 +847,10 @@ void DaliTableView::GenerateCircle( const Size& size, std::vector< unsigned char } } -ImageActor DaliTableView::CreateLogo( std::string imagePath ) +ImageView DaliTableView::CreateLogo( std::string imagePath ) { Image image = ResourceImage::New( imagePath ); - ImageActor logo = ImageActor::New( image ); + ImageView logo = ImageView::New( image ); logo.SetAnchorPoint( AnchorPoint::CENTER ); logo.SetParentOrigin( ParentOrigin::CENTER ); diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h index c8fcf58..bbc4d52 100644 --- a/demo/dali-table-view.h +++ b/demo/dali-table-view.h @@ -318,7 +318,7 @@ private: // Application callbacks & implementation * * @return The created image actor */ - Dali::ImageActor CreateLogo( std::string imagePath ); + Dali::Toolkit::ImageView CreateLogo( std::string imagePath ); /** * Timer handler for ending background animation @@ -392,7 +392,6 @@ private: Dali::Layer mBackgroundLayer; ///< Background resides on a separate layer. Dali::Toolkit::TableView mRootActor; ///< All content (excluding background is anchored to this Actor) Dali::Animation mRotateAnimation; ///< Animation to rotate and resize mRootActor. - Dali::ImageActor mBackground; ///< Background's static image. Dali::Animation mPressedAnimation; ///< Button press scaling animation. Dali::Layer mScrollViewLayer; ///< ScrollView resides on a separate layer. Dali::Toolkit::ScrollView mScrollView; ///< ScrollView container (for all Examples) diff --git a/examples/atlas/atlas-example.cpp b/examples/atlas/atlas-example.cpp index a499242..e6b987c 100644 --- a/examples/atlas/atlas-example.cpp +++ b/examples/atlas/atlas-example.cpp @@ -72,8 +72,8 @@ public: "Atlas" ); mLoseContextButton = Toolkit::PushButton::New(); - mLoseContextButton.SetButtonImage( ResourceImage::New( LOSE_CONTEXT_IMAGE ) ); - mLoseContextButton.SetSelectedImage( ResourceImage::New( LOSE_CONTEXT_IMAGE_SELECTED ) ); + mLoseContextButton.SetUnselectedImage( LOSE_CONTEXT_IMAGE ); + mLoseContextButton.SetSelectedImage( LOSE_CONTEXT_IMAGE_SELECTED ); mLoseContextButton.ClickedSignal().Connect( this, &AtlasController::OnLoseContextButtonClicked ); mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -90,7 +90,7 @@ public: mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 ); UploadBufferImages(); - ImageActor imageActor1 = ImageActor::New( mAtlas ); + Toolkit::ImageView imageActor1 = Toolkit::ImageView::New( mAtlas ); imageActor1.SetY(-170.f); imageActor1.SetParentOrigin(ParentOrigin::CENTER); mContentLayer.Add( imageActor1 ); @@ -109,19 +109,20 @@ public: atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 268 ); - ImageActor imageActor2 = ImageActor::New( atlas2 ); - imageActor2.SetY(200.f); - imageActor2.SetZ(-1.f); - imageActor2.SetParentOrigin(ParentOrigin::CENTER); - mContentLayer.Add( imageActor2 ); + Toolkit::ImageView imageView = Toolkit::ImageView::New( DALI_IMAGE_DIR "gallery-small-1.jpg" ); + + imageView.SetY(200.f); + imageView.SetZ(-1.f); + imageView.SetParentOrigin(ParentOrigin::CENTER); + mContentLayer.Add( imageView ); mPanGestureDetector = PanGestureDetector::New(); - mPanGestureDetector.DetectedSignal().Connect(this, &AtlasController::OnPanGesture); - mPanGestureDetector.Attach(imageActor1); - mPanGestureDetector.Attach(imageActor2); + mPanGestureDetector.DetectedSignal().Connect( this, &AtlasController::OnPanGesture ); + mPanGestureDetector.Attach( imageActor1 ); + mPanGestureDetector.Attach( imageView ); - stage.ContextLostSignal().Connect(this, &AtlasController::OnContextLost); - stage.ContextRegainedSignal().Connect(this, &AtlasController::OnContextRegained); + stage.ContextLostSignal().Connect( this, &AtlasController::OnContextLost ); + stage.ContextRegainedSignal().Connect( this, &AtlasController::OnContextRegained ); } void UploadBufferImages() diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index 20a3e93..0da125b 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -523,7 +523,7 @@ private: const Vector2 brickSize(BRICK_SIZE * Vector2(stageSize.x, stageSize.x)); Image img = ResourceImage::New( BRICK_IMAGE_PATH[type], Dali::ImageDimensions( 128, 64 ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR ); - ImageActor brick = ImageActor::New(img); + ImageView brick = ImageView::New(img); brick.SetParentOrigin(ParentOrigin::TOP_LEFT); brick.SetAnchorPoint(AnchorPoint::CENTER); brick.SetSize( brickSize ); @@ -551,10 +551,9 @@ private: * * @param[in] filename the path of the image. */ - ImageActor CreateImage(const std::string& filename) + ImageView CreateImage(const std::string& filename) { - Image img = ResourceImage::New(filename); - ImageActor actor = ImageActor::New(img); + ImageView actor = ImageView::New(filename); actor.SetParentOrigin(ParentOrigin::TOP_LEFT); actor.SetAnchorPoint(AnchorPoint::CENTER); return actor; @@ -806,13 +805,13 @@ private: Application& mApplication; ///< Application instance Toolkit::Control mView; ///< The View instance. Layer mContentLayer; ///< The content layer (contains game actors) - ImageActor mBall; ///< The Moving ball image. + ImageView mBall; ///< The Moving ball image. Vector3 mBallStartPosition; ///< Ball Start position Vector3 mBallVelocity; ///< Ball's current direction. Animation mBallAnimation; ///< Ball's animation Actor mPaddle; ///< The paddle including hit area. - ImageActor mPaddleImage; ///< The paddle's image. - ImageActor mPaddleHandle; ///< The paddle's handle (where the user touches) + ImageView mPaddleImage; ///< The paddle's image. + ImageView mPaddleHandle; ///< The paddle's handle (where the user touches) Vector2 mPaddleHitMargin; ///< The paddle hit margin. Animation mWobbleAnimation; ///< Paddle's animation when hit (wobbles) Property::Index mWobbleProperty; ///< The wobble property (generated from animation) diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp index 268e393..c0b6c00 100644 --- a/examples/bubble-effect/bubble-effect-example.cpp +++ b/examples/bubble-effect/bubble-effect-example.cpp @@ -111,8 +111,8 @@ private: // Add a button to change background. (right of toolbar) mChangeBackgroundButton = Toolkit::PushButton::New(); - mChangeBackgroundButton.SetButtonImage( ResourceImage::New( CHANGE_BACKGROUND_ICON ) ); - mChangeBackgroundButton.SetSelectedImage( ResourceImage::New( CHANGE_BACKGROUND_ICON_SELECTED ) ); + mChangeBackgroundButton.SetUnselectedImage( CHANGE_BACKGROUND_ICON ); + mChangeBackgroundButton.SetSelectedImage( CHANGE_BACKGROUND_ICON_SELECTED ); mChangeBackgroundButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked ); toolBar.AddControl( mChangeBackgroundButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, @@ -120,8 +120,8 @@ private: DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Add a button to change bubble shape. ( left of bar ) mChangeBubbleShapeButton = Toolkit::PushButton::New(); - mChangeBubbleShapeButton.SetButtonImage( ResourceImage::New( CHANGE_BUBBLE_SHAPE_ICON ) ); - mChangeBubbleShapeButton.SetSelectedImage( ResourceImage::New( CHANGE_BUBBLE_SHAPE_ICON_SELECTED ) ); + mChangeBubbleShapeButton.SetUnselectedImage( CHANGE_BUBBLE_SHAPE_ICON ); + mChangeBubbleShapeButton.SetSelectedImage( CHANGE_BUBBLE_SHAPE_ICON_SELECTED ); mChangeBubbleShapeButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked ); toolBar.AddControl( mChangeBubbleShapeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp index 4e83575..f302d9f 100644 --- a/examples/builder/examples.cpp +++ b/examples/builder/examples.cpp @@ -513,8 +513,8 @@ public: // Create an edit mode button. (left of toolbar) Toolkit::PushButton editButton = Toolkit::PushButton::New(); - editButton.SetButtonImage( ResourceImage::New( EDIT_IMAGE ) ); - editButton.SetSelectedImage( ResourceImage::New( EDIT_IMAGE_SELECTED ) ); + editButton.SetUnselectedImage( EDIT_IMAGE ); + editButton.SetSelectedImage( EDIT_IMAGE_SELECTED ); editButton.ClickedSignal().Connect( this, &ExampleApp::OnToolSelectLayout); editButton.SetLeaveRequired( true ); mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp index c6cec93..d312418 100644 --- a/examples/buttons/buttons-example.cpp +++ b/examples/buttons/buttons-example.cpp @@ -49,6 +49,7 @@ const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); // Layout sizes const int RADIO_LABEL_THUMBNAIL_SIZE = 60; +const int RADIO_LABEL_THUMBNAIL_SIZE_SMALL = 40; const int RADIO_IMAGE_SPACING = 8; const int BUTTON_HEIGHT = 48; @@ -141,54 +142,71 @@ class ButtonsController: public ConnectionTracker radioGroup2Background.AddChild( radioButtonsGroup2, Toolkit::TableView::CellPosition( 0, 0 ) ); + // TableView to lay out 3x Radio buttons on the left, and 3x Image thumbnails on the right. + Toolkit::TableView imageSelectTableView = Toolkit::TableView::New( 3, 2 ); + imageSelectTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); + imageSelectTableView.SetFitHeight( 0 ); + imageSelectTableView.SetFitHeight( 1 ); + imageSelectTableView.SetFitHeight( 2 ); + imageSelectTableView.SetFitWidth( 0 ); + imageSelectTableView.SetFitWidth( 1 ); + imageSelectTableView.SetCellPadding( Vector2( 6.0f, 0.0f ) ); + + radioButtonsGroup2.Add( imageSelectTableView ); + int radioY = 0; // Radio 1 { - ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_1 ) ); - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); - mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( imageActor ); + ImageActor image = ImageActor::New( ResourceImage::New( SMALL_IMAGE_1 ) ); + image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); + + mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( "1" ); mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT ); mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT ); mRadioButtonImage1.SetPosition( 0, DP(radioY) ); mRadioButtonImage1.SetSelected( true ); - radioButtonsGroup2.Add( mRadioButtonImage1 ); + imageSelectTableView.AddChild( mRadioButtonImage1, Toolkit::TableView::CellPosition( 0, 0 ) ); + imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 0, 1 ) ); } // Radio 2 { radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING; - ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_2 ) ); - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); + ImageActor image = ImageActor::New( ResourceImage::New( SMALL_IMAGE_2 ) ); + image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); - mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( imageActor ); + mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( "2" ); mRadioButtonImage2.SetParentOrigin( ParentOrigin::TOP_LEFT ); mRadioButtonImage2.SetAnchorPoint( AnchorPoint::TOP_LEFT ); mRadioButtonImage2.SetPosition( 0, DP(radioY) ); - radioButtonsGroup2.Add( mRadioButtonImage2 ); + imageSelectTableView.AddChild( mRadioButtonImage2, Toolkit::TableView::CellPosition( 1, 0 ) ); + imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 1, 1 ) ); } // Radio 3 { radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING; - ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_3 ) ); - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); + ImageActor image = ImageActor::New( ResourceImage::New( SMALL_IMAGE_3 ) ); + image.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); - mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( imageActor ); + mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( "3" ); mRadioButtonImage3.SetParentOrigin( ParentOrigin::TOP_LEFT ); mRadioButtonImage3.SetAnchorPoint( AnchorPoint::TOP_LEFT ); mRadioButtonImage3.SetPosition( 0, DP(radioY) ); - radioButtonsGroup2.Add( mRadioButtonImage3 ); + imageSelectTableView.AddChild( mRadioButtonImage3, Toolkit::TableView::CellPosition( 2, 0 ) ); + imageSelectTableView.AddChild( image, Toolkit::TableView::CellPosition( 2, 1 ) ); } // Create select button mUpdateButton = Toolkit::PushButton::New(); - mUpdateButton.SetLabel( "Select" ); + mUpdateButton.SetLabelText( "Select" ); + mUpdateButton.SetName( "select-button" ); mUpdateButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked ); @@ -227,26 +245,29 @@ class ButtonsController: public ConnectionTracker radioGroup1Background.Add( radioButtonsGroup1 ); + // TableView to lay out 2x Radio buttons on the left, and 1x Tick image on the right. + Toolkit::TableView tableView = Toolkit::TableView::New( 2, 2 ); + tableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); + tableView.SetFitHeight( 0 ); + tableView.SetFitHeight( 1 ); + tableView.SetFitWidth( 0 ); + tableView.SetFitWidth( 1 ); + + Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( "Select enabled" ); + textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH ); + textLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); + textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + + ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) ); + imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); + imageActor.SetPadding( Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) ); + tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) ); + + radioButtonsGroup1.Add( tableView ); + // First radio button { - Toolkit::TableView tableView = Toolkit::TableView::New( 1, 2 ); - tableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - tableView.SetFitHeight( 0 ); - tableView.SetFitWidth( 0 ); - tableView.SetFitWidth( 1 ); - - Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( "Select enabled" ); - textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH ); - textLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); - textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); - tableView.AddChild( textLabel, Toolkit::TableView::CellPosition( 0, 0 ) ); - - ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) ); - imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ); - imageActor.SetPadding( Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) ); - tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) ); - - Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( tableView ); + Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select enabled" ); radioButton.SetName( "radio-select-enable" ); radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); @@ -255,7 +276,7 @@ class ButtonsController: public ConnectionTracker radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButton ); - radioButtonsGroup1.Add( radioButton ); + tableView.AddChild( radioButton, Toolkit::TableView::CellPosition( 0, 0 ) ); } // Second radio button @@ -268,7 +289,7 @@ class ButtonsController: public ConnectionTracker radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButton ); - radioButtonsGroup1.Add( radioButton ); + tableView.AddChild( radioButton, Toolkit::TableView::CellPosition( 1, 0 ) ); } // CheckBoxes @@ -276,7 +297,7 @@ class ButtonsController: public ConnectionTracker checkBoxBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); checkBoxBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); checkBoxBackground.SetBackgroundColor( BACKGROUND_COLOUR ); - checkBoxBackground.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE ) ); + checkBoxBackground.SetCellPadding( Size( MARGIN_SIZE / 2.0f, MARGIN_SIZE / 2.0f ) ); for( unsigned int i = 0; i < checkBoxBackground.GetRows(); ++i ) { @@ -288,7 +309,7 @@ class ButtonsController: public ConnectionTracker { mCheckboxButton1 = Toolkit::CheckBoxButton::New(); mCheckboxButton1.SetName( "checkbox1" ); - mCheckboxButton1.SetLabel( "CheckBox1 is unselected" ); + mCheckboxButton1.SetLabelText( "CheckBox1 is unselected" ); mCheckboxButton1.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected ); checkBoxBackground.Add( mCheckboxButton1 ); @@ -297,7 +318,7 @@ class ButtonsController: public ConnectionTracker { mCheckboxButton2 = Toolkit::CheckBoxButton::New(); mCheckboxButton2.SetName( "checkbox2" ); - mCheckboxButton2.SetLabel( "CheckBox2 is selected" ); + mCheckboxButton2.SetLabelText( "CheckBox2 is selected" ); mCheckboxButton2.SetSelected( true ); mCheckboxButton2.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected ); @@ -307,7 +328,7 @@ class ButtonsController: public ConnectionTracker { mCheckboxButton3 = Toolkit::CheckBoxButton::New(); mCheckboxButton3.SetName( "checkbox3" ); - mCheckboxButton3.SetLabel( "CheckBox3 is unselected" ); + mCheckboxButton3.SetLabelText( "CheckBox3 is unselected" ); mCheckboxButton3.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesSelected ); checkBoxBackground.Add( mCheckboxButton3 ); @@ -329,7 +350,7 @@ class ButtonsController: public ConnectionTracker mToggleButton = Toolkit::PushButton::New(); mToggleButton.SetTogglableButton( true ); - mToggleButton.SetLabel( "Unselected" ); + mToggleButton.SetLabelText( "Unselected" ); mToggleButton.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); mToggleButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); mToggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonSelected ); @@ -356,11 +377,11 @@ class ButtonsController: public ConnectionTracker { if( button.IsSelected() ) { - pushButton.SetLabel( "Selected" ); + pushButton.SetLabelText( "Selected" ); } else { - pushButton.SetLabel( "Unselected" ); + pushButton.SetLabelText( "Unselected" ); } } @@ -424,11 +445,11 @@ class ButtonsController: public ConnectionTracker { if( button.IsSelected() ) { - button.SetLabel("CheckBox1 is selected"); + button.SetLabelText("CheckBox1 is selected"); } else { - button.SetLabel("CheckBox1 is unselected"); + button.SetLabelText("CheckBox1 is unselected"); } } @@ -436,11 +457,11 @@ class ButtonsController: public ConnectionTracker { if( button.IsSelected() ) { - button.SetLabel("CheckBox2 is selected"); + button.SetLabelText("CheckBox2 is selected"); } else { - button.SetLabel("CheckBox2 is unselected"); + button.SetLabelText("CheckBox2 is unselected"); } } @@ -448,11 +469,11 @@ class ButtonsController: public ConnectionTracker { if( button.IsSelected() ) { - button.SetLabel("CheckBox3 is selected"); + button.SetLabelText("CheckBox3 is selected"); } else { - button.SetLabel("CheckBox3 is unselected"); + button.SetLabelText("CheckBox3 is unselected"); } } diff --git a/examples/cluster/cluster-example.cpp b/examples/cluster/cluster-example.cpp index 0bc4532..d13389c 100644 --- a/examples/cluster/cluster-example.cpp +++ b/examples/cluster/cluster-example.cpp @@ -325,8 +325,8 @@ struct ShrinkConstraint struct ButtonImages { - Image mButtonImage; - Image mSelectedImage; + std::string mButtonImage; + std::string mSelectedImage; }; @@ -390,14 +390,14 @@ public: mContentLayer.SetProperty(Layer::Property::BEHAVIOR, "Dali::Layer::LAYER_3D"); // Create a effect toggle button. (right of toolbar) - mLayoutButtonImages[ NO_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_NONE_IMAGE ); - mLayoutButtonImages[ NO_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_NONE_IMAGE_SELECTED ); - mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_MOTION_BLUR_IMAGE ); - mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_MOTION_BLUR_IMAGE_SELECTED ); - mLayoutButtonImages[ CAROUSEL_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_CAROUSEL_IMAGE ); - mLayoutButtonImages[ CAROUSEL_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_CAROUSEL_IMAGE_SELECTED ); - mLayoutButtonImages[ SPHERE_EFFECT ].mButtonImage = ResourceImage::New( LAYOUT_SPHERE_IMAGE ); - mLayoutButtonImages[ SPHERE_EFFECT ].mSelectedImage = ResourceImage::New( LAYOUT_SPHERE_IMAGE_SELECTED ); + mLayoutButtonImages[ NO_EFFECT ].mButtonImage = LAYOUT_NONE_IMAGE; + mLayoutButtonImages[ NO_EFFECT ].mSelectedImage = LAYOUT_NONE_IMAGE_SELECTED; + mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mButtonImage = LAYOUT_MOTION_BLUR_IMAGE; + mLayoutButtonImages[ MOTION_BLUR_EFFECT ].mSelectedImage = LAYOUT_MOTION_BLUR_IMAGE_SELECTED; + mLayoutButtonImages[ CAROUSEL_EFFECT ].mButtonImage = LAYOUT_CAROUSEL_IMAGE; + mLayoutButtonImages[ CAROUSEL_EFFECT ].mSelectedImage = LAYOUT_CAROUSEL_IMAGE_SELECTED; + mLayoutButtonImages[ SPHERE_EFFECT ].mButtonImage = LAYOUT_SPHERE_IMAGE; + mLayoutButtonImages[ SPHERE_EFFECT ].mSelectedImage = LAYOUT_SPHERE_IMAGE_SELECTED; mLayoutButton = Toolkit::PushButton::New(); mLayoutButton.ClickedSignal().Connect( this, &ClusterController::OnEffectTouched ); @@ -631,7 +631,7 @@ public: // Remove all shader-effects from mScrollView and it's children (the clusters) mScrollView.SetPosition(Vector3::ZERO); - mLayoutButton.SetButtonImage( mLayoutButtonImages[ type ].mButtonImage ); + mLayoutButton.SetUnselectedImage( mLayoutButtonImages[ type ].mButtonImage ); mLayoutButton.SetSelectedImage( mLayoutButtonImages[ type ].mSelectedImage ); for( std::vector::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i ) diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp index a948f30..0033935 100644 --- a/examples/cube-transition-effect/cube-transition-effect-example.cpp +++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp @@ -201,20 +201,10 @@ private: bool mSlideshow; Timer mViewTimer; Toolkit::PushButton mSlideshowButton; - Image mIconSlideshowStart; - Image mIconSlideshowStartSelected; - Image mIconSlideshowStop; - Image mIconSlideshowStopSelected; Vector2 mPanPosition; Vector2 mPanDisplacement; - Image mImageWave; - Image mImageWaveSelected; - Image mImageCross; - Image mImageCrossSelected; - Image mImageFold; - Image mImageFoldSelected; Toolkit::PushButton mEffectChangeButton; }; @@ -241,15 +231,9 @@ void CubeTransitionApp::OnInit( Application& application ) mContent.SetBehavior( Layer::LAYER_3D ); // Add an effect-changing button on the right of the tool bar. - mImageWave = ResourceImage::New( EFFECT_WAVE_IMAGE ); - mImageWaveSelected = ResourceImage::New( EFFECT_WAVE_IMAGE_SELECTED ); - mImageCross = ResourceImage::New( EFFECT_CROSS_IMAGE ); - mImageCrossSelected = ResourceImage::New( EFFECT_CROSS_IMAGE_SELECTED ); - mImageFold = ResourceImage::New( EFFECT_FOLD_IMAGE ); - mImageFoldSelected = ResourceImage::New( EFFECT_FOLD_IMAGE_SELECTED ); mEffectChangeButton = Toolkit::PushButton::New(); - mEffectChangeButton.SetButtonImage( mImageWave ); - mEffectChangeButton.SetSelectedImage( mImageWaveSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_WAVE_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_WAVE_IMAGE_SELECTED ); mEffectChangeButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnEffectButtonClicked ); mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -258,13 +242,9 @@ void CubeTransitionApp::OnInit( Application& application ) mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter ); //Add an slideshow icon on the right of the title - mIconSlideshowStart = ResourceImage::New( SLIDE_SHOW_START_ICON ); - mIconSlideshowStartSelected = ResourceImage::New( SLIDE_SHOW_START_ICON_SELECTED ); - mIconSlideshowStop = ResourceImage::New( SLIDE_SHOW_STOP_ICON ); - mIconSlideshowStopSelected = ResourceImage::New( SLIDE_SHOW_STOP_ICON_SELECTED ); mSlideshowButton = Toolkit::PushButton::New(); - mSlideshowButton.SetButtonImage( mIconSlideshowStart ); - mSlideshowButton.SetSelectedImage( mIconSlideshowStartSelected ); + mSlideshowButton.SetUnselectedImage( SLIDE_SHOW_START_ICON ); + mSlideshowButton.SetSelectedImage( SLIDE_SHOW_START_ICON_SELECTED ); mSlideshowButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnSildeshowButtonClicked ); mToolBar.AddControl( mSlideshowButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); @@ -375,23 +355,23 @@ bool CubeTransitionApp::OnEffectButtonClicked( Toolkit::Button button ) { mCurrentEffect = mCubeCrossEffect; mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_CROSS) ); - mEffectChangeButton.SetButtonImage( mImageCross ); - mEffectChangeButton.SetSelectedImage( mImageCrossSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_CROSS_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_CROSS_IMAGE_SELECTED ); } else if(mCurrentEffect == mCubeCrossEffect) { mCurrentEffect = mCubeFoldEffect; mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_FOLD) ); - mEffectChangeButton.SetButtonImage( mImageFold ); - mEffectChangeButton.SetSelectedImage( mImageFoldSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_FOLD_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_FOLD_IMAGE_SELECTED ); } else { mCurrentEffect = mCubeWaveEffect; mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_WAVE) ); - mEffectChangeButton.SetButtonImage( mImageWave ); - mEffectChangeButton.SetSelectedImage( mImageWaveSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_WAVE_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_WAVE_IMAGE_SELECTED ); } // Set the current image to cube transition effect @@ -406,8 +386,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button ) if( mSlideshow ) { mPanGestureDetector.Detach( mParent ); - mSlideshowButton.SetButtonImage( mIconSlideshowStop ); - mSlideshowButton.SetSelectedImage( mIconSlideshowStopSelected ); + mSlideshowButton.SetUnselectedImage( SLIDE_SHOW_STOP_ICON ); + mSlideshowButton.SetSelectedImage( SLIDE_SHOW_STOP_ICON_SELECTED ); mPanPosition = Vector2( mViewSize.width, mViewSize.height*0.5f ); mPanDisplacement = Vector2( -10.f, 0.f ); mViewTimer.Start(); @@ -415,8 +395,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button ) else { mPanGestureDetector.Attach( mParent ); - mSlideshowButton.SetButtonImage( mIconSlideshowStart ); - mSlideshowButton.SetSelectedImage( mIconSlideshowStartSelected ); + mSlideshowButton.SetUnselectedImage( SLIDE_SHOW_START_ICON ); + mSlideshowButton.SetSelectedImage( SLIDE_SHOW_START_ICON_SELECTED ); mViewTimer.Stop(); } return true; diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp index 3a346fb..a961320 100644 --- a/examples/dissolve-effect/dissolve-effect-example.cpp +++ b/examples/dissolve-effect/dissolve-effect-example.cpp @@ -180,16 +180,8 @@ private: bool mTimerReady; unsigned int mCentralLineIndex; - Image mIconPlay; - Image mIconPlaySelected; - Image mIconStop; - Image mIconStopSelected; Toolkit::PushButton mPlayStopButton; - Image mIconHighP; - Image mIconHighPSelected; - Image mIconMediumP; - Image mIconMediumPSelected; Toolkit::PushButton mEffectChangeButton; }; @@ -218,13 +210,9 @@ void DissolveEffectApp::OnInit( Application& application ) mContent = DemoHelper::CreateView( application, mView,mToolBar, "", TOOLBAR_IMAGE, "" ); // Add an effect-changing button on the right of the tool bar. - mIconHighP = ResourceImage::New( EFFECT_HIGHP_IMAGE ); - mIconHighPSelected = ResourceImage::New( EFFECT_HIGHP_IMAGE_SELECTED ); - mIconMediumP = ResourceImage::New( EFFECT_MEDIUMP_IMAGE ); - mIconMediumPSelected = ResourceImage::New( EFFECT_MEDIUMP_IMAGE_SELECTED ); mEffectChangeButton = Toolkit::PushButton::New(); - mEffectChangeButton.SetButtonImage( mIconHighP ); - mEffectChangeButton.SetSelectedImage( mIconHighPSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_HIGHP_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_HIGHP_IMAGE_SELECTED ); mEffectChangeButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnEffectButtonClicked ); mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -233,13 +221,9 @@ void DissolveEffectApp::OnInit( Application& application ) mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter ); // Add an slide-show button on the right of the title - mIconPlay = ResourceImage::New( PLAY_ICON ); - mIconPlaySelected = ResourceImage::New( PLAY_ICON_SELECTED ); - mIconStop = ResourceImage::New( STOP_ICON ); - mIconStopSelected = ResourceImage::New( STOP_ICON_SELECTED ); mPlayStopButton = Toolkit::PushButton::New(); - mPlayStopButton.SetButtonImage( mIconPlay ); - mPlayStopButton.SetSelectedImage( mIconPlaySelected ); + mPlayStopButton.SetUnselectedImage( PLAY_ICON ); + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED ); mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked ); mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); @@ -350,14 +334,14 @@ bool DissolveEffectApp::OnEffectButtonClicked( Toolkit::Button button ) if(mUseHighPrecision) { mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_HIGHP) ); - mEffectChangeButton.SetButtonImage( mIconHighP ); - mEffectChangeButton.SetSelectedImage( mIconHighPSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_HIGHP_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_HIGHP_IMAGE_SELECTED ); } else { mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_MEDIUMP) ); - mEffectChangeButton.SetButtonImage( mIconMediumP ); - mEffectChangeButton.SetSelectedImage( mIconMediumPSelected ); + mEffectChangeButton.SetUnselectedImage( EFFECT_MEDIUMP_IMAGE ); + mEffectChangeButton.SetSelectedImage( EFFECT_MEDIUMP_IMAGE_SELECTED ); } return true; @@ -368,16 +352,16 @@ bool DissolveEffectApp::OnSildeshowButtonClicked( Toolkit::Button button ) mSlideshow = !mSlideshow; if( mSlideshow ) { - mPlayStopButton.SetButtonImage( mIconStop ); - mPlayStopButton.SetSelectedImage( mIconStopSelected ); + mPlayStopButton.SetUnselectedImage( STOP_ICON ); + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED ); mPanGestureDetector.Detach( mParent ); mViewTimer.Start(); mTimerReady = false; } else { - mPlayStopButton.SetButtonImage( mIconPlay ); - mPlayStopButton.SetSelectedImage( mIconPlaySelected ); + mPlayStopButton.SetUnselectedImage( PLAY_ICON ); + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED ); mTimerReady = true; mPanGestureDetector.Attach( mParent ); } diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index 49ba4ed..32c1dbd 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -171,7 +171,7 @@ public: // Background image: ResourceImage backgroundImage = ResourceImage::New( BACKGROUND_IMAGE, ImageDimensions( stage.GetSize().width, stage.GetSize().height ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR ); - ImageActor background = ImageActor::New( backgroundImage ); + Toolkit::ImageView background = Toolkit::ImageView::New( backgroundImage ); background.SetZ( -2.0f ); background.SetAnchorPoint( AnchorPoint::TOP_LEFT ); background.SetSize( stage.GetSize() ); @@ -192,34 +192,34 @@ public: widthPixel[1] = 0x4f; widthPixel[2] = 0x4f; - mHeightBox = ImageActor::New( heightBackground ); + mHeightBox = Toolkit::ImageView::New( heightBackground ); mHeightBox.SetOpacity( 0.2f ); stage.Add( mHeightBox ); - mWidthBox = ImageActor::New( widthBackground ); + mWidthBox = Toolkit::ImageView::New( widthBackground ); mWidthBox.SetOpacity( 0.2f ); stage.Add( mWidthBox ); - mDesiredBox = ImageActor::New( desiredBackground ); + mDesiredBox = Toolkit::ImageView::New( desiredBackground ); stage.Add( mDesiredBox ); mDesiredBox.SetSize( stage.GetSize() * mImageStageScale ); mDesiredBox.SetParentOrigin( ParentOrigin::CENTER ); mDesiredBox.SetAnchorPoint( AnchorPoint::CENTER ); mDesiredBox.SetPosition( 0, 0, -1 ); - mDesiredBox.SetSortModifier(4.f); + //mDesiredBox.SetSortModifier(4.f); mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height ); mHeightBox.SetParentOrigin( ParentOrigin::CENTER ); mHeightBox.SetAnchorPoint( AnchorPoint::CENTER ); mHeightBox.SetPosition( 0, 0, -1 ); - mHeightBox.SetSortModifier(3.f); + //mHeightBox.SetSortModifier(3.f); mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height ); mWidthBox.SetParentOrigin( ParentOrigin::CENTER ); mWidthBox.SetAnchorPoint( AnchorPoint::CENTER ); mWidthBox.SetPosition( 0, 0, -1 ); - mWidthBox.SetSortModifier(2.f); + //mWidthBox.SetSortModifier(2.f); // Make a grab-handle for resizing the image: mGrabCorner = Toolkit::PushButton::New(); @@ -284,7 +284,7 @@ public: // Back and next image buttons in corners of stage: unsigned int playWidth = std::min( stage.GetSize().x * (1 / 5.0f), 58.0f ); Image playImage = ResourceImage::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ), FittingMode::SHRINK_TO_FIT, SamplingMode::BOX_THEN_LINEAR ); - Actor imagePrevious = ImageActor::New( playImage ); + Toolkit::ImageView imagePrevious = Toolkit::ImageView::New( playImage ); // Last image button: imagePrevious.SetAnchorPoint( AnchorPoint::TOP_LEFT ); @@ -297,7 +297,7 @@ public: imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Next image button: - Actor imageNext = ImageActor::New( playImage ); + Toolkit::ImageView imageNext = Toolkit::ImageView::New( playImage ); imageNext.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); imageNext.SetY( playWidth * 0.5f ); imageNext.SetX( stage.GetSize().x - playWidth * 0.5f ); @@ -337,7 +337,6 @@ public: fittingModeGroup.Add( label ); Toolkit::PushButton button = CreateButton( FITTING_BUTTON_ID, StringFromScalingMode( mFittingMode ) ); - button.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); fittingModeGroup.Add( button ); mFittingModeButton = button; @@ -359,7 +358,6 @@ public: samplingModeGroup.Add( label ); Toolkit::PushButton button = CreateButton( SAMPLING_BUTTON_ID, StringFromFilterMode( mSamplingMode ) ); - button.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); samplingModeGroup.Add( button ); mSamplingModeButton = button; @@ -372,7 +370,7 @@ public: Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); button.SetName( id ); - button.SetLabel( label ); + button.SetLabelText( label ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &ImageScalingAndFilteringController::OnButtonClicked ); @@ -401,9 +399,7 @@ public: { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( id ); - button.SetLabel( id ); - Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( button.GetLabel() ); - textLabel.SetProperty( TextLabel::Property::POINT_SIZE, 12.0f ); + button.SetLabelText( id ); button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); button.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); @@ -492,8 +488,7 @@ public: if( button.GetName() == modeName ) { mFittingMode = mode; - mFittingModeButton.SetLabel( modeName ); - mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mFittingModeButton.SetLabelText( modeName ); ResizeImage(); mPopup.Hide(); mPopup.Reset(); @@ -508,8 +503,7 @@ public: if( button.GetName() == modeName ) { mSamplingMode = mode; - mSamplingModeButton.SetLabel( modeName ); - mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mSamplingModeButton.SetLabelText( modeName ); ResizeImage(); mPopup.Hide(); mPopup.Reset(); @@ -657,15 +651,13 @@ public: else if ( event.keyPressedName == "f" ) { mSamplingMode = NextFilterMode( mSamplingMode ); - mSamplingModeButton.SetLabel( StringFromFilterMode( mSamplingMode ) ); - mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mSamplingModeButton.SetLabelText( StringFromFilterMode( mSamplingMode ) ); } // Cycle filter and scaling modes: else if ( event.keyPressedName == "s" ) { mFittingMode = NextScalingMode( mFittingMode ); - mFittingModeButton.SetLabel( StringFromScalingMode( mFittingMode ) ); - mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mFittingModeButton.SetLabelText( StringFromScalingMode( mFittingMode ) ); } else { @@ -697,9 +689,9 @@ private: private: Application& mApplication; - ImageActor mDesiredBox; //< Background rectangle to show requested image size. - ImageActor mHeightBox; //< Background horizontal stripe to show requested image height. - ImageActor mWidthBox; //< Background vertical stripe to show requested image width. + Toolkit::ImageView mDesiredBox; //< Background rectangle to show requested image size. + Toolkit::ImageView mHeightBox; //< Background horizontal stripe to show requested image height. + Toolkit::ImageView mWidthBox; //< Background vertical stripe to show requested image width. Toolkit::PushButton mFittingModeButton; Toolkit::PushButton mSamplingModeButton; Toolkit::Popup mPopup; diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index ffa597b..0c0bf86 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -24,7 +24,7 @@ * reduce the image to save memory, improve performance, and potentially display * a better small version of the image than if the default size were loaded. * - * The functions CreateImage and CreateImageActor below show how to build an + * The functions CreateImage and CreateImageView below show how to build an * image using a scaling mode to have %Dali resize it during loading. * * This demo defaults to the SCALE_TO_FILL mode of ImageAttributes which makes @@ -38,7 +38,7 @@ * grid using the button in the top-right of the toolbar. * A single image can be cycled by clicking the image directly. * - * @see CreateImage CreateImageActor + * @see CreateImage CreateImageView */ // EXTERNAL INCLUDES @@ -186,17 +186,17 @@ Image CreateImage(const std::string& filename, unsigned int width, unsigned int } /** - * Creates an ImageActor + * Creates an ImageView * * @param[in] filename The path of the image. * @param[in] width The width of the image in pixels. * @param[in] height The height of the image in pixels. * @param[in] fittingMode The mode to use when scaling the image to fit the desired dimensions. */ -ImageActor CreateImageActor(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode ) +ImageView CreateImageView(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode ) { Image img = CreateImage( filename, width, height, fittingMode ); - ImageActor actor = ImageActor::New( img ); + ImageView actor = ImageView::New( img ); actor.SetName( filename ); actor.SetParentOrigin(ParentOrigin::CENTER); actor.SetAnchorPoint(AnchorPoint::CENTER); @@ -306,11 +306,9 @@ public: "" ); // Create an image scaling toggle button. (right of toolbar) - Image toggleScalingImage = ResourceImage::New( TOGGLE_SCALING_IMAGE ); - Image toggleScalingImageSelected = ResourceImage::New( TOGGLE_SCALING_IMAGE_SELECTED ); Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New(); - toggleScalingButton.SetButtonImage( toggleScalingImage ); - toggleScalingButton.SetSelectedImage( toggleScalingImageSelected ); + toggleScalingButton.SetUnselectedImage( TOGGLE_SCALING_IMAGE ); + toggleScalingButton.SetSelectedImage( TOGGLE_SCALING_IMAGE_SELECTED ); toggleScalingButton.ClickedSignal().Connect( this, &ImageScalingIrregularGridController::OnToggleScalingTouched ); mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -460,7 +458,7 @@ public: const Vector2 imageRegionCorner = gridOrigin + cellSize * Vector2( imageSource.cellX, imageSource.cellY ); const Vector2 imagePosition = imageRegionCorner + Vector2( GRID_CELL_PADDING , GRID_CELL_PADDING ) + imageSize * 0.5f; - ImageActor image = CreateImageActor( imageSource.configuration.path, imageSize.x, imageSize.y, fittingMode ); + ImageView image = CreateImageView( imageSource.configuration.path, imageSize.x, imageSize.y, fittingMode ); image.SetPosition( Vector3( imagePosition.x, imagePosition.y, 0 ) ); image.SetSize( imageSize ); image.TouchedSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); @@ -495,10 +493,10 @@ public: Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] ); const Vector2 imageSize = mSizes[actor.GetId()]; - ImageActor imageActor = ImageActor::DownCast( actor ); - Image oldImage = imageActor.GetImage(); + ImageView imageView = ImageView::DownCast( actor ); + Image oldImage = imageView.GetImage(); Image newImage = CreateImage( ResourceImage::DownCast(oldImage).GetUrl(), imageSize.width + 0.5f, imageSize.height + 0.5f, newMode ); - imageActor.SetImage( newImage ); + imageView.SetImage( newImage ); mFittingModes[id] = newMode; } } @@ -532,17 +530,17 @@ public: for( unsigned i = 0; i < numChildren; ++i ) { - ImageActor gridImageActor = ImageActor::DownCast( mGridActor.GetChildAt( i ) ); - if( gridImageActor ) + ImageView gridImageView = ImageView::DownCast( mGridActor.GetChildAt( i ) ); + if( gridImageView ) { // Cycle the scaling mode options: - const Vector2 imageSize = mSizes[gridImageActor.GetId()]; - Dali::FittingMode::Type newMode = NextMode( mFittingModes[gridImageActor.GetId()] ); - Image oldImage = gridImageActor.GetImage(); + const Vector2 imageSize = mSizes[gridImageView.GetId()]; + Dali::FittingMode::Type newMode = NextMode( mFittingModes[gridImageView.GetId()] ); + Image oldImage = gridImageView.GetImage(); Image newImage = CreateImage(ResourceImage::DownCast(oldImage).GetUrl(), imageSize.width, imageSize.height, newMode ); - gridImageActor.SetImage( newImage ); + gridImageView.SetImage( newImage ); - mFittingModes[gridImageActor.GetId()] = newMode; + mFittingModes[gridImageView.GetId()] = newMode; SetTitle( std::string( newMode == FittingMode::SHRINK_TO_FIT ? "SHRINK_TO_FIT" : newMode == FittingMode::SCALE_TO_FILL ? "SCALE_TO_FILL" : newMode == FittingMode::FIT_WIDTH ? "FIT_WIDTH" : "FIT_HEIGHT" ) ); } diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index 51a6588..7820ebf 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -231,16 +231,16 @@ public: // Create an edit mode button. (left of toolbar) Toolkit::PushButton editButton = Toolkit::PushButton::New(); - editButton.SetButtonImage( ResourceImage::New( EDIT_IMAGE ) ); - editButton.SetSelectedImage( ResourceImage::New( EDIT_IMAGE_SELECTED ) ); + editButton.SetUnselectedImage( EDIT_IMAGE ); + editButton.SetSelectedImage( EDIT_IMAGE_SELECTED ); editButton.ClickedSignal().Connect( this, &ItemViewExample::OnModeButtonClicked); editButton.SetLeaveRequired( true ); mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Create a layout toggle button. (right of toolbar) mLayoutButton = Toolkit::PushButton::New(); - mLayoutButton.SetButtonImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE ) ); - mLayoutButton.SetSelectedImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE_SELECTED ) ); + mLayoutButton.SetUnselectedImage( SPIRAL_LAYOUT_IMAGE ); + mLayoutButton.SetSelectedImage(SPIRAL_LAYOUT_IMAGE_SELECTED ); mLayoutButton.ClickedSignal().Connect( this, &ItemViewExample::OnLayoutButtonClicked); mLayoutButton.SetLeaveRequired( true ); mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -251,9 +251,9 @@ public: mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D ); - mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) ); - mDeleteButton.SetSelectedImage( ResourceImage::New( DELETE_IMAGE_SELECTED ) ); - mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) ); + mDeleteButton.SetUnselectedImage( DELETE_IMAGE ); + mDeleteButton.SetSelectedImage( DELETE_IMAGE_SELECTED ); + mDeleteButton.SetBackgroundImage( TOOLBAR_IMAGE ); mDeleteButton.SetSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) ); mDeleteButton.ClickedSignal().Connect( this, &ItemViewExample::OnDeleteButtonClicked); mDeleteButton.SetLeaveRequired( true ); @@ -266,9 +266,9 @@ public: mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D ); - mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) ); - mInsertButton.SetSelectedImage( ResourceImage::New( INSERT_IMAGE_SELECTED ) ); - mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) ); + mInsertButton.SetUnselectedImage( INSERT_IMAGE ); + mInsertButton.SetSelectedImage( INSERT_IMAGE_SELECTED ); + mInsertButton.SetBackgroundImage( TOOLBAR_IMAGE ); mInsertButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f ); mInsertButton.ClickedSignal().Connect( this, &ItemViewExample::OnInsertButtonClicked); mInsertButton.SetLeaveRequired( true ); @@ -281,9 +281,9 @@ public: mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D ); - mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) ); - mReplaceButton.SetSelectedImage( ResourceImage::New( REPLACE_IMAGE_SELECTED ) ); - mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) ); + mReplaceButton.SetUnselectedImage( REPLACE_IMAGE ); + mReplaceButton.SetSelectedImage( REPLACE_IMAGE_SELECTED ); + mReplaceButton.SetBackgroundImage( TOOLBAR_IMAGE ); mReplaceButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f ); mReplaceButton.ClickedSignal().Connect( this, &ItemViewExample::OnReplaceButtonClicked); mReplaceButton.SetLeaveRequired( true ); @@ -812,22 +812,22 @@ public: { case SPIRAL_LAYOUT: { - mLayoutButton.SetButtonImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE ) ); - mLayoutButton.SetSelectedImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE_SELECTED ) ); + mLayoutButton.SetUnselectedImage( SPIRAL_LAYOUT_IMAGE ); + mLayoutButton.SetSelectedImage( SPIRAL_LAYOUT_IMAGE_SELECTED ); break; } case GRID_LAYOUT: { - mLayoutButton.SetButtonImage( ResourceImage::New( GRID_LAYOUT_IMAGE ) ); - mLayoutButton.SetSelectedImage( ResourceImage::New( GRID_LAYOUT_IMAGE_SELECTED ) ); + mLayoutButton.SetUnselectedImage( GRID_LAYOUT_IMAGE ); + mLayoutButton.SetSelectedImage( GRID_LAYOUT_IMAGE_SELECTED ); break; } case DEPTH_LAYOUT: { - mLayoutButton.SetButtonImage( ResourceImage::New( DEPTH_LAYOUT_IMAGE ) ); - mLayoutButton.SetSelectedImage( ResourceImage::New( DEPTH_LAYOUT_IMAGE_SELECTED ) ); + mLayoutButton.SetUnselectedImage( DEPTH_LAYOUT_IMAGE ); + mLayoutButton.SetSelectedImage( DEPTH_LAYOUT_IMAGE_SELECTED ); break; } diff --git a/examples/logging/logging-example.cpp b/examples/logging/logging-example.cpp index 96fc30c..ee4643d 100644 --- a/examples/logging/logging-example.cpp +++ b/examples/logging/logging-example.cpp @@ -285,7 +285,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( CREATE_BUTTON_ID ); - button.SetLabel( CREATE_BUTTON_TEXT ); + button.SetLabelText( CREATE_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -296,7 +296,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( DELETE_BUTTON_ID ); - button.SetLabel( DELETE_BUTTON_TEXT ); + button.SetLabelText( DELETE_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -318,7 +318,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( START_BUTTON_ID ); - button.SetLabel( START_BUTTON_TEXT ); + button.SetLabelText( START_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -329,7 +329,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( STOP_BUTTON_ID ); - button.SetLabel( STOP_BUTTON_TEXT ); + button.SetLabelText( STOP_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -350,7 +350,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( ENABLE_BUTTON_ID ); - button.SetLabel( ENABLE_BUTTON_TEXT ); + button.SetLabelText( ENABLE_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -361,7 +361,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( DISABLE_BUTTON_ID ); - button.SetLabel( DISABLE_BUTTON_TEXT ); + button.SetLabelText( DISABLE_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -444,7 +444,7 @@ class LoggingController: public ConnectionTracker { Toolkit::PushButton button = Toolkit::PushButton::New(); button.SetName( VSYNC_BUTTON_ID ); - button.SetLabel( VSYNC_BUTTON_TEXT ); + button.SetLabelText( VSYNC_BUTTON_TEXT ); button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked ); @@ -464,9 +464,7 @@ class LoggingController: public ConnectionTracker << ", " << ((mLoggerStates[i].isTiming) ? "Started" : "Stopped") << ", " << ((mLoggerStates[i].isEnabled) ? "Enabled" : "Disabled"); - Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( ss.str() ); - - mLogRadioButtons[i].SetLabel( textLabel ); + mLogRadioButtons[i].SetLabelText( ss.str() ); } } diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index b2d14e9..d19e7a6 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -166,23 +166,17 @@ public: APPLICATION_TITLE ); //Add an effects icon on the right of the title - mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON ); - mIconEffectsOffSelected = ResourceImage::New( EFFECTS_OFF_ICON_SELECTED ); - mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON ); - mIconEffectsOnSelected = ResourceImage::New( EFFECTS_ON_ICON_SELECTED ); mActorEffectsButton = Toolkit::PushButton::New(); - mActorEffectsButton.SetButtonImage( mIconEffectsOff ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON ); + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED ); mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked ); mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); // Creates a mode button. // Create a effect toggle button. (right of toolbar) - Image imageLayout = ResourceImage::New( LAYOUT_IMAGE ); - Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED ); Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); - layoutButton.SetButtonImage( imageLayout ); - layoutButton.SetSelectedImage( imageLayoutSelected ); + layoutButton.SetUnselectedImage( LAYOUT_IMAGE ); + layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED ); layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked); layoutButton.SetLeaveRequired( true ); mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -455,14 +449,14 @@ public: if(!mActorEffectsEnabled) { mActorEffectsEnabled = true; - mActorEffectsButton.SetButtonImage( mIconEffectsOn ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected ); + mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON ); + mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED ); } else { mActorEffectsEnabled = false; - mActorEffectsButton.SetButtonImage( mIconEffectsOff ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON ); + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED ); } } @@ -522,10 +516,6 @@ private: Application& mApplication; ///< Application instance Toolkit::Control mView; Toolkit::ToolBar mToolBar; - Image mIconEffectsOff; - Image mIconEffectsOffSelected; - Image mIconEffectsOn; - Image mIconEffectsOnSelected; Layer mContentLayer; ///< Content layer (contains actor for this blur demo) diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index 9653df0..7d03875 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -140,23 +140,17 @@ public: APPLICATION_TITLE ); //Add an slideshow icon on the right of the title - mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON ); - mIconEffectsOffSelected = ResourceImage::New( EFFECTS_OFF_ICON_SELECTED ); - mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON ); - mIconEffectsOnSelected = ResourceImage::New( EFFECTS_ON_ICON_SELECTED ); mActorEffectsButton = Toolkit::PushButton::New(); - mActorEffectsButton.SetButtonImage( mIconEffectsOff ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON ); + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED ); mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked ); mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); // Creates a mode button. // Create a effect toggle button. (right of toolbar) - Image imageLayout = ResourceImage::New( LAYOUT_IMAGE ); - Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED ); Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); - layoutButton.SetButtonImage( imageLayout ); - layoutButton.SetSelectedImage( imageLayoutSelected ); + layoutButton.SetUnselectedImage( LAYOUT_IMAGE ); + layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED ); layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked); layoutButton.SetLeaveRequired( true ); mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -349,14 +343,14 @@ public: if(!mActorEffectsEnabled) { mActorEffectsEnabled = true; - mActorEffectsButton.SetButtonImage( mIconEffectsOn ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected ); + mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON ); + mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED ); } else { mActorEffectsEnabled = false; - mActorEffectsButton.SetButtonImage( mIconEffectsOff ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); + mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON ); + mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED ); } } @@ -416,10 +410,6 @@ private: Application& mApplication; ///< Application instance Toolkit::Control mView; Toolkit::ToolBar mToolBar; - Image mIconEffectsOff; - Image mIconEffectsOffSelected; - Image mIconEffectsOn; - Image mIconEffectsOnSelected; Layer mContentLayer; ///< Content layer (contains actor for this stretch demo) PushButton mActorEffectsButton; ///< The actor effects toggling Button. diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index a8d6e0b..966f526 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.cpp @@ -124,7 +124,7 @@ public: void AddBlendingImageActor(); void AddTextLabel(); - ImageActor CreateBlurredMirrorImage(const char* imageName); + ImageView CreateBlurredMirrorImage(const char* imageName); FrameBufferImage CreateFrameBufferForImage(const char* imageName, Image image, ShaderEffect shaderEffect); void SetUpBubbleEmission( const Vector2& emitPosition, const Vector2& direction ); Geometry CreateMeshGeometry(); @@ -199,8 +199,8 @@ void NewWindowController::Create( Application& app ) } mLoseContextButton = Toolkit::PushButton::New(); - mLoseContextButton.SetButtonImage( ResourceImage::New( LOSE_CONTEXT_IMAGE ) ); - mLoseContextButton.SetSelectedImage( ResourceImage::New( LOSE_CONTEXT_IMAGE_SELECTED ) ); + mLoseContextButton.SetUnselectedImage( LOSE_CONTEXT_IMAGE ); + mLoseContextButton.SetSelectedImage( LOSE_CONTEXT_IMAGE_SELECTED ); mLoseContextButton.ClickedSignal().Connect( this, &NewWindowController::OnLoseContextButtonClicked ); mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -211,16 +211,16 @@ void NewWindowController::Create( Application& app ) mContentLayer.Add(logoLayoutActor); Image image = ResourceImage::New(LOGO_IMAGE); - ImageActor imageActor = ImageActor::New(image); - imageActor.SetName("dali-logo"); - imageActor.SetParentOrigin(ParentOrigin::CENTER); - imageActor.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER); - logoLayoutActor.Add(imageActor); + ImageView imageView = ImageView::New(image); + imageView.SetName("dali-logo"); + imageView.SetParentOrigin(ParentOrigin::CENTER); + imageView.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER); + logoLayoutActor.Add(imageView); - ImageActor mirrorImageActor = CreateBlurredMirrorImage(LOGO_IMAGE); - mirrorImageActor.SetParentOrigin(ParentOrigin::CENTER); - mirrorImageActor.SetAnchorPoint(AnchorPoint::TOP_CENTER); - logoLayoutActor.Add(mirrorImageActor); + ImageView mirrorImageView = CreateBlurredMirrorImage(LOGO_IMAGE); + mirrorImageView.SetParentOrigin(ParentOrigin::CENTER); + mirrorImageView.SetAnchorPoint(AnchorPoint::TOP_CENTER); + logoLayoutActor.Add(mirrorImageView); AddBubbles(stage.GetSize()); AddMeshActor(); @@ -300,7 +300,7 @@ void NewWindowController::AddBlendingImageActor() Image effectImage = ResourceImage::New(EFFECT_IMAGE); FrameBufferImage fb2 = CreateFrameBufferForImage( EFFECT_IMAGE, effectImage, colorModifier ); - ImageActor tmpActor = ImageActor::New(fb2); + ImageView tmpActor = ImageView::New(fb2); mContentLayer.Add(tmpActor); tmpActor.SetParentOrigin(ParentOrigin::CENTER_RIGHT); tmpActor.SetAnchorPoint(AnchorPoint::TOP_RIGHT); @@ -331,7 +331,7 @@ void NewWindowController::AddTextLabel() mContentLayer.Add( mTextActor ); } -ImageActor NewWindowController::CreateBlurredMirrorImage(const char* imageName) +ImageView NewWindowController::CreateBlurredMirrorImage(const char* imageName) { Image image = ResourceImage::New(imageName); @@ -346,7 +346,7 @@ ImageActor NewWindowController::CreateBlurredMirrorImage(const char* imageName) Stage::GetCurrent().Add(gbv); gbv.ActivateOnce(); - ImageActor blurredActor = ImageActor::New(fbo); + ImageView blurredActor = ImageView::New(fbo); blurredActor.SetSize(FBOSize); blurredActor.SetScale(1.0f, -1.0f, 1.0f); return blurredActor; diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp index 95f27e4..9f5b9fa 100644 --- a/examples/radial-menu/radial-menu-example.cpp +++ b/examples/radial-menu/radial-menu-example.cpp @@ -104,16 +104,12 @@ private: // Member variables Application mApplication; ///< The application handle Toolkit::Control mView; ///< The toolbar view Layer mContents; ///< The toolbar contents pane - ImageActor mImageActor; ///< Image actor shown by stencil mask + ImageView mImageView; ///< Image view shown by stencil mask Animation mAnimation; AnimState mAnimationState; - Image mIconPlay; - Image mIconPlaySelected; - Image mIconStop; - Image mIconStopSelected; Toolkit::PushButton mPlayStopButton; - ImageActor mDialActor; + ImageView mDialView; RadialSweepView mRadialSweepView1; RadialSweepView mRadialSweepView2; RadialSweepView mRadialSweepView3; @@ -148,13 +144,9 @@ void RadialMenuExample::OnInit(Application& app) TOOLBAR_IMAGE, APPLICATION_TITLE ); - mIconPlay = ResourceImage::New( PLAY_ICON ); - mIconPlaySelected = ResourceImage::New( PLAY_ICON_SELECTED ); - mIconStop = ResourceImage::New( STOP_ICON ); - mIconStopSelected = ResourceImage::New( STOP_ICON_SELECTED ); mPlayStopButton = Toolkit::PushButton::New(); - mPlayStopButton.SetButtonImage( mIconStop ); - mPlayStopButton.SetSelectedImage( mIconStopSelected ); + mPlayStopButton.SetUnselectedImage( STOP_ICON ); + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED ); mPlayStopButton.ClickedSignal().Connect( this, &RadialMenuExample::OnButtonClicked ); @@ -181,13 +173,13 @@ void RadialMenuExample::OnInit(Application& app) mRadialSweepView3.SetFinalActorAngle(Degree(0)); Image dial = ResourceImage::New( TEST_DIAL_FILENAME ); - mDialActor = ImageActor::New( dial ); - mDialActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - mDialActor.SetPositionInheritanceMode(USE_PARENT_POSITION); - mDialActor.SetScale(scale); + mDialView = ImageView::New( dial ); + mDialView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); + mDialView.SetPositionInheritanceMode(USE_PARENT_POSITION); + mDialView.SetScale(scale); Layer dialLayer = Layer::New(); - dialLayer.Add(mDialActor); + dialLayer.Add( mDialView ); dialLayer.SetPositionInheritanceMode(USE_PARENT_POSITION); dialLayer.SetSize(stage.GetSize()); mContents.Add(dialLayer); @@ -201,13 +193,13 @@ void RadialMenuExample::OnInit(Application& app) void RadialMenuExample::StartAnimation() { - mDialActor.SetOpacity(0.0f); + mDialView.SetOpacity(0.0f); mRadialSweepView1.SetOpacity(0.0f); mAnimation = Animation::New(6.0f); mRadialSweepView1.Activate(mAnimation, 0.0f, 3.0f); mRadialSweepView2.Activate(mAnimation, 1.5f, 3.0f); mRadialSweepView3.Activate(mAnimation, 3.0f, 3.0f); - mAnimation.AnimateTo( Property( mDialActor, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN, TimePeriod( 0.0f, 0.8f ) ); + mAnimation.AnimateTo( Property( mDialView, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN, TimePeriod( 0.0f, 0.8f ) ); mAnimation.AnimateTo( Property( mRadialSweepView1, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN, TimePeriod( 0.0f, 0.5f ) ); mAnimation.FinishedSignal().Connect( this, &RadialMenuExample::OnAnimationFinished ); @@ -223,8 +215,8 @@ bool RadialMenuExample::OnButtonClicked( Toolkit::Button button ) { mAnimation.Pause(); mAnimationState = PAUSED; - mPlayStopButton.SetButtonImage( mIconPlay ); - mPlayStopButton.SetSelectedImage( mIconPlaySelected ); + mPlayStopButton.SetUnselectedImage( PLAY_ICON ); + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED ); } break; @@ -232,15 +224,15 @@ bool RadialMenuExample::OnButtonClicked( Toolkit::Button button ) { mAnimation.Play(); mAnimationState = PLAYING; - mPlayStopButton.SetButtonImage( mIconStop ); - mPlayStopButton.SetSelectedImage( mIconStopSelected ); + mPlayStopButton.SetUnselectedImage( STOP_ICON ); + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED ); } break; case STOPPED: { - mPlayStopButton.SetButtonImage( mIconStop ); - mPlayStopButton.SetSelectedImage( mIconStopSelected ); + mPlayStopButton.SetUnselectedImage( STOP_ICON ); + mPlayStopButton.SetSelectedImage( STOP_ICON_SELECTED ); mRadialSweepView1.Deactivate(); mRadialSweepView2.Deactivate(); mRadialSweepView3.Deactivate(); @@ -253,8 +245,8 @@ bool RadialMenuExample::OnButtonClicked( Toolkit::Button button ) void RadialMenuExample::OnAnimationFinished( Animation& source ) { mAnimationState = STOPPED; - mPlayStopButton.SetButtonImage( mIconPlay ); - mPlayStopButton.SetSelectedImage( mIconPlaySelected ); + mPlayStopButton.SetUnselectedImage( PLAY_ICON ); + mPlayStopButton.SetSelectedImage( PLAY_ICON_SELECTED ); } RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName, @@ -263,10 +255,10 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName, { // Create the image Image image = ResourceImage::New(imageName); - mImageActor = ImageActor::New(image); - mImageActor.SetParentOrigin(ParentOrigin::CENTER); - mImageActor.SetAnchorPoint(AnchorPoint::CENTER); - mImageActor.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); + mImageView = ImageView::New(image); + mImageView.SetParentOrigin(ParentOrigin::CENTER); + mImageView.SetAnchorPoint(AnchorPoint::CENTER); + mImageView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); // Create the stencil const ImageDimensions imageSize = ResourceImage::GetImageSize(imageName); @@ -281,8 +273,8 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName, radialSweepView.SetEasingFunction( Dali::AlphaFunction::EASE_IN_OUT ); radialSweepView.SetPositionInheritanceMode(USE_PARENT_POSITION); mContents.Add(radialSweepView); - radialSweepView.Add( mImageActor ); - mImageActor.SetPositionInheritanceMode(USE_PARENT_POSITION); + radialSweepView.Add( mImageView ); + mImageView.SetPositionInheritanceMode(USE_PARENT_POSITION); return radialSweepView; } diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index 39feed3..80bdc0f 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -257,8 +257,8 @@ private: // Add a button to change background. (right of toolbar) mChangeTextureButton = Toolkit::PushButton::New(); - mChangeTextureButton.SetButtonImage( ResourceImage::New( CHANGE_TEXTURE_ICON ) ); - mChangeTextureButton.SetSelectedImage( ResourceImage::New( CHANGE_TEXTURE_ICON_SELECTED ) ); + mChangeTextureButton.SetUnselectedImage( CHANGE_TEXTURE_ICON ); + mChangeTextureButton.SetSelectedImage( CHANGE_TEXTURE_ICON_SELECTED ); mChangeTextureButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeTexture ); toolBar.AddControl( mChangeTextureButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, @@ -266,8 +266,8 @@ private: DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Add a button to change mesh pattern. ( left of bar ) mChangeMeshButton = Toolkit::PushButton::New(); - mChangeMeshButton.SetButtonImage( ResourceImage::New( CHANGE_MESH_ICON ) ); - mChangeMeshButton.SetSelectedImage( ResourceImage::New( CHANGE_MESH_ICON_SELECTED ) ); + mChangeMeshButton.SetUnselectedImage( CHANGE_MESH_ICON ); + mChangeMeshButton.SetSelectedImage( CHANGE_MESH_ICON_SELECTED ); mChangeMeshButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeMesh ); toolBar.AddControl( mChangeMeshButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index ce27bc4..c37a45d 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -173,14 +173,14 @@ public: TOOLBAR_IMAGE, "" ); - mEffectIcon[ PageCarouselEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE ); - mEffectIconSelected[ PageCarouselEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED ); - mEffectIcon[ PageCubeEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE ); - mEffectIconSelected[ PageCubeEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED ); - mEffectIcon[ PageSpiralEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE ); - mEffectIconSelected[ PageSpiralEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED ); - mEffectIcon[ PageWaveEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE ); - mEffectIconSelected[ PageWaveEffect ] = ResourceImage::New( EFFECT_CAROUSEL_IMAGE_SELECTED ); + mEffectIcon[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE; + mEffectIconSelected[ PageCarouselEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED; + mEffectIcon[ PageCubeEffect ] = EFFECT_CAROUSEL_IMAGE; + mEffectIconSelected[ PageCubeEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED; + mEffectIcon[ PageSpiralEffect ] = EFFECT_CAROUSEL_IMAGE; + mEffectIconSelected[ PageSpiralEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED; + mEffectIcon[ PageWaveEffect ] = EFFECT_CAROUSEL_IMAGE; + mEffectIconSelected[ PageWaveEffect ] = EFFECT_CAROUSEL_IMAGE_SELECTED; // Create a effect change button. (right of toolbar) mEffectChangeButton = Toolkit::PushButton::New(); @@ -244,7 +244,7 @@ private: ss << APPLICATION_TITLE << ": " << EFFECT_MODE_NAME[mEffectMode]; SetTitle(ss.str()); - mEffectChangeButton.SetButtonImage( mEffectIcon[ mEffectMode ] ); + mEffectChangeButton.SetUnselectedImage( mEffectIcon[ mEffectMode ] ); mEffectChangeButton.SetSelectedImage( mEffectIconSelected[ mEffectMode ] ); // remove old Effect if exists. @@ -286,7 +286,7 @@ private: { for(int column = 0;column(); - mButton.SetLabel( mButtonLabel ); + mButton.SetLabelText( mButtonLabel ); } // Hide & discard the pop-up @@ -175,7 +174,7 @@ public: { Property::Value text = mField.GetProperty( TextField::Property::TEXT ); mButtonLabel = text.Get< std::string >(); - mButton.SetLabel( mButtonLabel ); + mButton.SetLabelText( mButtonLabel ); mField.ClearKeyInputFocus(); } break; diff --git a/examples/text-message-field/text-message-field-example.cpp b/examples/text-message-field/text-message-field-example.cpp index d801c3b..d5ec389 100644 --- a/examples/text-message-field/text-message-field-example.cpp +++ b/examples/text-message-field/text-message-field-example.cpp @@ -77,8 +77,7 @@ public: const Size mTargetActorSize( mStageSize.width, DESKTOP_SIZE.height ); // Create Desktop - ResourceImage backgroundImage = ResourceImage::New( DESKTOP_IMAGE ); - ImageActor desktop = ImageActor::New( backgroundImage ); + ImageView desktop = ImageView::New( DESKTOP_IMAGE ); desktop.SetName("desktopActor"); desktop.SetAnchorPoint( AnchorPoint::TOP_LEFT ); desktop.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 2610fe0..e0cfb6a 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.0.49 +Version: 1.0.50 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/resources/images/folder_appicon_empty_open_bg.png b/resources/images/folder_appicon_empty_open_bg.png new file mode 100644 index 0000000..01764ee --- /dev/null +++ b/resources/images/folder_appicon_empty_open_bg.png diff --git a/resources/scripts/button.json b/resources/scripts/button.json index cfb44df..9b3d46e 100644 --- a/resources/scripts/button.json +++ b/resources/scripts/button.json @@ -26,18 +26,8 @@ "anchor-point": "TOP_CENTER", "position": [0, 0, 0], "size": [400, 200, 0], - "normal-state-actor": { - "type": "ImageActor", - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-brick-1.png" - } - }, - "selected-state-actor": { - "type": "ImageActor", - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-brick-2.png" - } - }, + "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png", + "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png", "label-actor": { "type": "TextLabel", "text": "Normal" @@ -56,24 +46,9 @@ "text": "Disabled" }, "disabled": true, - "normal-state-actor": { - "type": "ImageActor", - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-brick-1.png" - } - }, - "selected-state-actor": { - "type": "ImageActor", - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-brick-2.png" - } - }, - "disabled-state-actor": { - "type": "ImageActor", - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-brick-3.png" - } - } + "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png", + "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png", + "disabled-state-actor": "{DALI_IMAGE_DIR}blocks-brick-3.png" }, // Third Button @@ -89,22 +64,8 @@ "text": "Toggle" }, "togglable": true, - "normal-state-actor": { - "type": "ImageActor", - "style": "STYLE_NINE_PATCH", - "border": [26, 24, 26, 23], - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-brick-1.png" - } - }, - "selected-state-actor": { - "type": "ImageActor", - "style": "STYLE_NINE_PATCH", - "border": [26, 24, 26, 23], - "image": { - "filename": "{DALI_IMAGE_DIR}blocks-paddle.png" - } - }, + "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png", + "selected-state-actor": "{DALI_IMAGE_DIR}blocks-paddle.png", "signals": [{ "name": "selected", "action": "set", diff --git a/resources/scripts/super-blur-view.json b/resources/scripts/super-blur-view.json index a273fc6..a94252c 100644 --- a/resources/scripts/super-blur-view.json +++ b/resources/scripts/super-blur-view.json @@ -70,22 +70,8 @@ "type": "TextLabel", "text": "Blur" }, - "normal-state-actor": { - "type": "ImageActor", - "style": "STYLE_NINE_PATCH", - "border": [26, 24, 26, 23], - "image": { - "filename": "{DALI_IMAGE_DIR}button-background.png" - } - }, - "selected-state-actor": { - "type": "ImageActor", - "style": "STYLE_NINE_PATCH", - "border": [26, 24, 26, 23], - "image": { - "filename": "{DALI_IMAGE_DIR}button-background.png" - } - }, + "unselected-state-actor": "{DALI_IMAGE_DIR}button-background.png", + "selected-state-actor": "{DALI_IMAGE_DIR}button-background.png", "signals": [{ "name": "pressed", "action": "play", diff --git a/resources/style/demo-theme.json b/resources/style/demo-theme.json index 5b35adc..660df77 100644 --- a/resources/style/demo-theme.json +++ b/resources/style/demo-theme.json @@ -53,7 +53,7 @@ distributing this software or its derivatives. "option-divider-size":[2,0], "popup-divider-color":[0.23,0.72,0.8,0.11], "popup-icon-color":[1.0,1.0,1.0,1.0], - "popup-pressed-color":[0.24,0.72,0.8,0.11], + "popup-pressed-color":[0.24,0.72,0.8,0.9], "background-image": { "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png" }