/*
- * Copyright (c) 2018 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 "shared/view.h"
#include <dali/dali.h>
+#include <dali/devel-api/actors/actor-devel.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h>
using namespace Dali;
void OnInit(Application& app)
{
// The Init signal is received once (only) during the Application lifetime
+ Window window = app.GetWindow();
- Stage::GetCurrent().KeyEventSignal().Connect(this, &MotionStretchExampleApp::OnKeyEvent);
+ window.KeyEventSignal().Connect(this, &MotionStretchExampleApp::OnKeyEvent);
// Creates a default view with a default tool bar.
- // The view is added to the stage.
+ // The view is added to the window.
mContentLayer = DemoHelper::CreateView( mApplication,
mView,
mToolBar,
APPLICATION_TITLE );
// Ensure the content layer is a square so the touch area works in all orientations
- Vector2 stageSize = Stage::GetCurrent().GetSize();
- float size = std::max( stageSize.width, stageSize.height );
- mContentLayer.SetSize( size, size );
+ Vector2 windowSize = window.GetSize();
+ float size = std::max( windowSize.width, windowSize.height );
+ mContentLayer.SetProperty( Actor::Property::SIZE, Vector2( size, size ) );
//Add an slideshow icon on the right of the title
mActorEffectsButton = Toolkit::PushButton::New();
- mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
- mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
+ mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
+ mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked );
mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
// Creates a mode button.
// Create a effect toggle button. (right of toolbar)
Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
- layoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );
- layoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
+ layoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );
+ layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked);
- layoutButton.SetLeaveRequired( true );
+ layoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
// Input
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
- winHandle.ResizedSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
+ winHandle.ResizeSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
// set initial orientation
Rotate( PORTRAIT );
mMotionStretchEffect["url"] = MOTION_STRETCH_ACTOR_IMAGE1;
mMotionStretchImageView = ImageView::New();
mMotionStretchImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionStretchEffect );
- mMotionStretchImageView.SetParentOrigin( ParentOrigin::CENTER );
- mMotionStretchImageView.SetAnchorPoint( AnchorPoint::CENTER );
- mMotionStretchImageView.SetSize( MOTION_STRETCH_ACTOR_WIDTH, MOTION_STRETCH_ACTOR_HEIGHT );
+ mMotionStretchImageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ mMotionStretchImageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ mMotionStretchImageView.SetProperty( Actor::Property::SIZE, Vector2( MOTION_STRETCH_ACTOR_WIDTH, MOTION_STRETCH_ACTOR_HEIGHT ) );
+ // Add stretch padding
+ mMotionStretchImageView.SetProperty( DevelActor::Property::UPDATE_SIZE_HINT, Vector2( MOTION_STRETCH_ACTOR_WIDTH+32, MOTION_STRETCH_ACTOR_HEIGHT+32 ) );
mContentLayer.Add( mMotionStretchImageView );
//
//
- void OnWindowResized( Window::WindowSize size )
+ void OnWindowResized( Window window, Window::WindowSize size )
{
Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
}
void Rotate( DeviceOrientation orientation )
{
// Resize the root actor
- const Vector2 targetSize = Stage::GetCurrent().GetSize();
+ const Vector2 targetSize = mApplication.GetWindow().GetSize();
if( mOrientation != orientation )
{
mOrientation = orientation;
- // check if actor is on stage
+ // check if actor is on window
if( mView.GetParent() )
{
- // has parent so we expect it to be on stage, start animation
+ // has parent so we expect it to be on window, start animation
mRotateAnimation = Animation::New( ORIENTATION_DURATION );
mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width );
mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height );
}
else
{
- mView.SetSize( targetSize );
+ mView.SetProperty( Actor::Property::SIZE, targetSize );
}
}
else
{
// for first time just set size
- mView.SetSize( targetSize );
+ mView.SetProperty( Actor::Property::SIZE, targetSize );
}
}
float originOffsetX, originOffsetY;
// rotate offset (from top left origin to centre) into actor space
- Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
- actor.ScreenToLocal(originOffsetX, originOffsetY, stageSize.width * 0.5f, stageSize.height * 0.5f);
+ Vector2 windowSize = mApplication.GetWindow().GetSize();
+ actor.ScreenToLocal(originOffsetX, originOffsetY, windowSize.width * 0.5f, windowSize.height * 0.5f);
// get dest point in local actor space
destPos.x = tapGesture.localPoint.x - originOffsetX;
if(!mActorEffectsEnabled)
{
mActorEffectsEnabled = true;
- mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );
- mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED );
+ mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );
+ mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED );
}
else
{
mActorEffectsEnabled = false;
- mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
- mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
+ mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
+ mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
}
}