/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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 <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include "shared/view.h"
#include <iostream>
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 PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
-const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
-const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.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;
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 );
// The Init signal is received once (only) during the Application lifetime
void Create( Application& application )
{
- // Apply the default theme:
- DemoHelper::RequestThemeChange();
-
// 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 );
- ImageActor background = ImageActor::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;
widthPixel[1] = 0x4f;
widthPixel[2] = 0x4f;
- mHeightBox = ImageActor::New( heightBackground );
+ mHeightBox = Toolkit::ImageView::New( heightBackground );
mHeightBox.SetOpacity( 0.2f );
- stage.Add( mHeightBox );
+ background.Add( mHeightBox );
- mWidthBox = ImageActor::New( widthBackground );
+ mWidthBox = Toolkit::ImageView::New( widthBackground );
mWidthBox.SetOpacity( 0.2f );
- stage.Add( mWidthBox );
+ background.Add( mWidthBox );
- mDesiredBox = ImageActor::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 );
mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height );
mHeightBox.SetParentOrigin( ParentOrigin::CENTER );
mHeightBox.SetAnchorPoint( AnchorPoint::CENTER );
- mHeightBox.SetPosition( 0, 0, -1 );
mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height );
mWidthBox.SetParentOrigin( ParentOrigin::CENTER );
mWidthBox.SetAnchorPoint( AnchorPoint::CENTER );
- mWidthBox.SetPosition( 0, 0, -1 );
-
- // 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.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
- mGrabCorner.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
- mGrabCorner.SetDisabledImage( Dali::ResourceImage::New( PUSHBUTTON_DISABLED_IMAGE ) );
- 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.SetZ( 1.0f );
- mGrabCorner.SetOpacity( 0.6f );
- mDesiredBox.Add( mGrabCorner );
- mPanGestureDetector = PanGestureDetector::New();
- mPanGestureDetector.Attach( mGrabCorner );
- mPanGestureDetector.DetectedSignal().Connect( this, &ImageScalingAndFilteringController::OnPan );
// Initialize the actor
- mImageActor = ImageActor::New();
+ mImageView = Toolkit::ImageView::New( IMAGE_PATHS[ 0 ] );
// Reposition the actor
- mImageActor.SetParentOrigin( ParentOrigin::CENTER );
- mImageActor.SetAnchorPoint( AnchorPoint::CENTER );
+ mImageView.SetParentOrigin( ParentOrigin::CENTER );
+ mImageView.SetAnchorPoint( AnchorPoint::CENTER );
// Display the actor on the stage
- stage.Add( mImageActor );
+ mDesiredBox.Add( mImageView );
- mImageActor.SetSize( stage.GetSize() * mImageStageScale );
+ mImageView.SetSize( stage.GetSize() * mImageStageScale );
// Setup the pinch detector for scaling the desired image load dimensions:
mPinchDetector = PinchGestureDetector::New();
- mPinchDetector.Attach( mImageActor );
+ 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.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 );
+
// Tie-in input event handlers:
stage.KeyEventSignal().Connect( this, &ImageScalingAndFilteringController::OnKeyEvent );
// 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 );
- Actor imagePrevious = ImageActor::New( playImage );
+ Toolkit::ImageView imagePrevious = Toolkit::ImageView::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ) );
// Last image button:
imagePrevious.SetAnchorPoint( AnchorPoint::TOP_LEFT );
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:
- Actor imageNext = ImageActor::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:
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 ) );
- button.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
fittingModeGroup.Add( button );
mFittingModeButton = button;
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 ) );
- button.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
samplingModeGroup.Add( button );
mSamplingModeButton = button;
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.SetLabel( 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.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
- button.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
- button.SetDisabledImage( Dali::ResourceImage::New( PUSHBUTTON_DISABLED_IMAGE ) );
button.ClickedSignal().Connect( this, &ImageScalingAndFilteringController::OnButtonClicked );
return button;
}
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.SetLabel( id );
- button.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
- button.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
- Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( button.GetLabel() );
- textLabel.SetProperty( TextLabel::Property::POINT_SIZE, 12.0f );
+ button.SetProperty( Toolkit::Button::Property::LABEL, id );
button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
button.SetParentOrigin( ParentOrigin::BOTTOM_LEFT );
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 );
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 )
{
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 );
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) ||
if( button.GetName() == 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;
}
if( button.GetName() == 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;
}
{
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() ) );
+ DALI_ASSERT_DEBUG( image == mNextImage );
+ mImageView.SetImage( image );
+ mImageView.SetSize( Size( image.GetWidth(), image.GetHeight() ) );
+ mImageLoading = false;
+
+ // We have finished loading, if a resize had occured during the load, trigger another load now.
+ if( mQueuedImageLoad )
+ {
+ mQueuedImageLoad = false;
+ LoadImage();
+ }
}
- 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 )
}
const float scale = pinch.scale;
- if( scale != mLastPinchScale )
+ if( ! Equals( scale, mLastPinchScale ) )
{
if ( scale < mLastPinchScale )
{
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();
}
{
if( mPopup && mPopup.IsVisible() )
{
- mPopup.Hide();
+ mPopup.SetDisplayState( Toolkit::Popup::HIDDEN );
mPopup.Reset();
}
else
else if ( event.keyPressedName == "f" )
{
mSamplingMode = NextFilterMode( mSamplingMode );
- mSamplingModeButton.SetLabel( StringFromFilterMode( mSamplingMode ) );
- mSamplingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
+ mSamplingModeButton.SetProperty( Toolkit::Button::Property::LABEL, StringFromFilterMode( mSamplingMode ) );
}
// Cycle filter and scaling modes:
else if ( event.keyPressedName == "s" )
{
mFittingMode = NextScalingMode( mFittingMode );
- mFittingModeButton.SetLabel( StringFromScalingMode( mFittingMode ) );
- mFittingModeButton.GetLabel().SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_TEXT );
+ mFittingModeButton.SetProperty( Toolkit::Button::Property::LABEL, StringFromScalingMode( mFittingMode ) );
}
else
{
}
private:
- void ResizeImage()
+
+ void LoadImage()
{
- const char * const path = IMAGE_PATHS[mCurrentPath];
+ mImageLoading = true;
+ 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 );
+
+ // If the image was cached, the load has already occured, bypass hooking the signal.
+ if( image.GetLoadingState() )
+ {
+ OnImageLoaded( image );
+ }
+ else
+ {
+ image.LoadingFinishedSignal().Connect( this, &ImageScalingAndFilteringController::OnImageLoaded );
+ }
mNextImage = image;
+ }
- mDesiredBox.SetSize( stage.GetSize() * mImageStageScale );
- mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height );
+ void ResizeImage()
+ {
+
+ Stage stage = Stage::GetCurrent();
+ Size imageSize = stage.GetSize() * mImageStageScale;
+
+ // If an image is already loading, queue another load when it has finished.
+ // This way we get continuous updates instead of constantly re-requesting loads.
+ if( mImageLoading )
+ {
+ mQueuedImageLoad = true;
+ }
+ else
+ {
+ LoadImage();
+ }
+
+ // 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 );
+
+ mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height );
mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height );
}
private:
Application& mApplication;
- Actor mDesiredBox; //< Background rectangle to show requested image size.
- Actor mHeightBox; //< Background horizontal stripe to show requested image height.
- Actor mWidthBox; //< Background vertical stripe to show requested image width.
+ 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;
PinchGestureDetector mPinchDetector;
float mLastPinchScale;
- Toolkit::PushButton mGrabCorner;
+ Toolkit::ImageView mGrabCorner;
PanGestureDetector mPanGestureDetector;
- ImageActor mImageActor;
+ Toolkit::ImageView mImageView;
ResourceImage mNextImage; //< Currently-loading image
Vector2 mImageStageScale;
int mCurrentPath;
FittingMode::Type mFittingMode;
SamplingMode::Type mSamplingMode;
+ bool mImageLoading;
+ bool mQueuedImageLoad;
+
};
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 );
+ Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
RunTest( application );
projects / platform / core / uifw / dali-demo.git / blobdiff