X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fitem-view%2Fitem-view-example.cpp;h=677232dc72a3442b14ad5d6791a66711bd28e518;hb=2e182925204bf3ef9f2a36cbfbf998e79fbafaf5;hp=6172a73eb9553ffc0730a4190bddc0b86bb5e578;hpb=f22c4ec4fc3e7ae6e746d747fc9f49736565840d;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index 6172a73..677232d 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -20,7 +20,6 @@ #include #include -#include #include using namespace Dali; @@ -215,69 +214,69 @@ public: // Create an edit mode button. (left of toolbar) Toolkit::PushButton editButton = Toolkit::PushButton::New(); - editButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EDIT_IMAGE ); - editButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED ); + editButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EDIT_IMAGE ); + editButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED ); editButton.ClickedSignal().Connect( this, &ItemViewExample::OnModeButtonClicked); - editButton.SetLeaveRequired( true ); + editButton.SetProperty( Actor::Property::LEAVE_REQUIRED, 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.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE ); - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED ); + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE ); + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED ); mLayoutButton.ClickedSignal().Connect( this, &ItemViewExample::OnLayoutButtonClicked); - mLayoutButton.SetLeaveRequired( true ); + mLayoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Create a delete button (bottom right of screen) mDeleteButton = Toolkit::PushButton::New(); - mDeleteButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT); - mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); - mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); - mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D ); - mDeleteButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DELETE_IMAGE ); - mDeleteButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DELETE_IMAGE_SELECTED ); + mDeleteButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_RIGHT); + mDeleteButton.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); + mDeleteButton.SetProperty( Actor::Property::POSITION, Vector2( BUTTON_BORDER, BUTTON_BORDER )); + mDeleteButton.SetProperty( Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D ); + mDeleteButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DELETE_IMAGE ); + mDeleteButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DELETE_IMAGE_SELECTED ); mDeleteButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE ); - mDeleteButton.SetSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) ); + mDeleteButton.SetProperty( Actor::Property::SIZE, Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) ); mDeleteButton.ClickedSignal().Connect( this, &ItemViewExample::OnDeleteButtonClicked); - mDeleteButton.SetLeaveRequired( true ); - mDeleteButton.SetVisible( false ); + mDeleteButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); + mDeleteButton.SetProperty( Actor::Property::VISIBLE, false ); stage.Add( mDeleteButton ); // Create an insert button (bottom right of screen) mInsertButton = Toolkit::PushButton::New(); - mInsertButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT); - mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); - mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); - mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D ); - mInsertButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, INSERT_IMAGE ); - mInsertButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, INSERT_IMAGE_SELECTED ); + mInsertButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_RIGHT); + mInsertButton.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); + mInsertButton.SetProperty( Actor::Property::POSITION, Vector2( BUTTON_BORDER, BUTTON_BORDER )); + mInsertButton.SetProperty( Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D ); + mInsertButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, INSERT_IMAGE ); + mInsertButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, INSERT_IMAGE_SELECTED ); mInsertButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE ); - mInsertButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f ); + mInsertButton.SetProperty( Actor::Property::SIZE, Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) ); mInsertButton.ClickedSignal().Connect( this, &ItemViewExample::OnInsertButtonClicked); - mInsertButton.SetLeaveRequired( true ); - mInsertButton.SetVisible( false ); + mInsertButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); + mInsertButton.SetProperty( Actor::Property::VISIBLE, false ); stage.Add( mInsertButton ); // Create an replace button (bottom right of screen) mReplaceButton = Toolkit::PushButton::New(); - mReplaceButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT); - mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); - mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); - mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D ); - mReplaceButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE ); - mReplaceButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE_SELECTED ); + mReplaceButton.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_RIGHT); + mReplaceButton.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::BOTTOM_RIGHT); + mReplaceButton.SetProperty( Actor::Property::POSITION, Vector2( BUTTON_BORDER, BUTTON_BORDER )); + mReplaceButton.SetProperty( Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D ); + mReplaceButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE ); + mReplaceButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE_SELECTED ); mReplaceButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE ); - mReplaceButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f ); + mReplaceButton.SetProperty( Actor::Property::SIZE, Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) ); mReplaceButton.ClickedSignal().Connect( this, &ItemViewExample::OnReplaceButtonClicked); - mReplaceButton.SetLeaveRequired( true ); - mReplaceButton.SetVisible( false ); + mReplaceButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); + mReplaceButton.SetProperty( Actor::Property::VISIBLE, false ); stage.Add( mReplaceButton ); // Create the item view actor mItemView = 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); // Display item view on the stage stage.Add( mItemView ); @@ -356,7 +355,7 @@ public: } case GRID_LAYOUT: { - stage.GetRootLayer().SetBehavior(Layer::LAYER_2D); + stage.GetRootLayer().SetBehavior(Layer::LAYER_UI); break; } } @@ -496,7 +495,7 @@ public: { SetTitle("Edit: Remove Many"); - mDeleteButton.SetVisible( true ); + mDeleteButton.SetProperty( Actor::Property::VISIBLE, true ); mTapDetector = TapGestureDetector::New(); @@ -508,7 +507,7 @@ public: if( box ) { mTapDetector.Attach( child ); - box.SetVisible( true ); + box.SetProperty( Actor::Property::VISIBLE, true ); } } @@ -524,19 +523,19 @@ public: if( box ) { - box.SetVisible( false ); + box.SetProperty( Actor::Property::VISIBLE, false ); Actor tick = box.FindChildByName( "Tick" ); if( tick ) { - tick.SetVisible( false ); + tick.SetProperty( Actor::Property::VISIBLE, false ); } } } mTapDetector.Reset(); - mDeleteButton.SetVisible( false ); + mDeleteButton.SetProperty( Actor::Property::VISIBLE, false ); } void SelectOnTap( Actor actor, const TapGesture& tap ) @@ -544,7 +543,7 @@ public: Actor tick = actor.FindChildByName( "Tick" ); if( tick ) { - tick.SetVisible( !tick.IsVisible() ); + tick.SetProperty( Actor::Property::VISIBLE, !tick.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); } } @@ -586,7 +585,7 @@ public: Actor child = mItemView.GetChildAt( i ); Actor tick = child.FindChildByName( "Tick" ); - if( tick && tick.IsVisible() ) + if( tick && tick.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ) { removeList.push_back( mItemView.GetItemId(child) ); } @@ -632,7 +631,7 @@ public: { SetTitle("Edit: Insert Many"); - mInsertButton.SetVisible( true ); + mInsertButton.SetProperty( Actor::Property::VISIBLE, true ); mTapDetector = TapGestureDetector::New(); @@ -644,7 +643,7 @@ public: if( box ) { mTapDetector.Attach( child ); - box.SetVisible( true ); + box.SetProperty( Actor::Property::VISIBLE, true ); } } @@ -660,19 +659,19 @@ public: if( box ) { - box.SetVisible( false ); + box.SetProperty( Actor::Property::VISIBLE, false ); Actor tick = box.FindChildByName( "Tick" ); if( tick ) { - tick.SetVisible( false ); + tick.SetProperty( Actor::Property::VISIBLE, false ); } } } mTapDetector.Reset(); - mInsertButton.SetVisible( false ); + mInsertButton.SetProperty( Actor::Property::VISIBLE, false ); } bool OnInsertButtonClicked( Toolkit::Button button ) @@ -684,7 +683,7 @@ public: Actor child = mItemView.GetChildAt( i ); Actor tick = child.FindChildByName( "Tick" ); - if( tick && tick.IsVisible() ) + if( tick && tick.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ) { insertList.push_back( Item( mItemView.GetItemId(child), NewItem(rand()) ) ); } @@ -726,7 +725,7 @@ public: { SetTitle("Edit: Replace Many"); - mReplaceButton.SetVisible( true ); + mReplaceButton.SetProperty( Actor::Property::VISIBLE, true ); mTapDetector = TapGestureDetector::New(); @@ -738,7 +737,7 @@ public: if( box ) { mTapDetector.Attach( child ); - box.SetVisible( true ); + box.SetProperty( Actor::Property::VISIBLE, true ); } } @@ -754,19 +753,19 @@ public: if( box ) { - box.SetVisible( false ); + box.SetProperty( Actor::Property::VISIBLE, false ); Actor tick = box.FindChildByName( "Tick" ); if( tick ) { - tick.SetVisible( false ); + tick.SetProperty( Actor::Property::VISIBLE, false ); } } } mTapDetector.Reset(); - mReplaceButton.SetVisible( false ); + mReplaceButton.SetProperty( Actor::Property::VISIBLE, false ); } bool OnReplaceButtonClicked( Toolkit::Button button ) @@ -778,7 +777,7 @@ public: Actor child = mItemView.GetChildAt( i ); Actor tick = child.FindChildByName( "Tick" ); - if( tick && tick.IsVisible() ) + if( tick && tick.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ) { replaceList.push_back( Item( mItemView.GetItemId(child), NewItem(rand()) ) ); } @@ -823,22 +822,22 @@ public: { case SPIRAL_LAYOUT: { - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE ); - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED ); + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE ); + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED ); break; } case GRID_LAYOUT: { - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE ); - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE_SELECTED ); + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE ); + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE_SELECTED ); break; } case DEPTH_LAYOUT: { - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE ); - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE_SELECTED ); + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE ); + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE_SELECTED ); break; } @@ -873,16 +872,16 @@ public: // From ItemFactory propertyMap.Insert(DevelVisual::Property::VISUAL_FITTING_MODE, DevelVisual::FILL); ImageView actor = ImageView::New(); actor.SetProperty( Toolkit::ImageView::Property::IMAGE, propertyMap ); - actor.SetZ( 0.0f ); - actor.SetPosition( INITIAL_OFFSCREEN_POSITION ); + actor.SetProperty( Actor::Property::POSITION_Z, 0.0f ); + actor.SetProperty( Actor::Property::POSITION, INITIAL_OFFSCREEN_POSITION ); // Add a border image child actor ImageView borderActor = ImageView::New(); - borderActor.SetParentOrigin( ParentOrigin::CENTER ); - borderActor.SetAnchorPoint( AnchorPoint::CENTER ); + borderActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + borderActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); borderActor.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); - borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) ); - borderActor.SetColorMode( USE_PARENT_COLOR ); + borderActor.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) ); + borderActor.SetProperty( Actor::Property::COLOR_MODE, USE_PARENT_COLOR ); Property::Map borderProperty; borderProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER ); @@ -900,13 +899,13 @@ public: // From ItemFactory // Add a checkbox child actor; invisible until edit-mode is enabled ImageView checkbox = ImageView::New(); - checkbox.SetName( "CheckBox" ); - checkbox.SetColorMode( USE_PARENT_COLOR ); - checkbox.SetParentOrigin( ParentOrigin::TOP_RIGHT ); - checkbox.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); - checkbox.SetSize( spiralItemSize.width * 0.2f, spiralItemSize.width * 0.2f ); - checkbox.SetPosition( -SELECTION_BORDER_WIDTH, SELECTION_BORDER_WIDTH ); - checkbox.SetZ( 0.1f ); + checkbox.SetProperty( Dali::Actor::Property::NAME, "CheckBox" ); + checkbox.SetProperty( Actor::Property::COLOR_MODE, USE_PARENT_COLOR ); + checkbox.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); + checkbox.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); + checkbox.SetProperty( Actor::Property::SIZE, Vector2( spiralItemSize.width * 0.2f, spiralItemSize.width * 0.2f ) ); + checkbox.SetProperty( Actor::Property::POSITION, Vector2( -SELECTION_BORDER_WIDTH, SELECTION_BORDER_WIDTH )); + checkbox.SetProperty( Actor::Property::POSITION_Z, 0.1f ); Property::Map solidColorProperty; solidColorProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR ); @@ -917,18 +916,18 @@ public: // From ItemFactory MODE_INSERT_MANY != mMode && MODE_REPLACE_MANY != mMode ) { - checkbox.SetVisible( false ); + checkbox.SetProperty( Actor::Property::VISIBLE, false ); } borderActor.Add( checkbox ); ImageView tick = ImageView::New( SELECTED_IMAGE ); - tick.SetName( "Tick" ); - tick.SetColorMode( USE_PARENT_COLOR ); - tick.SetParentOrigin( ParentOrigin::TOP_RIGHT ); - tick.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); - tick.SetSize( spiralItemSize.width * 0.2f, spiralItemSize.width * 0.2f ); - tick.SetZ( 0.2f ); - tick.SetVisible( false ); + tick.SetProperty( Dali::Actor::Property::NAME, "Tick" ); + tick.SetProperty( Actor::Property::COLOR_MODE, USE_PARENT_COLOR ); + tick.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); + tick.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); + tick.SetProperty( Actor::Property::SIZE, Vector2( spiralItemSize.width * 0.2f, spiralItemSize.width * 0.2f ) ); + tick.SetProperty( Actor::Property::POSITION_Z, 0.2f ); + tick.SetProperty( Actor::Property::VISIBLE, false ); checkbox.Add( tick ); // Connect new items for various editing modes