*/
#include <sstream>
-#include <iostream>
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <cstdlib> // rand
#include "shared/view.h"
#include <dali/dali.h>
const unsigned int NUM_IMAGES = sizeof(IMAGE_PATHS) / sizeof(char*);
-const unsigned int IMAGE_WIDTH = 256;
-const unsigned int IMAGE_HEIGHT = 256;
-const unsigned int NUM_IMAGE_PER_ROW_IN_ATLAS = 8;
-
const char* BACKGROUND_IMAGE( "" );
const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
const char* EDIT_IMAGE( DALI_IMAGE_DIR "icon-edit.png" );
+const char* EDIT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-edit-selected.png" );
const char* SPIRAL_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png" );
+const char* SPIRAL_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-spiral-selected.png" );
const char* GRID_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-grid.png" );
+const char* GRID_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-grid-selected.png" );
const char* DEPTH_LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-item-view-layout-depth.png" );
+const char* DEPTH_LAYOUT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-item-view-layout-depth-selected.png" );
const char* DELETE_IMAGE( DALI_IMAGE_DIR "icon-delete.png" );
+const char* DELETE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-delete-selected.png" );
const char* REPLACE_IMAGE( DALI_IMAGE_DIR "icon-replace.png" );
+const char* REPLACE_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-replace-selected.png" );
const char* INSERT_IMAGE( DALI_IMAGE_DIR "icon-insert.png" );
+const char* INSERT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-insert-selected.png" );
const char* SELECTED_IMAGE( DALI_IMAGE_DIR "item-select-check.png" );
const char* APPLICATION_TITLE( "ItemView" );
const char* GRID_LABEL("Grid");
const char* DEPTH_LABEL("Depth");
-const char* ITEM_BORDER_IMAGE_PATH( DALI_IMAGE_DIR "frame-128x128.png" );
-const Vector3 ITEM_BORDER_MARGIN_SIZE(24, 24, 0);
-
-// These values depend on the border image
-const float ITEM_IMAGE_BORDER_LEFT = 13.0f;
-const float ITEM_IMAGE_BORDER_RIGHT = 13.0f;
-const float ITEM_IMAGE_BORDER_TOP = 13.0f;
-const float ITEM_IMAGE_BORDER_BOTTOM = 13.0f;
+const float ITEM_BORDER_SIZE = 2.0f;
const float DEPTH_LAYOUT_ITEM_SIZE_FACTOR_PORTRAIT = 1.0f;
const float DEPTH_LAYOUT_ITEM_SIZE_FACTOR_LANDSCAPE = 0.8f;
*/
void OnInit(Application& app)
{
- DemoHelper::RequestThemeChange();
-
Stage stage = Dali::Stage::GetCurrent();
stage.KeyEventSignal().Connect(this, &ItemViewExample::OnKeyEvent);
+ stage.GetRootLayer().SetBehavior(Layer::LAYER_3D);
Vector2 stageSize = Stage::GetCurrent().GetSize();
- // Create a border image shared by all the item actors
- mBorderImage = ResourceImage::New(ITEM_BORDER_IMAGE_PATH);
-
// Creates a default view with a default tool bar.
// The view is added to the stage.
+
Layer contents = DemoHelper::CreateView( mApplication,
mView,
mToolBar,
TOOLBAR_IMAGE,
"" );
- app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged );
+ //app.GetWindow().GetOrientation().ChangedSignal().Connect( this, &ItemViewExample::OnOrientationChanged );
// Create an edit mode button. (left of toolbar)
Toolkit::PushButton editButton = Toolkit::PushButton::New();
- editButton.SetBackgroundImage( ResourceImage::New( EDIT_IMAGE ) );
+ 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.SetBackgroundImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE ) );
+ 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 );
mDeleteButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
- mDeleteButton.SetDrawMode( DrawMode::OVERLAY );
- mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) );
- mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
+ mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D );
+ 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 );
mInsertButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
- mInsertButton.SetDrawMode( DrawMode::OVERLAY );
- mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) );
- mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
+ mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D );
+ 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 );
mReplaceButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
- mReplaceButton.SetDrawMode( DrawMode::OVERLAY );
- mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) );
- mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
+ mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D );
+ 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 );
stage.Add( mReplaceButton );
// Create the item view actor
- mImageAtlas = CreateImageAtlas();
mItemView = ItemView::New(*this);
mItemView.SetParentOrigin(ParentOrigin::CENTER);
mItemView.SetAnchorPoint(AnchorPoint::CENTER);
// Display item view on the stage
stage.Add( mItemView );
+ stage.GetRootLayer().SetBehavior( Layer::LAYER_3D );
// Create the layouts
mSpiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
// Set the title and icon to the current layout
SetLayoutTitle();
SetLayoutImage();
-
- // Store one 1x1 white image for multiple items to share for backgrounds:
- mWhiteImage = BufferImage::WHITE();
}
- Actor OnKeyboardPreFocusChange( Actor current, Actor proposed, Control::KeyboardFocusNavigationDirection direction )
+ Actor OnKeyboardPreFocusChange( Actor current, Actor proposed, Control::KeyboardFocus::Direction direction )
{
if ( !current && !proposed )
{
*/
void SetLayout( int layoutId )
{
+ Stage stage = Dali::Stage::GetCurrent();
+ switch( mCurrentLayout )
+ {
+ case SPIRAL_LAYOUT:
+ case DEPTH_LAYOUT:
+ {
+ stage.GetRootLayer().SetBehavior(Layer::LAYER_3D);
+ break;
+ }
+ case GRID_LAYOUT:
+ {
+ stage.GetRootLayer().SetBehavior(Layer::LAYER_2D);
+ break;
+ }
+ }
+
// Set the new orientation to the layout
mItemView.GetLayout(layoutId)->SetOrientation(static_cast<ControlOrientation::Type>(mOrientation / 90));
{
case SPIRAL_LAYOUT:
{
- mLayoutButton.SetBackgroundImage( ResourceImage::New( SPIRAL_LAYOUT_IMAGE ) );
+ mLayoutButton.SetUnselectedImage( SPIRAL_LAYOUT_IMAGE );
+ mLayoutButton.SetSelectedImage( SPIRAL_LAYOUT_IMAGE_SELECTED );
break;
}
case GRID_LAYOUT:
{
- mLayoutButton.SetBackgroundImage( ResourceImage::New( GRID_LAYOUT_IMAGE ) );
+ mLayoutButton.SetUnselectedImage( GRID_LAYOUT_IMAGE );
+ mLayoutButton.SetSelectedImage( GRID_LAYOUT_IMAGE_SELECTED );
break;
}
case DEPTH_LAYOUT:
{
- mLayoutButton.SetBackgroundImage( ResourceImage::New( DEPTH_LAYOUT_IMAGE ) );
+ mLayoutButton.SetUnselectedImage( DEPTH_LAYOUT_IMAGE );
+ mLayoutButton.SetSelectedImage( DEPTH_LAYOUT_IMAGE_SELECTED );
break;
}
*/
virtual Actor NewItem(unsigned int itemId)
{
- // Create an image actor for this item
- unsigned int imageId = itemId % NUM_IMAGES;
- ImageActor::PixelArea pixelArea( (imageId%NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_WIDTH,
- (imageId/NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_HEIGHT,
- IMAGE_WIDTH,
- IMAGE_HEIGHT );
- Actor actor = ImageActor::New(mImageAtlas, pixelArea);
+ // Create an image view for this item
+ ImageView actor = ImageView::New( IMAGE_PATHS[ itemId % NUM_IMAGES ] );
+ actor.SetZ( 0.0f );
actor.SetPosition( INITIAL_OFFSCREEN_POSITION );
// Add a border image child actor
- ImageActor borderActor = ImageActor::New(mBorderImage);
+ ImageView borderActor = ImageView::New();
borderActor.SetParentOrigin( ParentOrigin::CENTER );
borderActor.SetAnchorPoint( AnchorPoint::CENTER );
- borderActor.SetPosition( 0.f, 0.f, 1.f );
- borderActor.SetStyle( ImageActor::STYLE_NINE_PATCH );
- borderActor.SetNinePatchBorder( Vector4( ITEM_IMAGE_BORDER_LEFT, ITEM_IMAGE_BORDER_TOP, ITEM_IMAGE_BORDER_RIGHT, ITEM_IMAGE_BORDER_BOTTOM ) );
- borderActor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); // darken with parent image-actor
borderActor.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS );
- borderActor.SetSizeModeFactor( ITEM_BORDER_MARGIN_SIZE );
+ borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) );
+ borderActor.SetColorMode( USE_PARENT_COLOR );
+
+ Property::Map borderProperty;
+ borderProperty.Insert( "rendererType", "borderRenderer" );
+ borderProperty.Insert( "borderColor", Color::WHITE );
+ borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE );
+ borderActor.SetProperty( ImageView::Property::IMAGE, borderProperty );
+
actor.Add(borderActor);
+
actor.SetKeyboardFocusable( true );
Vector3 spiralItemSize;
static_cast<ItemLayout&>(*mSpiralLayout).GetItemSize( 0u, Vector3( Stage::GetCurrent().GetSize() ), spiralItemSize );
// Add a checkbox child actor; invisible until edit-mode is enabled
-
- ImageActor checkbox = ImageActor::New( mWhiteImage );
+ ImageView checkbox = ImageView::New();
checkbox.SetName( "CheckBox" );
- checkbox.SetColor( Vector4(0.0f,0.0f,0.0f,0.6f) );
+ 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( 1.0f );
+ checkbox.SetZ( 0.1f );
+
+ Property::Map solidColorProperty;
+ solidColorProperty.Insert( "rendererType", "colorRenderer" );
+ solidColorProperty.Insert( "blendColor", Vector4(0.f, 0.f, 0.f, 0.6f) );
+ checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
+
if( MODE_REMOVE_MANY != mMode &&
MODE_INSERT_MANY != mMode &&
MODE_REPLACE_MANY != mMode )
{
checkbox.SetVisible( false );
}
- actor.Add( checkbox );
+ borderActor.Add( checkbox );
- ImageActor tick = ImageActor::New( ResourceImage::New(SELECTED_IMAGE) );
- tick.SetColorMode( USE_OWN_COLOR );
+ 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( 1.0f );
+ tick.SetZ( 0.2f );
tick.SetVisible( false );
checkbox.Add( tick );
private:
/**
- * Create an Atlas to tile the images inside.
- */
- Atlas CreateImageAtlas()
- {
- const unsigned int atlas_width = IMAGE_WIDTH*NUM_IMAGE_PER_ROW_IN_ATLAS;
- const unsigned int atlas_height = IMAGE_HEIGHT*ceil( static_cast<float>(NUM_IMAGES)/ static_cast<float>(NUM_IMAGE_PER_ROW_IN_ATLAS));
- Atlas atlas = Atlas::New(atlas_width, atlas_height, Pixel::RGB888);
-
- for( unsigned int i = 0; i < NUM_IMAGES; i++ )
- {
- atlas.Upload( IMAGE_PATHS[i], (i%NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_WIDTH, (i/NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_HEIGHT );
- }
-
- return atlas;
- }
-
- /**
* Sets/Updates the title of the View
* @param[in] title The new title for the view.
*/
TextLabel mTitleActor; ///< The Toolbar's Title.
ItemView mItemView;
- Image mBorderImage;
- Atlas mImageAtlas;
unsigned int mCurrentLayout;
float mDurationSeconds;
Toolkit::PushButton mDeleteButton;
Toolkit::PushButton mInsertButton;
Toolkit::PushButton mReplaceButton;
-
- BufferImage mWhiteImage;
};
void RunTest(Application& app)
int main(int argc, char **argv)
{
- Application app = Application::New(&argc, &argv);
+ Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
RunTest(app);
projects / platform / core / uifw / dali-demo.git / blobdiff