X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fimage-scaling-and-filtering%2Fimage-scaling-and-filtering-example.cpp;h=076f9257267c72673a68569dce39a94c284a7529;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=65068fcc4ff335a3e7a5dba58fc604151831fb47;hpb=7c667d7ccc67e7b3e07dd0aca810593412fece8e;p=platform%2Fcore%2Fuifw%2Fdali-demo.git 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 65068fc..076f925 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -15,71 +15,74 @@ * */ -#include #include #include -#include "shared/view.h" +#include +#include +#include #include +#include "shared/view.h" using namespace Dali; using Toolkit::TextLabel; namespace { +const char* BACKGROUND_IMAGE(DEMO_IMAGE_DIR "background-gradient.jpg"); +const Vector4 BACKGROUND_COLOUR(1.0f, 1.0f, 1.0f, 0.15f); -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); -const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f ); +const char* BORDER_IMAGE(DEMO_IMAGE_DIR "border-4px.9.png"); +const int BORDER_WIDTH = (11.0f + 4.0f); // Shadow size = 11, border size = 4. +const char* RESIZE_HANDLE_IMAGE(DEMO_IMAGE_DIR "resize-handle.png"); const int MARGIN_SIZE = 10; -const char* const NEXT_BUTTON_ID = "NEXT_BUTTON"; +const char* const NEXT_BUTTON_ID = "NEXT_BUTTON"; const char* const PREVIOUS_BUTTON_ID = "PREVIOUS_BUTTON"; -const char * const DALI_ICON_PLAY = DALI_IMAGE_DIR "icon-play.png"; +const char* const DALI_ICON_PLAY = DEMO_IMAGE_DIR "icon-play.png"; -const char* const FITTING_BUTTON_ID = "FITTING_BUTTON"; -const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON"; -const char* const FITTING_BUTTON_TEXT = "Fitting"; +const char* const FITTING_BUTTON_ID = "FITTING_BUTTON"; +const char* const SAMPLING_BUTTON_ID = "SAMPLING_BUTTON"; +const char* const FITTING_BUTTON_TEXT = "Fitting"; const char* const SAMPLING_BUTTON_TEXT = "Sampling"; -const char* const STYLE_LABEL_TEXT = "grouplabel"; -const char* const STYLE_BUTTON_TEXT = "buttonlabel"; - - +const char* const STYLE_LABEL_TEXT = "ImageScalingGroupLabel"; +const char* const STYLE_BUTTON_TEXT = "ImageScalingButton"; const char* IMAGE_PATHS[] = -{ - // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered - // black and white image: - DALI_IMAGE_DIR "gallery-large-14.wbmp", - // Variety of sizes, shapes and formats: - DALI_IMAGE_DIR "animation-list.png", - DALI_IMAGE_DIR "layer1.png", - DALI_IMAGE_DIR "layer2.png", - DALI_IMAGE_DIR "music-libray-main-screen.png", - DALI_IMAGE_DIR "music-libray-record-cover.png", - DALI_IMAGE_DIR "contacts-background.png", - DALI_IMAGE_DIR "portrait_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "landscape_screen_primitive_shapes.gif", - DALI_IMAGE_DIR "square_primitive_shapes.bmp", - DALI_IMAGE_DIR "dali-logo.png", - DALI_IMAGE_DIR "com.samsung.dali-demo.ico", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "book-landscape-cover.jpg", - DALI_IMAGE_DIR "book-portrait-p1.jpg", - DALI_IMAGE_DIR "book-landscape-cover-back.jpg", - DALI_IMAGE_DIR "background-1.jpg", - DALI_IMAGE_DIR "background-blocks.jpg", - DALI_IMAGE_DIR "background-magnifier.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", - NULL -}; + { + // Variety of sizes, shapes and formats: + DEMO_IMAGE_DIR "dali-logo.png", + DEMO_IMAGE_DIR "layer1.png", + DEMO_IMAGE_DIR "layer2.png", + DEMO_IMAGE_DIR "animation-list.png", + DEMO_IMAGE_DIR "music-libray-main-screen.png", + DEMO_IMAGE_DIR "music-libray-record-cover.png", + DEMO_IMAGE_DIR "contacts-background.png", + DEMO_IMAGE_DIR "portrait_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "landscape_screen_primitive_shapes.gif", + DEMO_IMAGE_DIR "square_primitive_shapes.bmp", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "book-landscape-cover.jpg", + DEMO_IMAGE_DIR "book-portrait-p1.jpg", + DEMO_IMAGE_DIR "book-landscape-cover-back.jpg", + + // Worst case for aliasing in downscaling, 2k x 2k 1 bit per pixel dithered + // black and white image: + DEMO_IMAGE_DIR "gallery-large-14.wbmp", + + DEMO_IMAGE_DIR "background-1.jpg", + DEMO_IMAGE_DIR "background-blocks.jpg", + DEMO_IMAGE_DIR "background-magnifier.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + NULL}; const int NUM_IMAGE_PATHS = sizeof(IMAGE_PATHS) / sizeof(IMAGE_PATHS[0]) - 1u; /** Cycle the scaling mode options. */ -FittingMode::Type NextScalingMode( FittingMode::Type oldMode ) +FittingMode::Type NextScalingMode(FittingMode::Type oldMode) { FittingMode::Type newMode = FittingMode::SHRINK_TO_FIT; - switch ( oldMode ) + switch(oldMode) { case FittingMode::SHRINK_TO_FIT: newMode = FittingMode::SCALE_TO_FILL; @@ -98,11 +101,11 @@ FittingMode::Type NextScalingMode( FittingMode::Type oldMode ) } /** Cycle through filter mode options. */ -SamplingMode::Type NextFilterMode( SamplingMode::Type oldMode ) +SamplingMode::Type NextFilterMode(SamplingMode::Type oldMode) { SamplingMode::Type newMode = SamplingMode::BOX; - switch ( oldMode ) + switch(oldMode) { case SamplingMode::BOX: newMode = SamplingMode::NEAREST; @@ -129,33 +132,35 @@ SamplingMode::Type NextFilterMode( SamplingMode::Type oldMode ) return newMode; } -const char* StringFromScalingMode( FittingMode::Type scalingMode ) +const char* StringFromScalingMode(FittingMode::Type scalingMode) { return scalingMode == FittingMode::SCALE_TO_FILL ? "SCALE_TO_FILL" : scalingMode == FittingMode::SHRINK_TO_FIT ? "SHRINK_TO_FIT" : scalingMode == FittingMode::FIT_WIDTH ? "FIT_WIDTH" : scalingMode == FittingMode::FIT_HEIGHT ? "FIT_HEIGHT" : "UnknownScalingMode"; } -const char* StringFromFilterMode( SamplingMode::Type filterMode ) +const char* StringFromFilterMode(SamplingMode::Type filterMode) { return filterMode == SamplingMode::BOX ? "BOX" : filterMode == SamplingMode::BOX_THEN_NEAREST ? "BOX_THEN_NEAREST" : filterMode == SamplingMode::BOX_THEN_LINEAR ? "BOX_THEN_LINEAR" : filterMode == SamplingMode::NEAREST ? "NEAREST" : filterMode == SamplingMode::LINEAR ? "LINEAR" : filterMode == SamplingMode::NO_FILTER ? "NO_FILTER" : filterMode == SamplingMode::DONT_CARE ? "DONT_CARE" : "UnknownFilterMode"; } -} +} // namespace // This example shows the load-time image scaling and filtering features. // class ImageScalingAndFilteringController : public ConnectionTracker { public: - - ImageScalingAndFilteringController( Application& application ) - : mApplication( application ), - mImageStageScale( 0.5f, 0.5f ), - mCurrentPath( 0 ), - mFittingMode( FittingMode::SCALE_TO_FILL ), - mSamplingMode( SamplingMode::BOX_THEN_LINEAR) + ImageScalingAndFilteringController(Application& application) + : mApplication(application), + mLastPinchScale(1.0f), + mImageWindowScale(0.5f, 0.5f), + mCurrentPath(0), + mFittingMode(FittingMode::FIT_WIDTH), + mSamplingMode(SamplingMode::BOX_THEN_LINEAR), + mImageLoading(false), + mQueuedImageLoad(false) { // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &ImageScalingAndFilteringController::Create ); + mApplication.InitSignal().Connect(this, &ImageScalingAndFilteringController::Create); } ~ImageScalingAndFilteringController() @@ -164,103 +169,71 @@ public: } // The Init signal is received once (only) during the Application lifetime - void Create( Application& application ) + void Create(Application& application) { - // Get a handle to the stage - Stage stage = Stage::GetCurrent(); + // Get a handle to the window + Window window = application.GetWindow(); + Vector2 windowSize = window.GetSize(); // Background image: - ResourceImage backgroundImage = ResourceImage::New( BACKGROUND_IMAGE, ImageDimensions( stage.GetSize().width, stage.GetSize().height ), FittingMode::SCALE_TO_FILL, SamplingMode::BOX_THEN_LINEAR ); - Toolkit::ImageView background = Toolkit::ImageView::New( backgroundImage ); - background.SetZ( -2.0f ); - background.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - background.SetSize( stage.GetSize() ); - stage.Add( background ); - - // Make grey pixels for the desired box, the desired height the desired width: - BufferImage desiredBackground = BufferImage::WHITE(); - - BufferImage heightBackground = BufferImage::WHITE(); - PixelBuffer* const heightPixel = heightBackground.GetBuffer(); - heightPixel[0] = 0x8f; - heightPixel[1] = 0x8f; - heightPixel[2] = 0x8f; - - BufferImage widthBackground = BufferImage::WHITE(); - PixelBuffer* const widthPixel = widthBackground.GetBuffer(); - widthPixel[0] = 0x4f; - widthPixel[1] = 0x4f; - widthPixel[2] = 0x4f; - - mHeightBox = Toolkit::ImageView::New( heightBackground ); - mHeightBox.SetOpacity( 0.2f ); - stage.Add( mHeightBox ); - - mWidthBox = Toolkit::ImageView::New( widthBackground ); - mWidthBox.SetOpacity( 0.2f ); - stage.Add( mWidthBox ); - - 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); - - 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); - - 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); - - // Make a grab-handle for resizing the image: - mGrabCorner = Toolkit::PushButton::New(); - mGrabCorner.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH ); - mGrabCorner.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - mGrabCorner.SetName( "GrabCorner" ); - mGrabCorner.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT ); - mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT ); - mGrabCorner.SetSize( Vector2( stage.GetSize().width*0.08f, stage.GetSize().width*0.08f ) ); - mGrabCorner.SetOpacity( 0.6f ); - - Layer grabCornerLayer = Layer::New(); - grabCornerLayer.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT ); - grabCornerLayer.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT ); - - grabCornerLayer.Add( mGrabCorner ); - mDesiredBox.Add( grabCornerLayer ); - mPanGestureDetector = PanGestureDetector::New(); - mPanGestureDetector.Attach( mGrabCorner ); - mPanGestureDetector.DetectedSignal().Connect( this, &ImageScalingAndFilteringController::OnPan ); + Dali::Property::Map backgroundImage; + backgroundImage.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE); + backgroundImage.Insert(Toolkit::ImageVisual::Property::URL, BACKGROUND_IMAGE); + backgroundImage.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, windowSize.width); + backgroundImage.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, windowSize.height); + backgroundImage.Insert(Toolkit::ImageVisual::Property::FITTING_MODE, FittingMode::SCALE_TO_FILL); + backgroundImage.Insert(Toolkit::ImageVisual::Property::SAMPLING_MODE, SamplingMode::BOX_THEN_NEAREST); + + Toolkit::ImageView background = Toolkit::ImageView::New(); + background.SetProperty(Toolkit::ImageView::Property::IMAGE, backgroundImage); + background.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + background.SetProperty(Actor::Property::SIZE, windowSize); + window.Add(background); + + mDesiredBox = Toolkit::ImageView::New(BORDER_IMAGE); + background.Add(mDesiredBox); + + mDesiredBox.SetProperty(Actor::Property::SIZE, windowSize * mImageWindowScale); + mDesiredBox.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + mDesiredBox.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); // Initialize the actor - mImageActor = ImageActor::New(); + mImageView = Toolkit::ImageView::New(IMAGE_PATHS[0]); // Reposition the actor - mImageActor.SetParentOrigin( ParentOrigin::CENTER ); - mImageActor.SetAnchorPoint( AnchorPoint::CENTER ); - mImageActor.SetSortModifier(5.f); + mImageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + mImageView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); - // Display the actor on the stage - stage.Add( mImageActor ); + // Display the actor on the window + mDesiredBox.Add(mImageView); - mImageActor.SetSize( stage.GetSize() * mImageStageScale ); + mImageView.SetProperty(Actor::Property::SIZE, windowSize * mImageWindowScale); // Setup the pinch detector for scaling the desired image load dimensions: mPinchDetector = PinchGestureDetector::New(); - mPinchDetector.Attach( mImageActor ); - mPinchDetector.DetectedSignal().Connect( this, &ImageScalingAndFilteringController::OnPinch ); + mPinchDetector.Attach(mImageView); + mPinchDetector.DetectedSignal().Connect(this, &ImageScalingAndFilteringController::OnPinch); + + mGrabCorner = Toolkit::ImageView::New(RESIZE_HANDLE_IMAGE); + mGrabCorner.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS); + mGrabCorner.SetProperty(Dali::Actor::Property::NAME, "GrabCorner"); + mGrabCorner.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT); + mGrabCorner.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT); + mGrabCorner.SetProperty(Actor::Property::POSITION, Vector2(-BORDER_WIDTH, -BORDER_WIDTH)); + mGrabCorner.SetProperty(Actor::Property::OPACITY, 0.6f); + + Layer grabCornerLayer = Layer::New(); + grabCornerLayer.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT); + grabCornerLayer.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT); + grabCornerLayer.Add(mGrabCorner); + mDesiredBox.Add(grabCornerLayer); + + mPanGestureDetector = PanGestureDetector::New(); + mPanGestureDetector.Attach(mGrabCorner); + mPanGestureDetector.DetectedSignal().Connect(this, &ImageScalingAndFilteringController::OnPan); // Tie-in input event handlers: - stage.KeyEventSignal().Connect( this, &ImageScalingAndFilteringController::OnKeyEvent ); + window.KeyEventSignal().Connect(this, &ImageScalingAndFilteringController::OnKeyEvent); CreateControls(); @@ -272,246 +245,238 @@ public: */ void CreateControls() { - Stage stage = Stage::GetCurrent(); + Window window = mApplication.GetWindow(); + Vector2 windowSize = window.GetSize(); Dali::Layer controlsLayer = Dali::Layer::New(); - controlsLayer.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - controlsLayer.SetSizeModeFactor( Vector3( 1.0f, 1.0f, 1.0f ) ); - controlsLayer.SetAnchorPoint( AnchorPoint::TOP_LEFT); - controlsLayer.SetParentOrigin( ParentOrigin::TOP_LEFT); - stage.Add( controlsLayer ); + controlsLayer.SetResizePolicy(ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS); + controlsLayer.SetProperty(Actor::Property::SIZE_MODE_FACTOR, Vector3(1.0f, 1.0f, 1.0f)); + controlsLayer.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + controlsLayer.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); + window.Add(controlsLayer); - // 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 ); - Toolkit::ImageView imagePrevious = Toolkit::ImageView::New( playImage ); + // Back and next image buttons in corners of window: + unsigned int playWidth = std::min(windowSize.x * (1 / 5.0f), 58.0f); + Toolkit::ImageView imagePrevious = Toolkit::ImageView::New(DALI_ICON_PLAY, ImageDimensions(playWidth, playWidth)); // Last image button: - imagePrevious.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - imagePrevious.RotateBy( Radian(3.14159265358979323846f), Vector3( 0, 1.0f, 0 ) ); - imagePrevious.SetY( playWidth * 0.5f ); - imagePrevious.SetX( playWidth + playWidth * 0.5f ); - imagePrevious.SetOpacity( 0.6f ); - controlsLayer.Add( imagePrevious ); - imagePrevious.SetName( PREVIOUS_BUTTON_ID ); - imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + imagePrevious.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + imagePrevious.RotateBy(Radian(3.14159265358979323846f), Vector3(0, 1.0f, 0)); + imagePrevious.SetProperty(Actor::Property::POSITION_Y, playWidth * 0.5f); + imagePrevious.SetProperty(Actor::Property::POSITION_X, playWidth + playWidth * 0.5f); + imagePrevious.SetProperty(Actor::Property::OPACITY, 0.6f); + controlsLayer.Add(imagePrevious); + imagePrevious.SetProperty(Dali::Actor::Property::NAME, PREVIOUS_BUTTON_ID); + imagePrevious.TouchedSignal().Connect(this, &ImageScalingAndFilteringController::OnControlTouched); // Next image button: - 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 ); - imageNext.SetOpacity( 0.6f ); - controlsLayer.Add( imageNext ); - imageNext.SetName( NEXT_BUTTON_ID ); - imageNext.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + Toolkit::ImageView imageNext = Toolkit::ImageView::New(DALI_ICON_PLAY, ImageDimensions(playWidth, playWidth)); + imageNext.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT); + imageNext.SetProperty(Actor::Property::POSITION_Y, playWidth * 0.5f); + imageNext.SetProperty(Actor::Property::POSITION_X, windowSize.x - playWidth * 0.5f); + imageNext.SetProperty(Actor::Property::OPACITY, 0.6f); + controlsLayer.Add(imageNext); + imageNext.SetProperty(Dali::Actor::Property::NAME, NEXT_BUTTON_ID); + imageNext.TouchedSignal().Connect(this, &ImageScalingAndFilteringController::OnControlTouched); // Buttons to popup selectors for fitting and sampling modes: // Wrapper table to hold two buttons side by side: - Toolkit::TableView modesGroupBackground = Toolkit::TableView::New( 1, 2 ); - modesGroupBackground.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - modesGroupBackground.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - modesGroupBackground.SetBackgroundColor( BACKGROUND_COLOUR ); - modesGroupBackground.SetCellPadding( Size( MARGIN_SIZE * 0.5f, MARGIN_SIZE ) ); - modesGroupBackground.SetFitHeight( 0 ); + Toolkit::TableView modesGroupBackground = Toolkit::TableView::New(1, 2); + modesGroupBackground.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + modesGroupBackground.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); + modesGroupBackground.SetBackgroundColor(BACKGROUND_COLOUR); + modesGroupBackground.SetCellPadding(Size(MARGIN_SIZE * 0.5f, MARGIN_SIZE)); + modesGroupBackground.SetFitHeight(0); - modesGroupBackground.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT ); - modesGroupBackground.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); - modesGroupBackground.SetPosition( 0.0f, 0.0f ); + modesGroupBackground.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT); + modesGroupBackground.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT); + modesGroupBackground.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f)); - controlsLayer.Add( modesGroupBackground ); + controlsLayer.Add(modesGroupBackground); { // Vertical table to hold label and button: - Toolkit::TableView fittingModeGroup = Toolkit::TableView::New( 2, 1 ); - fittingModeGroup.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - fittingModeGroup.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - fittingModeGroup.SetBackgroundColor( BACKGROUND_COLOUR ); - fittingModeGroup.SetCellPadding( Size( MARGIN_SIZE * 0.5f, MARGIN_SIZE * 0.5f ) ); - fittingModeGroup.SetFitHeight( 0 ); - fittingModeGroup.SetFitHeight( 1 ); - - TextLabel label = TextLabel::New( "Image fitting mode:" ); - label.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_LABEL_TEXT ); - 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 ); + Toolkit::TableView fittingModeGroup = Toolkit::TableView::New(2, 1); + fittingModeGroup.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + fittingModeGroup.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); + fittingModeGroup.SetBackgroundColor(BACKGROUND_COLOUR); + fittingModeGroup.SetCellPadding(Size(MARGIN_SIZE * 0.5f, MARGIN_SIZE * 0.5f)); + fittingModeGroup.SetFitHeight(0); + fittingModeGroup.SetFitHeight(1); + + TextLabel label = TextLabel::New("Image fitting mode:"); + label.SetStyleName(STYLE_LABEL_TEXT); + fittingModeGroup.Add(label); + + Toolkit::PushButton button = CreateButton(FITTING_BUTTON_ID, StringFromScalingMode(mFittingMode)); + fittingModeGroup.Add(button); mFittingModeButton = button; - modesGroupBackground.Add( fittingModeGroup ); + modesGroupBackground.Add(fittingModeGroup); } { // Vertical table to hold label and button: - Toolkit::TableView samplingModeGroup = Toolkit::TableView::New( 2, 1 ); - samplingModeGroup.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - samplingModeGroup.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - samplingModeGroup.SetBackgroundColor( BACKGROUND_COLOUR ); - samplingModeGroup.SetCellPadding( Size( MARGIN_SIZE * 0.5f, MARGIN_SIZE * 0.5f ) ); - samplingModeGroup.SetFitHeight( 0 ); - samplingModeGroup.SetFitHeight( 1 ); - - TextLabel label = TextLabel::New( "Image sampling mode:" ); - label.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_LABEL_TEXT ); - 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 ); + Toolkit::TableView samplingModeGroup = Toolkit::TableView::New(2, 1); + samplingModeGroup.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + samplingModeGroup.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); + samplingModeGroup.SetBackgroundColor(BACKGROUND_COLOUR); + samplingModeGroup.SetCellPadding(Size(MARGIN_SIZE * 0.5f, MARGIN_SIZE * 0.5f)); + samplingModeGroup.SetFitHeight(0); + samplingModeGroup.SetFitHeight(1); + + TextLabel label = TextLabel::New("Image sampling mode:"); + label.SetStyleName(STYLE_LABEL_TEXT); + samplingModeGroup.Add(label); + + Toolkit::PushButton button = CreateButton(SAMPLING_BUTTON_ID, StringFromFilterMode(mSamplingMode)); + samplingModeGroup.Add(button); mSamplingModeButton = button; - modesGroupBackground.Add( samplingModeGroup ); + modesGroupBackground.Add(samplingModeGroup); } } - Toolkit::PushButton CreateButton( const char * id, const char * label ) + Toolkit::PushButton CreateButton(const char* id, const char* label) { Toolkit::PushButton button = Toolkit::PushButton::New(); - button.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); - button.SetName( id ); - button.SetLabel( label ); - button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - button.ClickedSignal().Connect( this, &ImageScalingAndFilteringController::OnButtonClicked ); + button.SetStyleName(STYLE_BUTTON_TEXT); + button.SetProperty(Dali::Actor::Property::NAME, id); + button.SetProperty(Toolkit::Button::Property::LABEL, label); + button.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + button.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); + button.ClickedSignal().Connect(this, &ImageScalingAndFilteringController::OnButtonClicked); return button; } Toolkit::Popup CreatePopup() { - Stage stage = Stage::GetCurrent(); - const float POPUP_WIDTH_DP = stage.GetSize().width * 0.75f; + Window window = mApplication.GetWindow(); + const float POPUP_WIDTH_DP = window.GetSize().GetWidth() * 0.75f; Toolkit::Popup popup = Toolkit::Popup::New(); - popup.SetName( "POPUP" ); - popup.SetParentOrigin( ParentOrigin::CENTER ); - popup.SetAnchorPoint( AnchorPoint::CENTER ); - popup.SetSize( POPUP_WIDTH_DP, 0.0f ); - popup.HideTail(); + popup.SetProperty(Dali::Actor::Property::NAME, "POPUP"); + popup.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + popup.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); + popup.SetProperty(Actor::Property::SIZE, Vector2(POPUP_WIDTH_DP, 0.0f)); - popup.OutsideTouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnPopupOutsideTouched ); + popup.OutsideTouchedSignal().Connect(this, &ImageScalingAndFilteringController::OnPopupOutsideTouched); return popup; } - //void CreatePopupButton( Toolkit::Popup popup, const char* id ) - Toolkit::PushButton CreatePopupButton( Actor parent, const char* id ) + Toolkit::PushButton CreatePopupButton(Actor parent, const char* id) { 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.SetProperty(Dali::Actor::Property::NAME, id); + button.SetProperty(Toolkit::Button::Property::LABEL, id); - button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - button.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); - button.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); + button.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT); + button.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT); + button.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + button.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); - button.ClickedSignal().Connect( this, &ImageScalingAndFilteringController::OnButtonClicked ); + button.ClickedSignal().Connect(this, &ImageScalingAndFilteringController::OnButtonClicked); - parent.Add( button ); + parent.Add(button); return button; } - bool OnButtonClicked( Toolkit::Button button ) + bool OnButtonClicked(Toolkit::Button button) { - if( button.GetName() == FITTING_BUTTON_ID ) + if(button.GetProperty(Dali::Actor::Property::NAME) == FITTING_BUTTON_ID) { mPopup = CreatePopup(); // Four-row table to hold buttons: - Toolkit::TableView fittingModes = Toolkit::TableView::New( 4, 1 ); - fittingModes.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - fittingModes.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - fittingModes.SetBackgroundColor( BACKGROUND_COLOUR ); - fittingModes.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE * 0.5 ) ); - fittingModes.SetFitHeight( 0 ); - fittingModes.SetFitHeight( 1 ); - fittingModes.SetFitHeight( 2 ); - fittingModes.SetFitHeight( 3 ); - - CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::SCALE_TO_FILL ) ); - CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::SHRINK_TO_FIT ) ); - CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::FIT_WIDTH ) ); - CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::FIT_HEIGHT ) ); - - mPopup.Add( fittingModes ); - mPopup.Show(); + Toolkit::TableView fittingModes = Toolkit::TableView::New(4, 1); + fittingModes.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + fittingModes.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); + fittingModes.SetCellPadding(Size(MARGIN_SIZE, MARGIN_SIZE * 0.5)); + fittingModes.SetFitHeight(0); + fittingModes.SetFitHeight(1); + fittingModes.SetFitHeight(2); + fittingModes.SetFitHeight(3); + + CreatePopupButton(fittingModes, StringFromScalingMode(FittingMode::SCALE_TO_FILL)); + CreatePopupButton(fittingModes, StringFromScalingMode(FittingMode::SHRINK_TO_FIT)); + CreatePopupButton(fittingModes, StringFromScalingMode(FittingMode::FIT_WIDTH)); + CreatePopupButton(fittingModes, StringFromScalingMode(FittingMode::FIT_HEIGHT)); + + mPopup.SetContent(fittingModes); + mApplication.GetWindow().Add(mPopup); + mPopup.SetDisplayState(Toolkit::Popup::SHOWN); } - else if( button.GetName() == SAMPLING_BUTTON_ID ) + else if(button.GetProperty(Dali::Actor::Property::NAME) == SAMPLING_BUTTON_ID) { mPopup = CreatePopup(); // Table to hold buttons for each sampling mode: - Toolkit::TableView samplingModes = Toolkit::TableView::New( 6, 1 ); - samplingModes.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - samplingModes.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - samplingModes.SetBackgroundColor( BACKGROUND_COLOUR ); - samplingModes.SetCellPadding( Size( MARGIN_SIZE, MARGIN_SIZE * 0.5 ) ); - samplingModes.SetFitHeight( 0 ); - samplingModes.SetFitHeight( 1 ); - samplingModes.SetFitHeight( 2 ); - samplingModes.SetFitHeight( 3 ); - samplingModes.SetFitHeight( 4 ); - samplingModes.SetFitHeight( 5 ); - - CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::NEAREST ) ); - CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::LINEAR ) ); - CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::BOX ) ); - CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::BOX_THEN_NEAREST ) ); - CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::BOX_THEN_LINEAR ) ); - CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::NO_FILTER ) ); - - mPopup.Add( samplingModes ); - mPopup.Show(); + Toolkit::TableView samplingModes = Toolkit::TableView::New(6, 1); + samplingModes.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); + samplingModes.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); + samplingModes.SetCellPadding(Size(MARGIN_SIZE, MARGIN_SIZE * 0.5)); + samplingModes.SetFitHeight(0); + samplingModes.SetFitHeight(1); + samplingModes.SetFitHeight(2); + samplingModes.SetFitHeight(3); + samplingModes.SetFitHeight(4); + samplingModes.SetFitHeight(5); + + CreatePopupButton(samplingModes, StringFromFilterMode(SamplingMode::NEAREST)); + CreatePopupButton(samplingModes, StringFromFilterMode(SamplingMode::LINEAR)); + CreatePopupButton(samplingModes, StringFromFilterMode(SamplingMode::BOX)); + CreatePopupButton(samplingModes, StringFromFilterMode(SamplingMode::BOX_THEN_NEAREST)); + CreatePopupButton(samplingModes, StringFromFilterMode(SamplingMode::BOX_THEN_LINEAR)); + CreatePopupButton(samplingModes, StringFromFilterMode(SamplingMode::NO_FILTER)); + + mPopup.SetContent(samplingModes); + mApplication.GetWindow().Add(mPopup); + mPopup.SetDisplayState(Toolkit::Popup::SHOWN); } - else if( CheckFittingModeButton( button, FittingMode::SCALE_TO_FILL) || - CheckFittingModeButton( button, FittingMode::SHRINK_TO_FIT) || - CheckFittingModeButton( button, FittingMode::FIT_WIDTH) || - CheckFittingModeButton( button, FittingMode::FIT_HEIGHT) ) + else if(CheckFittingModeButton(button, FittingMode::SCALE_TO_FILL) || + CheckFittingModeButton(button, FittingMode::SHRINK_TO_FIT) || + CheckFittingModeButton(button, FittingMode::FIT_WIDTH) || + CheckFittingModeButton(button, FittingMode::FIT_HEIGHT)) { } - else if( CheckSamplingModeButton( button, SamplingMode::NEAREST ) || - CheckSamplingModeButton( button, SamplingMode::LINEAR ) || - CheckSamplingModeButton( button, SamplingMode::BOX ) || - CheckSamplingModeButton( button, SamplingMode::LINEAR ) || - CheckSamplingModeButton( button, SamplingMode::BOX_THEN_NEAREST ) || - CheckSamplingModeButton( button, SamplingMode::BOX_THEN_LINEAR ) || - CheckSamplingModeButton( button, SamplingMode::NO_FILTER ) ) + else if(CheckSamplingModeButton(button, SamplingMode::NEAREST) || + CheckSamplingModeButton(button, SamplingMode::LINEAR) || + CheckSamplingModeButton(button, SamplingMode::BOX) || + CheckSamplingModeButton(button, SamplingMode::LINEAR) || + CheckSamplingModeButton(button, SamplingMode::BOX_THEN_NEAREST) || + CheckSamplingModeButton(button, SamplingMode::BOX_THEN_LINEAR) || + CheckSamplingModeButton(button, SamplingMode::NO_FILTER)) { } return true; } - bool CheckFittingModeButton( Actor &button, FittingMode::Type mode ) + bool CheckFittingModeButton(Actor& button, FittingMode::Type mode) { - const char * const modeName = StringFromScalingMode( mode ); - if( button.GetName() == modeName ) + const char* const modeName = StringFromScalingMode(mode); + if(button.GetProperty(Dali::Actor::Property::NAME) == modeName) { mFittingMode = mode; - mFittingModeButton.SetLabel( modeName ); - mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mFittingModeButton.SetProperty(Toolkit::Button::Property::LABEL, modeName); ResizeImage(); - mPopup.Hide(); + mPopup.SetDisplayState(Toolkit::Popup::HIDDEN); mPopup.Reset(); return true; } return false; } - bool CheckSamplingModeButton( Actor &button, SamplingMode::Type mode ) + bool CheckSamplingModeButton(Actor& button, SamplingMode::Type mode) { - const char * const modeName = StringFromFilterMode( mode ); - if( button.GetName() == modeName ) + const char* const modeName = StringFromFilterMode(mode); + if(button.GetProperty(Dali::Actor::Property::NAME) == modeName) { mSamplingMode = mode; - mSamplingModeButton.SetLabel( modeName ); - mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mSamplingModeButton.SetProperty(Toolkit::Button::Property::LABEL, modeName); ResizeImage(); - mPopup.Hide(); + mPopup.SetDisplayState(Toolkit::Popup::HIDDEN); mPopup.Reset(); return true; } @@ -520,37 +485,29 @@ public: void OnPopupOutsideTouched() { - if( mPopup ) + if(mPopup) { - mPopup.Hide(); + mPopup.SetDisplayState(Toolkit::Popup::HIDDEN); mPopup.Reset(); } } - void OnImageLoaded( ResourceImage image ) - { - DALI_ASSERT_DEBUG( image == mNextImage ); - mImageActor.SetImage( image ); - mImageActor.SetSize( Size( image.GetWidth(), image.GetHeight() ) ); - } - - bool OnControlTouched( Actor actor, const TouchEvent& event ) + bool OnControlTouched(Actor actor, const TouchEvent& event) { if(event.GetPointCount() > 0) { - const TouchPoint& point = event.GetPoint(0); - switch(point.state) + switch(event.GetState(0)) { - case TouchPoint::Up: + case PointState::UP: { - const std::string & name = actor.GetName(); - if( name == NEXT_BUTTON_ID ) + const std::string& name = actor.GetProperty(Dali::Actor::Property::NAME); + if(name == NEXT_BUTTON_ID) { mCurrentPath = mCurrentPath + 1; - mCurrentPath = mCurrentPath < NUM_IMAGE_PATHS ? mCurrentPath : 0; + mCurrentPath = mCurrentPath < NUM_IMAGE_PATHS ? mCurrentPath : 0; ResizeImage(); } - else if( name == PREVIOUS_BUTTON_ID ) + else if(name == PREVIOUS_BUTTON_ID) { mCurrentPath = mCurrentPath - 1; mCurrentPath = mCurrentPath >= 0 ? mCurrentPath : NUM_IMAGE_PATHS - 1; @@ -568,48 +525,53 @@ public: return false; } - void OnPinch( Actor actor, const PinchGesture& pinch ) + void OnPinch(Actor actor, const PinchGesture& pinch) { - if( pinch.state == Gesture::Started ) + if(pinch.GetState() == GestureState::STARTED) { - mLastPinchScale = pinch.scale; + mLastPinchScale = pinch.GetScale(); } - const float scale = pinch.scale; + const float scale = pinch.GetScale(); - if( scale != mLastPinchScale ) + if(!Equals(scale, mLastPinchScale)) { - if ( scale < mLastPinchScale ) + if(scale < mLastPinchScale) { - mImageStageScale.x = std::max( 0.05f, mImageStageScale.x * 0.9f ); - mImageStageScale.y = std::max( 0.05f, mImageStageScale.y * 0.9f ); + mImageWindowScale.x = std::max(0.05f, mImageWindowScale.x * 0.9f); + mImageWindowScale.y = std::max(0.05f, mImageWindowScale.y * 0.9f); } else { - mImageStageScale.x = std::max( 0.05f, std::min( 1.0f, mImageStageScale.x * 1.1f ) ); - mImageStageScale.y = std::max( 0.05f, std::min( 1.0f, mImageStageScale.y * 1.1f ) ); + mImageWindowScale.x = std::max(0.05f, std::min(1.0f, mImageWindowScale.x * 1.1f)); + mImageWindowScale.y = std::max(0.05f, std::min(1.0f, mImageWindowScale.y * 1.1f)); } ResizeImage(); } mLastPinchScale = scale; } - void OnPan( Actor actor, const PanGesture& gesture ) + void OnPan(Actor actor, const PanGesture& gesture) { - Stage stage = Stage::GetCurrent(); - mImageStageScale.x = std::max( 0.05f, std::min( 1.0f, mImageStageScale.x + (gesture.displacement.x * 2.0f / stage.GetSize().width ) ) ); - mImageStageScale.y = std::max( 0.05f, std::min( 1.0f, mImageStageScale.y + (gesture.displacement.y * 2.0f / stage.GetSize().height ) ) ); + Window window = mApplication.GetWindow(); + Vector2 windowSize = window.GetSize(); + const Vector2& displacement = gesture.GetDisplacement(); + + // 1.0f and 0.75f are the maximum size caps of the resized image, as a factor of window-size. + mImageWindowScale.x = std::max(0.05f, std::min(0.95f, mImageWindowScale.x + (displacement.x * 2.0f / windowSize.width))); + mImageWindowScale.y = std::max(0.05f, std::min(0.70f, mImageWindowScale.y + (displacement.y * 2.0f / windowSize.height))); + ResizeImage(); } void OnKeyEvent(const KeyEvent& event) { - if( event.state == KeyEvent::Down ) + if(event.GetState() == KeyEvent::DOWN) { - if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) + if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK)) { - if( mPopup && mPopup.IsVisible() ) + if(mPopup && mPopup.GetCurrentProperty(Actor::Property::VISIBLE)) { - mPopup.Hide(); + mPopup.SetDisplayState(Toolkit::Popup::HIDDEN); mPopup.Reset(); } else @@ -617,55 +579,53 @@ public: mApplication.Quit(); } } - else if ( event.keyPressedName == "Right" ) + else if(event.GetKeyName() == "Right") { - mImageStageScale.x = std::max( 0.05f, std::min( 1.0f, mImageStageScale.x * 1.1f ) ); + mImageWindowScale.x = std::max(0.05f, std::min(1.0f, mImageWindowScale.x * 1.1f)); } - else if ( event.keyPressedName == "Left" ) + else if(event.GetKeyName() == "Left") { - mImageStageScale.x = std::max( 0.05f, mImageStageScale.x * 0.9f ); + mImageWindowScale.x = std::max(0.05f, mImageWindowScale.x * 0.9f); } - else if ( event.keyPressedName == "Up" ) + else if(event.GetKeyName() == "Up") { - mImageStageScale.y = std::max( 0.05f, std::min( 1.0f, mImageStageScale.y * 1.1f ) ); + mImageWindowScale.y = std::max(0.05f, std::min(1.0f, mImageWindowScale.y * 1.1f)); } - else if ( event.keyPressedName == "Down" ) + else if(event.GetKeyName() == "Down") { - mImageStageScale.y = std::max( 0.05f, mImageStageScale.y * 0.9f ); + mImageWindowScale.y = std::max(0.05f, mImageWindowScale.y * 0.9f); } - else if ( event.keyPressedName == "o" ) + else if(event.GetKeyName() == "o") { - mImageStageScale.x = std::max( 0.05f, mImageStageScale.x * 0.9f ); - mImageStageScale.y = std::max( 0.05f, mImageStageScale.y * 0.9f ); + mImageWindowScale.x = std::max(0.05f, mImageWindowScale.x * 0.9f); + mImageWindowScale.y = std::max(0.05f, mImageWindowScale.y * 0.9f); } - else if ( event.keyPressedName == "p" ) + else if(event.GetKeyName() == "p") { - mImageStageScale.x = std::max( 0.05f, std::min( 1.0f, mImageStageScale.x * 1.1f ) ); - mImageStageScale.y = std::max( 0.05f, std::min( 1.0f, mImageStageScale.y * 1.1f ) ); + mImageWindowScale.x = std::max(0.05f, std::min(1.0f, mImageWindowScale.x * 1.1f)); + mImageWindowScale.y = std::max(0.05f, std::min(1.0f, mImageWindowScale.y * 1.1f)); } - else if ( event.keyPressedName == "n" ) + else if(event.GetKeyName() == "n") { mCurrentPath = mCurrentPath + 1; - mCurrentPath = mCurrentPath < NUM_IMAGE_PATHS ? mCurrentPath : 0; + mCurrentPath = mCurrentPath < NUM_IMAGE_PATHS ? mCurrentPath : 0; } - else if ( event.keyPressedName == "b" ) + else if(event.GetKeyName() == "b") { mCurrentPath = mCurrentPath - 1; mCurrentPath = mCurrentPath >= 0 ? mCurrentPath : NUM_IMAGE_PATHS - 1; } // Cycle filter and scaling modes: - else if ( event.keyPressedName == "f" ) + else if(event.GetKeyName() == "f") { - mSamplingMode = NextFilterMode( mSamplingMode ); - mSamplingModeButton.SetLabel( StringFromFilterMode( mSamplingMode ) ); - mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mSamplingMode = NextFilterMode(mSamplingMode); + mSamplingModeButton.SetProperty(Toolkit::Button::Property::LABEL, StringFromFilterMode(mSamplingMode)); } // Cycle filter and scaling modes: - else if ( event.keyPressedName == "s" ) + else if(event.GetKeyName() == "s") { - mFittingMode = NextScalingMode( mFittingMode ); - mFittingModeButton.SetLabel( StringFromScalingMode( mFittingMode ) ); - mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT ); + mFittingMode = NextScalingMode(mFittingMode); + mFittingModeButton.SetProperty(Toolkit::Button::Property::LABEL, StringFromScalingMode(mFittingMode)); } else { @@ -677,57 +637,61 @@ public: } private: - void ResizeImage() + void LoadImage() { - const char * const path = IMAGE_PATHS[mCurrentPath]; + mImageLoading = true; + + const char* const path = IMAGE_PATHS[mCurrentPath]; + Window window = mApplication.GetWindow(); + Size imageSize = Vector2(window.GetSize()) * mImageWindowScale; + mImageView.SetProperty(Actor::Property::SIZE, imageSize); + + Property::Map map; + map[Toolkit::ImageVisual::Property::URL] = path; + map[Toolkit::ImageVisual::Property::DESIRED_WIDTH] = imageSize.x; + map[Toolkit::ImageVisual::Property::DESIRED_HEIGHT] = imageSize.y; + map[Toolkit::ImageVisual::Property::FITTING_MODE] = mFittingMode; + map[Toolkit::ImageVisual::Property::SAMPLING_MODE] = mSamplingMode; - Stage stage = Stage::GetCurrent(); - Size imageSize = stage.GetSize() * mImageStageScale; - const ImageDimensions imageSizeInt = ImageDimensions::FromFloatArray( &imageSize.x ); + mImageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map); + } - ResourceImage image = ResourceImage::New( path, imageSizeInt, mFittingMode, mSamplingMode ); - image.LoadingFinishedSignal().Connect( this, &ImageScalingAndFilteringController::OnImageLoaded ); + void ResizeImage() + { + Window window = mApplication.GetWindow(); + Vector2 windowSize = window.GetSize(); + Size imageSize = windowSize * mImageWindowScale; - mNextImage = image; + LoadImage(); - mDesiredBox.SetSize( stage.GetSize() * mImageStageScale ); - mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height ); - mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height ); + // Border size needs to be modified to take into account the width of the frame. + Vector2 borderScale((imageSize + Vector2(BORDER_WIDTH * 2.0f, BORDER_WIDTH * 2.0f)) / windowSize); + mDesiredBox.SetProperty(Actor::Property::SIZE, windowSize * borderScale); } private: - Application& mApplication; - 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; + Application& mApplication; + Toolkit::ImageView mDesiredBox; //< Background rectangle to show requested image size. + Toolkit::PushButton mFittingModeButton; + Toolkit::PushButton mSamplingModeButton; + Toolkit::Popup mPopup; PinchGestureDetector mPinchDetector; - float mLastPinchScale; - Toolkit::PushButton mGrabCorner; - PanGestureDetector mPanGestureDetector; - ImageActor mImageActor; - ResourceImage mNextImage; //< Currently-loading image - Vector2 mImageStageScale; - int mCurrentPath; - FittingMode::Type mFittingMode; - SamplingMode::Type mSamplingMode; + float mLastPinchScale; + Toolkit::ImageView mGrabCorner; + PanGestureDetector mPanGestureDetector; + Toolkit::ImageView mImageView; + Vector2 mImageWindowScale; + int mCurrentPath; + FittingMode::Type mFittingMode; + SamplingMode::Type mSamplingMode; + bool mImageLoading; + bool mQueuedImageLoad; }; -void RunTest( Application& application ) +int DALI_EXPORT_API main(int argc, char** argv) { - ImageScalingAndFilteringController test( application ); - + Application application = Application::New(&argc, &argv, DEMO_THEME_PATH); + ImageScalingAndFilteringController test(application); application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ); - - RunTest( application ); - return 0; }