/*
- * Copyright (c) 2017 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.
#include <dali/devel-api/actors/actor-devel.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
#include "shared/view.h"
#include <iostream>
ImageScalingAndFilteringController( Application& application )
: mApplication( application ),
mLastPinchScale( 1.0f ),
- mImageStageScale( 0.5f, 0.5f ),
+ mImageWindowScale( 0.5f, 0.5f ),
mCurrentPath( 0 ),
mFittingMode( FittingMode::FIT_WIDTH ),
mSamplingMode( SamplingMode::BOX_THEN_LINEAR),
// The Init signal is received once (only) during the Application lifetime
void Create( Application& application )
{
- // Get a handle to the stage
- Stage stage = Stage::GetCurrent();
-
- // Hide the indicator bar
- application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+ // Get a handle to the window
+ Window window = application.GetWindow();
+ Vector2 windowSize = window.GetSize();
// Background image:
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::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.SetSize( stage.GetSize() );
- stage.Add( background );
-
- 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.SetProperty( DevelActor::Property::OPACITY, 0.2f );
- background.Add( mHeightBox );
-
- mWidthBox = Toolkit::ImageView::New( widthBackground );
- mWidthBox.SetProperty( DevelActor::Property::OPACITY, 0.2f );
- background.Add( mWidthBox );
+ background.SetProperty( Actor::Property::SIZE, windowSize );
+ window.Add( background );
mDesiredBox = Toolkit::ImageView::New( BORDER_IMAGE );
background.Add( mDesiredBox );
- mDesiredBox.SetSize( stage.GetSize() * mImageStageScale );
+ mDesiredBox.SetProperty( Actor::Property::SIZE, windowSize * mImageWindowScale );
mDesiredBox.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
mDesiredBox.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
- mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height );
- mHeightBox.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- mHeightBox.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-
- mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height );
- mWidthBox.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- mWidthBox.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-
// Initialize the actor
mImageView = Toolkit::ImageView::New( IMAGE_PATHS[ 0 ] );
mImageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
mImageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
- // Display the actor on the stage
+ // Display the actor on the window
mDesiredBox.Add( mImageView );
- mImageView.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();
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.SetPosition( -BORDER_WIDTH, -BORDER_WIDTH );
- mGrabCorner.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+ 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 );
mPanGestureDetector.DetectedSignal().Connect( this, &ImageScalingAndFilteringController::OnPan );
// Tie-in input event handlers:
- stage.KeyEventSignal().Connect( this, &ImageScalingAndFilteringController::OnKeyEvent );
+ window.KeyEventSignal().Connect( this, &ImageScalingAndFilteringController::OnKeyEvent );
CreateControls();
*/
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.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);
- stage.Add( controlsLayer );
+ 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 );
+ // 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.SetProperty( Actor::Property::ANCHOR_POINT, 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.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+ 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.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
+ imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
// Next image button:
Toolkit::ImageView imageNext = Toolkit::ImageView::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ) );
imageNext.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT );
- imageNext.SetY( playWidth * 0.5f );
- imageNext.SetX( stage.GetSize().x - playWidth * 0.5f );
- imageNext.SetProperty( DevelActor::Property::OPACITY, 0.6f );
+ 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.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
+ imageNext.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched );
// Buttons to popup selectors for fitting and sampling modes:
modesGroupBackground.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT );
modesGroupBackground.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT );
- modesGroupBackground.SetPosition( 0.0f, 0.0f );
+ modesGroupBackground.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f ));
controlsLayer.Add( modesGroupBackground );
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.SetProperty( Dali::Actor::Property::NAME, "POPUP" );
popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
- popup.SetSize( POPUP_WIDTH_DP, 0.0f );
+ popup.SetProperty( Actor::Property::SIZE, Vector2( POPUP_WIDTH_DP, 0.0f ) );
popup.OutsideTouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnPopupOutsideTouched );
CreatePopupButton( fittingModes, StringFromScalingMode( FittingMode::FIT_HEIGHT ) );
mPopup.SetContent( fittingModes );
- Stage::GetCurrent().Add( mPopup );
+ mApplication.GetWindow().Add( mPopup );
mPopup.SetDisplayState( Toolkit::Popup::SHOWN );
}
else if( button.GetProperty< std::string >( Dali::Actor::Property::NAME ) == SAMPLING_BUTTON_ID )
CreatePopupButton( samplingModes, StringFromFilterMode( SamplingMode::NO_FILTER ) );
mPopup.SetContent( samplingModes );
- Stage::GetCurrent().Add( mPopup );
+ mApplication.GetWindow().Add( mPopup );
mPopup.SetDisplayState( Toolkit::Popup::SHOWN );
}
else if( CheckFittingModeButton( button, FittingMode::SCALE_TO_FILL) ||
}
}
- bool OnControlTouched( Actor actor, const TouchData& event )
+ bool OnControlTouched( Actor actor, const TouchEvent& event )
{
if(event.GetPointCount() > 0)
{
void OnPinch( Actor actor, const PinchGesture& pinch )
{
- if( pinch.state == Gesture::Started )
+ if( pinch.GetState() == Gesture::Started )
{
- mLastPinchScale = pinch.scale;
+ mLastPinchScale = pinch.GetScale();
}
- const float scale = pinch.scale;
+ const float scale = pinch.GetScale();
if( ! Equals( 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();
}
void OnPan( Actor actor, const PanGesture& gesture )
{
- Stage stage = Stage::GetCurrent();
- // 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 ) ) );
+ 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 ) )
{
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;
}
- 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.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.SetProperty( Toolkit::Button::Property::LABEL, StringFromScalingMode( mFittingMode ) );
mImageLoading = true;
const char * const path = IMAGE_PATHS[ mCurrentPath ];
- Stage stage = Stage::GetCurrent();
- Size imageSize = stage.GetSize() * mImageStageScale;
- mImageView.SetSize( imageSize );
+ 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;
void ResizeImage()
{
- Stage stage = Stage::GetCurrent();
- Size imageSize = stage.GetSize() * mImageStageScale;
+ Window window = mApplication.GetWindow();
+ Vector2 windowSize = window.GetSize();
+ Size imageSize = windowSize * mImageWindowScale;
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 );
+ 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;
Toolkit::ImageView mGrabCorner;
PanGestureDetector mPanGestureDetector;
Toolkit::ImageView mImageView;
- Vector2 mImageStageScale;
+ Vector2 mImageWindowScale;
int mCurrentPath;
FittingMode::Type mFittingMode;
SamplingMode::Type mSamplingMode;
projects / platform / core / uifw / dali-demo.git / blobdiff