X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fimage-scaling-and-filtering%2Fimage-scaling-and-filtering-example.cpp;h=6219742371f36dd47a179aab680e195083959e53;hb=a832af2813558a32f0a18747f3e6134ff6f6f301;hp=32c1dbd94218b091334f72a76e5737630c404045;hpb=0f87e4b4d3b632eea835c97160cbc6285652b16c;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 32c1dbd..6219742 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) 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. @@ -27,50 +27,53 @@ using Toolkit::TextLabel; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" ); +const char* BACKGROUND_IMAGE( DEMO_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 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 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[] = { + // 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: - 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", + 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; @@ -149,10 +152,13 @@ public: ImageScalingAndFilteringController( Application& application ) : mApplication( application ), + mLastPinchScale( 1.0f ), mImageStageScale( 0.5f, 0.5f ), mCurrentPath( 0 ), - mFittingMode( FittingMode::SCALE_TO_FILL ), - mSamplingMode( SamplingMode::BOX_THEN_LINEAR) + 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 ); @@ -169,17 +175,24 @@ public: // Get a handle to the stage Stage stage = Stage::GetCurrent(); + // Hide the indicator bar + application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); + // 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 ); + 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, stage.GetSize().width ); + backgroundImage.Insert( Toolkit::ImageVisual::Property::DESIRED_HEIGHT, stage.GetSize().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.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; @@ -194,71 +207,62 @@ public: mHeightBox = Toolkit::ImageView::New( heightBackground ); mHeightBox.SetOpacity( 0.2f ); - stage.Add( mHeightBox ); + background.Add( mHeightBox ); mWidthBox = Toolkit::ImageView::New( widthBackground ); mWidthBox.SetOpacity( 0.2f ); - stage.Add( mWidthBox ); + background.Add( mWidthBox ); - mDesiredBox = Toolkit::ImageView::New( desiredBackground ); - stage.Add( mDesiredBox ); + mDesiredBox = Toolkit::ImageView::New( BORDER_IMAGE ); + background.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 ); + // Initialize the actor + mImageView = Toolkit::ImageView::New( IMAGE_PATHS[ 0 ] ); + + // Reposition the actor + mImageView.SetParentOrigin( ParentOrigin::CENTER ); + mImageView.SetAnchorPoint( AnchorPoint::CENTER ); + + // Display the actor on the stage + mDesiredBox.Add( mImageView ); + + mImageView.SetSize( stage.GetSize() * mImageStageScale ); + + // Setup the pinch detector for scaling the desired image load dimensions: + mPinchDetector = PinchGestureDetector::New(); + 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.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.SetPosition( -BORDER_WIDTH, -BORDER_WIDTH ); 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 ); - // Initialize the actor - mImageActor = ImageActor::New(); - - // Reposition the actor - mImageActor.SetParentOrigin( ParentOrigin::CENTER ); - mImageActor.SetAnchorPoint( AnchorPoint::CENTER ); - mImageActor.SetSortModifier(5.f); - - // Display the actor on the stage - stage.Add( mImageActor ); - - mImageActor.SetSize( stage.GetSize() * mImageStageScale ); - - // Setup the pinch detector for scaling the desired image load dimensions: - mPinchDetector = PinchGestureDetector::New(); - mPinchDetector.Attach( mImageActor ); - mPinchDetector.DetectedSignal().Connect( this, &ImageScalingAndFilteringController::OnPinch ); - // Tie-in input event handlers: stage.KeyEventSignal().Connect( this, &ImageScalingAndFilteringController::OnKeyEvent ); @@ -283,8 +287,7 @@ public: // 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 ); + Toolkit::ImageView imagePrevious = Toolkit::ImageView::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ) ); // Last image button: imagePrevious.SetAnchorPoint( AnchorPoint::TOP_LEFT ); @@ -294,17 +297,17 @@ public: imagePrevious.SetOpacity( 0.6f ); controlsLayer.Add( imagePrevious ); imagePrevious.SetName( PREVIOUS_BUTTON_ID ); - imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + imagePrevious.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Next image button: - Toolkit::ImageView imageNext = Toolkit::ImageView::New( playImage ); + Toolkit::ImageView imageNext = Toolkit::ImageView::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ) ); 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 ); + imageNext.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Buttons to popup selectors for fitting and sampling modes: @@ -333,7 +336,7 @@ public: fittingModeGroup.SetFitHeight( 1 ); TextLabel label = TextLabel::New( "Image fitting mode:" ); - label.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_LABEL_TEXT ); + label.SetStyleName( STYLE_LABEL_TEXT ); fittingModeGroup.Add( label ); Toolkit::PushButton button = CreateButton( FITTING_BUTTON_ID, StringFromScalingMode( mFittingMode ) ); @@ -354,7 +357,7 @@ public: samplingModeGroup.SetFitHeight( 1 ); TextLabel label = TextLabel::New( "Image sampling mode:" ); - label.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_LABEL_TEXT ); + label.SetStyleName( STYLE_LABEL_TEXT ); samplingModeGroup.Add( label ); Toolkit::PushButton button = CreateButton( SAMPLING_BUTTON_ID, StringFromFilterMode( mSamplingMode ) ); @@ -368,9 +371,9 @@ public: 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.SetStyleName( STYLE_BUTTON_TEXT ); button.SetName( id ); - button.SetLabelText( label ); + 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 ); @@ -387,19 +390,17 @@ public: popup.SetParentOrigin( ParentOrigin::CENTER ); popup.SetAnchorPoint( AnchorPoint::CENTER ); popup.SetSize( POPUP_WIDTH_DP, 0.0f ); - popup.HideTail(); 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 button = Toolkit::PushButton::New(); button.SetName( id ); - button.SetLabelText( id ); + button.SetProperty( Toolkit::Button::Property::LABEL, id ); button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); button.SetParentOrigin( ParentOrigin::BOTTOM_LEFT ); @@ -422,7 +423,6 @@ public: 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 ); @@ -434,8 +434,9 @@ public: CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::FIT_WIDTH ) ); CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::FIT_HEIGHT ) ); - mPopup.Add( fittingModes ); - mPopup.Show(); + mPopup.SetContent( fittingModes ); + Stage::GetCurrent().Add( mPopup ); + mPopup.SetDisplayState( Toolkit::Popup::SHOWN ); } else if( button.GetName() == SAMPLING_BUTTON_ID ) { @@ -445,7 +446,6 @@ public: 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 ); @@ -461,8 +461,9 @@ public: CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::BOX_THEN_LINEAR ) ); CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::NO_FILTER ) ); - mPopup.Add( samplingModes ); - mPopup.Show(); + mPopup.SetContent( samplingModes ); + Stage::GetCurrent().Add( mPopup ); + mPopup.SetDisplayState( Toolkit::Popup::SHOWN ); } else if( CheckFittingModeButton( button, FittingMode::SCALE_TO_FILL) || CheckFittingModeButton( button, FittingMode::SHRINK_TO_FIT) || @@ -488,9 +489,9 @@ public: if( button.GetName() == modeName ) { mFittingMode = mode; - mFittingModeButton.SetLabelText( modeName ); + mFittingModeButton.SetProperty( Toolkit::Button::Property::LABEL, modeName ); ResizeImage(); - mPopup.Hide(); + mPopup.SetDisplayState( Toolkit::Popup::HIDDEN ); mPopup.Reset(); return true; } @@ -503,9 +504,9 @@ public: if( button.GetName() == modeName ) { mSamplingMode = mode; - mSamplingModeButton.SetLabelText( modeName ); + mSamplingModeButton.SetProperty( Toolkit::Button::Property::LABEL, modeName ); ResizeImage(); - mPopup.Hide(); + mPopup.SetDisplayState( Toolkit::Popup::HIDDEN ); mPopup.Reset(); return true; } @@ -516,26 +517,18 @@ public: { 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 TouchData& 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 ) @@ -570,7 +563,7 @@ public: } const float scale = pinch.scale; - if( scale != mLastPinchScale ) + if( ! Equals( scale, mLastPinchScale ) ) { if ( scale < mLastPinchScale ) { @@ -590,8 +583,10 @@ public: 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 ) ) ); + // 1.0f and 0.75f are the maximum size caps of the resized image, as a factor of stage-size. + mImageStageScale.x = std::max( 0.05f, std::min( 0.95f, mImageStageScale.x + ( gesture.displacement.x * 2.0f / stage.GetSize().width ) ) ); + mImageStageScale.y = std::max( 0.05f, std::min( 0.70f, mImageStageScale.y + ( gesture.displacement.y * 2.0f / stage.GetSize().height ) ) ); + ResizeImage(); } @@ -603,7 +598,7 @@ public: { if( mPopup && mPopup.IsVisible() ) { - mPopup.Hide(); + mPopup.SetDisplayState( Toolkit::Popup::HIDDEN ); mPopup.Reset(); } else @@ -651,13 +646,13 @@ public: else if ( event.keyPressedName == "f" ) { mSamplingMode = NextFilterMode( mSamplingMode ); - mSamplingModeButton.SetLabelText( StringFromFilterMode( mSamplingMode ) ); + mSamplingModeButton.SetProperty( Toolkit::Button::Property::LABEL, StringFromFilterMode( mSamplingMode ) ); } // Cycle filter and scaling modes: else if ( event.keyPressedName == "s" ) { mFittingMode = NextScalingMode( mFittingMode ); - mFittingModeButton.SetLabelText( StringFromScalingMode( mFittingMode ) ); + mFittingModeButton.SetProperty( Toolkit::Button::Property::LABEL, StringFromScalingMode( mFittingMode ) ); } else { @@ -669,21 +664,40 @@ public: } private: + + void LoadImage() + { + mImageLoading = true; + + const char * const path = IMAGE_PATHS[ mCurrentPath ]; + Stage stage = Stage::GetCurrent(); + Size imageSize = stage.GetSize() * mImageStageScale; + mImageView.SetSize( 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; + + mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); + + } + void ResizeImage() { - const char * const path = IMAGE_PATHS[mCurrentPath]; Stage stage = Stage::GetCurrent(); Size imageSize = stage.GetSize() * mImageStageScale; - const ImageDimensions imageSizeInt = ImageDimensions::FromFloatArray( &imageSize.x ); - ResourceImage image = ResourceImage::New( path, imageSizeInt, mFittingMode, mSamplingMode ); - image.LoadingFinishedSignal().Connect( this, &ImageScalingAndFilteringController::OnImageLoaded ); + LoadImage(); - mNextImage = image; + // 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 ) ) / stage.GetSize() ); + mDesiredBox.SetSize( stage.GetSize() * borderScale ); - mDesiredBox.SetSize( stage.GetSize() * mImageStageScale ); - mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height ); + mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height ); mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height ); } @@ -697,14 +711,16 @@ private: Toolkit::Popup mPopup; PinchGestureDetector mPinchDetector; float mLastPinchScale; - Toolkit::PushButton mGrabCorner; + Toolkit::ImageView mGrabCorner; PanGestureDetector mPanGestureDetector; - ImageActor mImageActor; - ResourceImage mNextImage; //< Currently-loading image + Toolkit::ImageView mImageView; Vector2 mImageStageScale; int mCurrentPath; FittingMode::Type mFittingMode; SamplingMode::Type mSamplingMode; + bool mImageLoading; + bool mQueuedImageLoad; + }; void RunTest( Application& application ) @@ -715,9 +731,9 @@ void RunTest( Application& application ) } // 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 );