X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmagnifier%2Fmagnifier-impl.cpp;h=478c14bcc98883a0db4d49609d52cadfc8bb4f7f;hp=29e5bec3c884166b6a3f55b08f2c4d58aa540c13;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=e4e5db1d2d7997e7bf803a531048d8dcb959083b diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index 29e5bec..478c14b 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -21,18 +21,46 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include -#include +#include +#include +#include -using namespace Dali; +// INTERNAL INCLUDES +#include +#include +#include +#include + +namespace Dali +{ + +namespace Toolkit +{ + +namespace Internal +{ namespace // unnamed namespace { -const char* DEFAULT_FRAME_IMAGE_PATH = DALI_IMAGE_DIR "magnifier-image-frame.png"; -const float IMAGE_BORDER_INDENT = 14.0f; ///< Indent of border in pixels. +Dali::BaseHandle Create() +{ + return Toolkit::Magnifier::New(); +} + +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Magnifier, Toolkit::Control, Create ) + +DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "frameVisibility", BOOLEAN, FRAME_VISIBILITY ) +DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "magnificationFactor", FLOAT, MAGNIFICATION_FACTOR ) + +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Magnifier, "sourcePosition", VECTOR3, SOURCE_POSITION ) + +DALI_TYPE_REGISTRATION_END() + +const float IMAGE_BORDER_INDENT = 5.0f; ///< Indent of border in pixels. struct CameraActorPositionConstraint { @@ -92,16 +120,7 @@ struct RenderTaskViewportSizeConstraint } }; -} - -namespace Dali -{ - -namespace Toolkit -{ - -namespace Internal -{ +} // unnamed namespace /////////////////////////////////////////////////////////////////////////////////////////////////// // Magnifier @@ -123,8 +142,7 @@ Dali::Toolkit::Magnifier Magnifier::New() } Magnifier::Magnifier() -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ), - mPropertySourcePosition(Property::INVALID_INDEX), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mDefaultCameraDistance(1000.f), mActorSize(Vector3::ZERO), mMagnificationFactor(1.0f) @@ -136,15 +154,9 @@ void Magnifier::SetSourceActor(Actor actor) mTask.SetSourceActor( actor ); } -void Magnifier::SetSourcePosition(const Vector3& position) -{ - Self().SetProperty(mPropertySourcePosition, position); -} - void Magnifier::Initialize() { Actor self = Self(); - mPropertySourcePosition = self.RegisterProperty( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME, Vector3::ZERO ); Vector2 stageSize(Stage::GetCurrent().GetSize()); // NOTE: @@ -159,9 +171,9 @@ void Magnifier::Initialize() // and what is not. mSourceActor = Actor::New(); Stage().GetCurrent().Add(mSourceActor); - mSourceActor.SetParentOrigin(ParentOrigin::CENTER); + mSourceActor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER ); Constraint constraint = Constraint::New( mSourceActor, Actor::Property::POSITION, EqualToConstraint() ); - constraint.AddSource( Source( self, mPropertySourcePosition ) ); + constraint.AddSource( Source( self, Toolkit::Magnifier::Property::SOURCE_POSITION ) ); constraint.Apply(); // create the render task this will render content on top of everything @@ -189,7 +201,7 @@ void Magnifier::Initialize() // Use a 1 frame delayed source position to determine the camera actor's position. // This is necessary as the viewport is determined by the Magnifier's Actor's World position (which is computed // at the end of the update cycle i.e. after constraints have been applied.) - //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayed-source-position", Vector3::ZERO); + //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayedSourcePosition", Vector3::ZERO); constraint = Constraint::New( mCameraActor, Actor::Property::POSITION, CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) ); constraint.AddSource( Source( mSourceActor, Actor::Property::WORLD_POSITION ) ); @@ -245,21 +257,26 @@ void Magnifier::SetFrameVisibility(bool visible) { Actor self(Self()); - Image image = ResourceImage::New( DEFAULT_FRAME_IMAGE_PATH ); - mFrame = ImageActor::New( image ); - mFrame.SetDrawMode(DrawMode::OVERLAY); - mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH ); - mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION); - mFrame.SetInheritScale(true); + mFrame = Actor::New( ); + mFrame.SetProperty( Actor::Property::INHERIT_POSITION, false ); + mFrame.SetProperty( Actor::Property::INHERIT_SCALE, true ); mFrame.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); - mFrame.SetSizeModeFactor( sizeOffset ); + mFrame.SetProperty( Actor::Property::SIZE_MODE_FACTOR, sizeOffset ); + + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); + + Property::Map map; + map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::BORDER; + map[ Toolkit::BorderVisual::Property::COLOR ] = Color::WHITE; + map[ Toolkit::BorderVisual::Property::SIZE ] = IMAGE_BORDER_INDENT; + Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map ); + Toolkit::GetImplementation(borderVisual).SetOnScene( mFrame ); Constraint constraint = Constraint::New( mFrame, Actor::Property::POSITION, EqualToConstraint() ); constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) ); constraint.Apply(); - mFrame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT ); self.Add(mFrame); } else if(!visible && mFrame) @@ -268,7 +285,7 @@ void Magnifier::SetFrameVisibility(bool visible) } } -void Magnifier::OnControlSizeSet(const Vector3& targetSize) +void Magnifier::OnSizeSet(const Vector3& targetSize) { // TODO: Once Camera/CameraActor properties function as proper animatable properties // this code can disappear. @@ -277,6 +294,8 @@ void Magnifier::OnControlSizeSet(const Vector3& targetSize) // a constraint yet as Camera/CameraActor properties are not animatable/constrainable. mActorSize = targetSize; Update(); + + Control::OnSizeSet( targetSize ); } float Magnifier::GetMagnificationFactor() const @@ -297,7 +316,7 @@ void Magnifier::Update() // should be updated when: // Magnifier's world size/scale changes. Actor self(Self()); - Vector3 worldSize = mActorSize * self.GetCurrentWorldScale(); + Vector3 worldSize = mActorSize * self.GetCurrentProperty< Vector3 >( Actor::Property::WORLD_SCALE ); // Adjust field of view to scale content @@ -317,6 +336,56 @@ void Magnifier::Update() mCameraActor.SetAspectRatio( worldSize.width / worldSize.height ); } +void Magnifier::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +{ + Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast( Dali::BaseHandle( object ) ); + + if( magnifier ) + { + Magnifier& magnifierImpl( GetImpl( magnifier ) ); + switch( index ) + { + case Toolkit::Magnifier::Property::FRAME_VISIBILITY: + { + magnifierImpl.SetFrameVisibility( value.Get< bool >() ); + break; + } + case Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR: + { + magnifierImpl.SetMagnificationFactor( value.Get< float >() ); + break; + } + } + } +} + +Property::Value Magnifier::GetProperty( BaseObject* object, Property::Index index ) +{ + Property::Value value; + + Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast( Dali::BaseHandle( object ) ); + + if( magnifier ) + { + Magnifier& magnifierImpl( GetImpl( magnifier ) ); + switch( index ) + { + case Toolkit::Magnifier::Property::FRAME_VISIBILITY: + { + value = magnifierImpl.GetFrameVisibility(); + break; + } + case Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR: + { + value = magnifierImpl.GetMagnificationFactor(); + break; + } + } + } + + return value; +} + } // namespace Internal } // namespace Toolkit