/*
- * 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.
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[] =
{
ImageScalingAndFilteringController( Application& application )
: mApplication( application ),
+ mLastPinchScale( 1.0f ),
mImageStageScale( 0.5f, 0.5f ),
mCurrentPath( 0 ),
mFittingMode( FittingMode::FIT_WIDTH ),
// Get a handle to the stage
Stage stage = Stage::GetCurrent();
+ // Hide the indicator bar
+ application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
// Background image:
Dali::Property::Map backgroundImage;
- backgroundImage.Insert( "rendererType", "image" );
- backgroundImage.Insert( "imageUrl", BACKGROUND_IMAGE );
- backgroundImage.Insert( "imageDesiredWidth", stage.GetSize().width );
- backgroundImage.Insert( "imageDesiredHeight", stage.GetSize().height );
- backgroundImage.Insert( "imageFittingMode", "scaleToFill" );
- backgroundImage.Insert( "imageSamplingMode", "boxThenNearest" );
+ 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 );
// 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 );
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:
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 ) );
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 ) );
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 );
{
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 );
if( button.GetName() == modeName )
{
mFittingMode = mode;
- mFittingModeButton.SetLabelText( modeName );
+ mFittingModeButton.SetProperty( Toolkit::Button::Property::LABEL, modeName );
ResizeImage();
mPopup.SetDisplayState( Toolkit::Popup::HIDDEN );
mPopup.Reset();
if( button.GetName() == modeName )
{
mSamplingMode = mode;
- mSamplingModeButton.SetLabelText( modeName );
+ mSamplingModeButton.SetProperty( Toolkit::Button::Property::LABEL, modeName );
ResizeImage();
mPopup.SetDisplayState( Toolkit::Popup::HIDDEN );
mPopup.Reset();
}
}
- void OnImageLoaded( ResourceImage image )
- {
- 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 )
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
{
const char * const path = IMAGE_PATHS[ mCurrentPath ];
Stage stage = Stage::GetCurrent();
Size imageSize = stage.GetSize() * mImageStageScale;
- const ImageDimensions imageSizeInt = ImageDimensions::FromFloatArray( &imageSize.x );
+ mImageView.SetSize( imageSize );
- ResourceImage image = ResourceImage::New( path, imageSizeInt, mFittingMode, mSamplingMode );
+ 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;
- // 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 );
- }
+ mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
- mNextImage = image;
}
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();
- }
+ 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() );
Toolkit::ImageView mGrabCorner;
PanGestureDetector mPanGestureDetector;
Toolkit::ImageView mImageView;
- ResourceImage mNextImage; //< Currently-loading image
Vector2 mImageStageScale;
int mCurrentPath;
FittingMode::Type mFittingMode;
};
-void RunTest( Application& application )
-{
- ImageScalingAndFilteringController test( application );
-
- application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
int DALI_EXPORT_API main( int argc, char **argv )
{
Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
-
- RunTest( application );
-
+ ImageScalingAndFilteringController test( application );
+ application.MainLoop();
return 0;
}