/*
- * 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.
#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_SELECTED( DALI_IMAGE_DIR "icon-change-selected.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
- *
- * @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 )
-{
-#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;
-}
/**
* Creates an ImageView
* @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.
*/
-ImageView CreateImageView(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 )
{
- Image img = CreateImage( filename, width, height, fittingMode );
- ImageView actor = ImageView::New( img );
- actor.SetName( filename );
- actor.SetParentOrigin(ParentOrigin::CENTER);
- actor.SetAnchorPoint(AnchorPoint::CENTER);
- return actor;
+ ImageView imageView = ImageView::New();
+
+ 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 imageView;
}
/** Cycle the scaling mode options. */
// Create an image scaling toggle button. (right of toolbar)
Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New();
- toggleScalingButton.SetUnselectedImage( TOGGLE_SCALING_IMAGE );
- toggleScalingButton.SetSelectedImage( TOGGLE_SCALING_IMAGE_SELECTED );
+ 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 );
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;
/**
* 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);
Dali::FittingMode::Type newMode = NextMode( mFittingModes[id] );
const Vector2 imageSize = mSizes[actor.GetId()];
- const std::string& url = mResourceUrls[id];
- Image newImage = CreateImage( url, imageSize.width + 0.5f, imageSize.height + 0.5f, newMode );
ImageView imageView = ImageView::DownCast( actor );
- if(imageView)
+ if( imageView)
{
- imageView.SetImage( newImage );
+ 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;
}
}
const Vector2 imageSize = mSizes[ id ];
Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] );
- Image newImage = CreateImage( mResourceUrls[ id ], imageSize.width, imageSize.height, newMode );
- gridImageView.SetImage( newImage );
+
+ 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[ id ] = newMode;
}
/** 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, DALI_DEMO_THEME_PATH );
+ Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
RunTest( application );