/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
* 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
* 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
#include <algorithm>
#include <map>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <iostream>
// INTERNAL INCLUDES
/** Controls the output of application logging. */
//#define DEBUG_PRINT_DIAGNOSTICS;
-const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" );
-const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
+const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
+const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
const char* APPLICATION_TITLE( "Image Scaling Modes" );
-const char* TOGGLE_SCALING_IMAGE( DALI_IMAGE_DIR "icon-change.png" );
+const char* TOGGLE_SCALING_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
+const char* TOGGLE_SCALING_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
/** The width of the grid in whole grid cells. */
const unsigned GRID_WIDTH = 9;
* show the scaling. */
const char* IMAGE_PATHS[] = {
- DALI_IMAGE_DIR "dali-logo.png",
- DALI_IMAGE_DIR "com.samsung.dali-demo.ico",
- DALI_IMAGE_DIR "square_primitive_shapes.bmp",
- DALI_IMAGE_DIR "gallery-large-14.wbmp",
+ DEMO_IMAGE_DIR "dali-logo.png",
+ DEMO_IMAGE_DIR "com.samsung.dali-demo.ico",
+ DEMO_IMAGE_DIR "square_primitive_shapes.bmp",
+ DEMO_IMAGE_DIR "gallery-large-14.wbmp",
// Images that show aspect ratio changes clearly in primitive shapes:
- DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif",
- DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif",
+ DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif",
+ DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif",
// Images from other demos that are tall, wide or just large:
- DALI_IMAGE_DIR "gallery-large-1.jpg",
- DALI_IMAGE_DIR "gallery-large-2.jpg",
- DALI_IMAGE_DIR "gallery-large-3.jpg",
- DALI_IMAGE_DIR "gallery-large-4.jpg",
- DALI_IMAGE_DIR "gallery-large-5.jpg",
- DALI_IMAGE_DIR "gallery-large-6.jpg",
- DALI_IMAGE_DIR "gallery-large-7.jpg",
- DALI_IMAGE_DIR "gallery-large-8.jpg",
- DALI_IMAGE_DIR "gallery-large-9.jpg",
- DALI_IMAGE_DIR "gallery-large-10.jpg",
- DALI_IMAGE_DIR "gallery-large-11.jpg",
- DALI_IMAGE_DIR "gallery-large-12.jpg",
- DALI_IMAGE_DIR "gallery-large-13.jpg",
- DALI_IMAGE_DIR "gallery-large-14.jpg",
- DALI_IMAGE_DIR "gallery-large-15.jpg",
- DALI_IMAGE_DIR "gallery-large-16.jpg",
- DALI_IMAGE_DIR "gallery-large-17.jpg",
- DALI_IMAGE_DIR "gallery-large-18.jpg",
- DALI_IMAGE_DIR "gallery-large-19.jpg",
- DALI_IMAGE_DIR "gallery-large-20.jpg",
- DALI_IMAGE_DIR "gallery-large-21.jpg",
-
- DALI_IMAGE_DIR "background-1.jpg",
- DALI_IMAGE_DIR "background-2.jpg",
- DALI_IMAGE_DIR "background-3.jpg",
- DALI_IMAGE_DIR "background-4.jpg",
- DALI_IMAGE_DIR "background-5.jpg",
- DALI_IMAGE_DIR "background-blocks.jpg",
- DALI_IMAGE_DIR "background-magnifier.jpg",
-
- DALI_IMAGE_DIR "background-1.jpg",
- DALI_IMAGE_DIR "background-2.jpg",
- DALI_IMAGE_DIR "background-3.jpg",
- DALI_IMAGE_DIR "background-4.jpg",
- DALI_IMAGE_DIR "background-5.jpg",
- DALI_IMAGE_DIR "background-blocks.jpg",
- DALI_IMAGE_DIR "background-magnifier.jpg",
-
- DALI_IMAGE_DIR "book-landscape-cover-back.jpg",
- DALI_IMAGE_DIR "book-landscape-cover.jpg",
- DALI_IMAGE_DIR "book-landscape-p1.jpg",
- DALI_IMAGE_DIR "book-landscape-p2.jpg",
-
- DALI_IMAGE_DIR "book-portrait-cover.jpg",
- DALI_IMAGE_DIR "book-portrait-p1.jpg",
- DALI_IMAGE_DIR "book-portrait-p2.jpg",
+ DEMO_IMAGE_DIR "gallery-large-1.jpg",
+ DEMO_IMAGE_DIR "gallery-large-2.jpg",
+ DEMO_IMAGE_DIR "gallery-large-3.jpg",
+ DEMO_IMAGE_DIR "gallery-large-4.jpg",
+ DEMO_IMAGE_DIR "gallery-large-5.jpg",
+ DEMO_IMAGE_DIR "gallery-large-6.jpg",
+ DEMO_IMAGE_DIR "gallery-large-7.jpg",
+ DEMO_IMAGE_DIR "gallery-large-8.jpg",
+ DEMO_IMAGE_DIR "gallery-large-9.jpg",
+ DEMO_IMAGE_DIR "gallery-large-10.jpg",
+ DEMO_IMAGE_DIR "gallery-large-11.jpg",
+ DEMO_IMAGE_DIR "gallery-large-12.jpg",
+ DEMO_IMAGE_DIR "gallery-large-13.jpg",
+ DEMO_IMAGE_DIR "gallery-large-14.jpg",
+ DEMO_IMAGE_DIR "gallery-large-15.jpg",
+ DEMO_IMAGE_DIR "gallery-large-16.jpg",
+ DEMO_IMAGE_DIR "gallery-large-17.jpg",
+ DEMO_IMAGE_DIR "gallery-large-18.jpg",
+ DEMO_IMAGE_DIR "gallery-large-19.jpg",
+ DEMO_IMAGE_DIR "gallery-large-20.jpg",
+ DEMO_IMAGE_DIR "gallery-large-21.jpg",
+
+ DEMO_IMAGE_DIR "background-1.jpg",
+ DEMO_IMAGE_DIR "background-2.jpg",
+ DEMO_IMAGE_DIR "background-3.jpg",
+ DEMO_IMAGE_DIR "background-4.jpg",
+ DEMO_IMAGE_DIR "background-5.jpg",
+ DEMO_IMAGE_DIR "background-blocks.jpg",
+ DEMO_IMAGE_DIR "background-magnifier.jpg",
+
+ DEMO_IMAGE_DIR "background-1.jpg",
+ DEMO_IMAGE_DIR "background-2.jpg",
+ DEMO_IMAGE_DIR "background-3.jpg",
+ DEMO_IMAGE_DIR "background-4.jpg",
+ DEMO_IMAGE_DIR "background-5.jpg",
+ DEMO_IMAGE_DIR "background-blocks.jpg",
+ DEMO_IMAGE_DIR "background-magnifier.jpg",
+
+ DEMO_IMAGE_DIR "book-landscape-cover-back.jpg",
+ DEMO_IMAGE_DIR "book-landscape-cover.jpg",
+ DEMO_IMAGE_DIR "book-landscape-p1.jpg",
+ DEMO_IMAGE_DIR "book-landscape-p2.jpg",
+
+ DEMO_IMAGE_DIR "book-portrait-cover.jpg",
+ DEMO_IMAGE_DIR "book-portrait-p1.jpg",
+ DEMO_IMAGE_DIR "book-portrait-p2.jpg",
NULL
};
const unsigned NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u;
+
/**
- * Creates an Image
+ * 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.
*/
-Image CreateImage(const std::string& filename, unsigned int width, unsigned int height, Dali::FittingMode::Type fittingMode )
+ImageView CreateImageView(const std::string& filename, int width, int height, Dali::FittingMode::Type fittingMode )
{
-#ifdef DEBUG_PRINT_DIAGNOSTICS
- fprintf( stderr, "CreateImage(%s, %u, %u, fittingMode=%u)\n", filename.c_str(), width, height, unsigned( fittingMode ) );
-#endif
- Image image = ResourceImage::New( filename, ImageDimensions( width, height ), fittingMode, Dali::SamplingMode::BOX_THEN_LINEAR );
- return image;
-}
+ ImageView imageView = ImageView::New();
-/**
- * Creates an ImageActor
- *
- * @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 )
-{
- Image img = CreateImage( filename, width, height, fittingMode );
- ImageActor actor = ImageActor::New( img );
- actor.SetName( filename );
- actor.SetParentOrigin(ParentOrigin::CENTER);
- actor.SetAnchorPoint(AnchorPoint::CENTER);
+ Property::Map map;
+ map[Toolkit::ImageVisual::Property::URL] = filename;
+ map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = width;
+ map[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = height;
+ map[Toolkit::ImageVisual::Property::FITTING_MODE] = fittingMode;
+ imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
+
+ imageView.SetName( filename );
+ imageView.SetParentOrigin(ParentOrigin::CENTER);
+ imageView.SetAnchorPoint(AnchorPoint::CENTER);
- return actor;
+ return imageView;
}
/** Cycle the scaling mode options. */
{
std::cout << "ImageScalingIrregularGridController::Create" << std::endl;
- DemoHelper::RequestThemeChange();
-
// Get a handle to the stage:
Stage stage = Stage::GetCurrent();
"" );
// Create an image scaling toggle button. (right of toolbar)
- Image toggleScalingImage = ResourceImage::New( TOGGLE_SCALING_IMAGE );
Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New();
- toggleScalingButton.SetBackgroundImage( toggleScalingImage );
+ toggleScalingButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE );
+ toggleScalingButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, 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 );
mScrollView.ScrollStartedSignal().Connect( this, &ImageScalingIrregularGridController::OnScrollStarted );
mScrollView.ScrollCompletedSignal().Connect( this, &ImageScalingIrregularGridController::OnScrollCompleted );
- mScrollView.EnableScrollComponent( Scrollable::VerticalScrollBar );
- mScrollView.EnableScrollComponent( Scrollable::HorizontalScrollBar );
-
mScrollView.SetAnchorPoint(AnchorPoint::CENTER);
mScrollView.SetParentOrigin(ParentOrigin::CENTER);
- mScrollView.SetSize( stageSize );//Vector2( stageSize.width, fieldHeight ) );//stageSize );
+ mScrollView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+
mScrollView.SetAxisAutoLock( true );
mScrollView.SetAxisAutoLockGradient( 1.0f );
rulerX->SetDomain( RulerDomain( stageSize.width * -0.125f, stageSize.width * 1.125f ) ); //< Scroll slightly left/right of image field.
mScrollView.SetRulerX ( rulerX );
- RulerPtr rulerY = new DefaultRuler(); //stageSize.height ); //< Snap in multiples of a screen / stage height
+ RulerPtr rulerY = new DefaultRuler(); //< Snap in multiples of a screen / stage height
rulerY->SetDomain( RulerDomain( - fieldHeight * 0.5f + stageSize.height * 0.5f - GRID_CELL_PADDING, fieldHeight * 0.5f + stageSize.height * 0.5f + GRID_CELL_PADDING ) );
mScrollView.SetRulerY ( rulerY );
mScrollView.Add( imageField );
mGridActor = imageField;
+ // Create the scroll bar
+ mScrollBarVertical = ScrollBar::New(Toolkit::ScrollBar::Vertical);
+ mScrollBarVertical.SetParentOrigin(ParentOrigin::TOP_RIGHT);
+ mScrollBarVertical.SetAnchorPoint(AnchorPoint::TOP_RIGHT);
+ mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT);
+ mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH);
+ mScrollView.Add(mScrollBarVertical);
+
+ mScrollBarHorizontal = ScrollBar::New(Toolkit::ScrollBar::Horizontal);
+ mScrollBarHorizontal.SetParentOrigin(ParentOrigin::BOTTOM_LEFT);
+ mScrollBarHorizontal.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ mScrollBarHorizontal.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH);
+ mScrollBarHorizontal.SetOrientation(Quaternion(Radian( 1.5f * Math::PI ), Vector3::ZAXIS));
+ mScrollView.Add(mScrollBarHorizontal);
+
+ mScrollView.OnRelayoutSignal().Connect( this, &ImageScalingIrregularGridController::OnScrollViewRelayout );
+
// Scroll to top of grid so first images loaded are on-screen:
- mScrollView.ScrollTo( Vector3( 0, -1000000, 0 ) );
+ mScrollView.ScrollTo( Vector2( 0, -1000000 ) );
+ }
+
+ void OnScrollViewRelayout(Actor actor)
+ {
+ // Make the height of the horizontal scroll bar to be the same as the width of scroll view.
+ mScrollBarHorizontal.SetSize(Vector2(0.0f, mScrollView.GetRelayoutSize( Dimension::WIDTH) ));
}
/**
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 );
+ image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
mFittingModes[image.GetId()] = fittingMode;
+ mResourceUrls[image.GetId()] = imageSource.configuration.path;
mSizes[image.GetId()] = imageSize;
gridActor.Add( image );
/**
* Upon Touching an image (Release), change its scaling mode and make it spin, provided we're not scrolling.
* @param[in] actor The actor touched
- * @param[in] event The TouchEvent.
+ * @param[in] event The Touch information.
*/
- bool OnTouchImage( Actor actor, const TouchEvent& event )
+ bool OnTouchImage( Actor actor, const TouchData& event )
{
- if( (event.points.size() > 0) && (!mScrolling) )
+ if( ( event.GetPointCount() > 0 ) && ( !mScrolling ) )
{
- TouchPoint point = event.points[0];
- if(point.state == TouchPoint::Up)
+ if( event.GetState( 0 ) == PointState::UP )
{
// Spin the image a few times:
Animation animation = Animation::New(SPIN_DURATION);
- animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunctions::EaseOut );
+ animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT );
animation.Play();
// Change the scaling mode:
Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] );
const Vector2 imageSize = mSizes[actor.GetId()];
- ImageActor imageActor = ImageActor::DownCast( actor );
- Image oldImage = imageActor.GetImage();
- Image newImage = CreateImage( ResourceImage::DownCast(oldImage).GetUrl(), imageSize.width + 0.5f, imageSize.height + 0.5f, newMode );
- imageActor.SetImage( newImage );
+ ImageView imageView = ImageView::DownCast( actor );
+ if( imageView)
+ {
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::IMAGE;
+ map[ImageVisual::Property::URL] = mResourceUrls[id];
+ map[ImageVisual::Property::DESIRED_WIDTH] = imageSize.width + 0.5f;
+ map[ImageVisual::Property::DESIRED_HEIGHT] = imageSize.height + 0.5f;
+ map[ImageVisual::Property::FITTING_MODE] = newMode;
+ imageView.SetProperty( ImageView::Property::IMAGE, map );
+ }
+
mFittingModes[id] = newMode;
}
}
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();
- Image newImage = CreateImage(ResourceImage::DownCast(oldImage).GetUrl(), imageSize.width, imageSize.height, newMode );
- gridImageActor.SetImage( newImage );
+ unsigned int id = gridImageView.GetId();
+
+ const Vector2 imageSize = mSizes[ id ];
+ Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] );
+
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::IMAGE;
+ map[ImageVisual::Property::URL] = mResourceUrls[id];
+ map[ImageVisual::Property::DESIRED_WIDTH] = imageSize.width;
+ map[ImageVisual::Property::DESIRED_HEIGHT] = imageSize.height;
+ map[ImageVisual::Property::FITTING_MODE] = newMode;
+ gridImageView.SetProperty( ImageView::Property::IMAGE, map );
+
+
- mFittingModes[gridImageActor.GetId()] = newMode;
+ mFittingModes[ id ] = 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" ) );
}
* note this state (mScrolling = true)
* @param[in] position Current Scroll Position
*/
- void OnScrollStarted( const Vector3& position )
+ void OnScrollStarted( const Vector2& position )
{
mScrolling = true;
}
* note this state (mScrolling = false).
* @param[in] position Current Scroll Position
*/
- void OnScrollCompleted( const Vector3& position )
+ void OnScrollCompleted( const Vector2& position )
{
mScrolling = false;
}
TextLabel mTitleActor; ///< The Toolbar's Title.
Actor mGridActor; ///< The container for the grid of images
ScrollView mScrollView; ///< ScrollView UI Component
+ ScrollBar mScrollBarVertical;
+ ScrollBar mScrollBarHorizontal;
bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary)
std::map<unsigned, Dali::FittingMode::Type> mFittingModes; ///< Stores the current scaling mode of each image, keyed by image actor id.
+ std::map<unsigned, std::string> mResourceUrls; ///< Stores the url of each image, keyed by image actor id.
std::map<unsigned, Vector2> mSizes; ///< Stores the current size of each image, keyed by image actor id.
};
}
/** Entry point for Linux & Tizen applications */
-int main( int argc, char **argv )
+int DALI_EXPORT_API main( int argc, char **argv )
{
- Application application = Application::New( &argc, &argv );
+ Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
RunTest( application );
projects / platform / core / uifw / dali-demo.git / blobdiff