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=c4e8ce2bcd99c7c7b9192b315d61e2c1c596230a;hp=e758f1fdcd2c1cfb3f3c8e640ff66efc7bac2d78;hb=9a5ce98a301f74f8df8a3be6d223b525c8839b0b;hpb=a073ebfd862b49692c8e6d7dff2b128e62a4f6df diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index e758f1f..c4e8ce2 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) 2021 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. @@ -19,45 +19,47 @@ #include // EXTERNAL INCLUDES +#include #include #include -#include -#include -#include +#include +#include #include -#include +#include // INTERNAL INCLUDES -#include +#include +#include +#include +#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace // unnamed namespace { - - Dali::BaseHandle Create() { return Toolkit::Magnifier::New(); } -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Magnifier, Toolkit::Control, Create ) +// clang-format off +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_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_ANIMATABLE_PROPERTY_REGISTRATION(Toolkit, Magnifier, "sourcePosition", VECTOR3, SOURCE_POSITION) DALI_TYPE_REGISTRATION_END() +// clang-format on -const float IMAGE_BORDER_INDENT = 5.0f; ///< Indent of border in pixels. +const float IMAGE_BORDER_INDENT = 5.0f; ///< Indent of border in pixels. struct CameraActorPositionConstraint { @@ -67,7 +69,7 @@ struct CameraActorPositionConstraint { } - void operator()( Vector3& current, const PropertyInputContainer& inputs ) + void operator()(Vector3& current, const PropertyInputContainer& inputs) { const Vector3& sourcePosition = inputs[0]->GetVector3(); @@ -77,8 +79,7 @@ struct CameraActorPositionConstraint } Vector2 mStageSize; - float mDefaultCameraDistance; - + float mDefaultCameraDistance; }; struct RenderTaskViewportPositionConstraint @@ -88,7 +89,7 @@ struct RenderTaskViewportPositionConstraint { } - void operator()( Vector2& current, const PropertyInputContainer& inputs ) + void operator()(Vector2& current, const PropertyInputContainer& inputs) { current = inputs[0]->GetVector3(); // World position? @@ -98,8 +99,8 @@ struct RenderTaskViewportPositionConstraint Vector3 size = inputs[1]->GetVector3() * inputs[2]->GetVector3(); /* magnifier-size * magnifier-scale */ // Reposition, and resize viewport to reflect the world bounds of this Magnifier actor. - current.x += ( mStageSize.width - size.width ) * 0.5f; - current.y += ( mStageSize.height - size.height ) * 0.5f; + current.x += (mStageSize.width - size.width) * 0.5f; + current.y += (mStageSize.height - size.height) * 0.5f; } Vector2 mStageSize; @@ -111,7 +112,7 @@ struct RenderTaskViewportSizeConstraint { } - void operator()( Vector2& current, const PropertyInputContainer& inputs ) + void operator()(Vector2& current, const PropertyInputContainer& inputs) { current = inputs[0]->GetVector3() * inputs[1]->GetVector3(); /* magnifier-size * magnifier-scale */ } @@ -139,7 +140,7 @@ Dali::Toolkit::Magnifier Magnifier::New() } Magnifier::Magnifier() -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ), +: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)), mDefaultCameraDistance(1000.f), mActorSize(Vector3::ZERO), mMagnificationFactor(1.0f) @@ -148,12 +149,12 @@ Magnifier::Magnifier() void Magnifier::SetSourceActor(Actor actor) { - mTask.SetSourceActor( actor ); + mTask.SetSourceActor(actor); } void Magnifier::Initialize() { - Actor self = Self(); + Actor self = Self(); Vector2 stageSize(Stage::GetCurrent().GetSize()); // NOTE: @@ -168,9 +169,9 @@ void Magnifier::Initialize() // and what is not. mSourceActor = Actor::New(); Stage().GetCurrent().Add(mSourceActor); - mSourceActor.SetParentOrigin(ParentOrigin::CENTER); - Constraint constraint = Constraint::New( mSourceActor, Actor::Property::POSITION, EqualToConstraint() ); - constraint.AddSource( Source( self, Toolkit::Magnifier::Property::SOURCE_POSITION ) ); + mSourceActor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + Constraint constraint = Constraint::New(mSourceActor, Actor::Property::POSITION, EqualToConstraint()); + constraint.AddSource(Source(self, Toolkit::Magnifier::Property::SOURCE_POSITION)); constraint.Apply(); // create the render task this will render content on top of everything @@ -190,37 +191,41 @@ void Magnifier::Initialize() // But we can determine the initial position using the same formula: // distance = stage.height * 0.5 / tan(FOV * 0.5) - RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); - RenderTask renderTask = taskList.GetTask(0u); - float fov = renderTask.GetCameraActor().GetFieldOfView(); - mDefaultCameraDistance = (stageSize.height * 0.5f) / tanf(fov * 0.5f); + RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); + RenderTask renderTask = taskList.GetTask(0u); + float fov = renderTask.GetCameraActor().GetFieldOfView(); + mDefaultCameraDistance = (stageSize.height * 0.5f) / tanf(fov * 0.5f); // 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("delayedSourcePosition", Vector3::ZERO); - constraint = Constraint::New( mCameraActor, Actor::Property::POSITION, CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) ); - constraint.AddSource( Source( mSourceActor, Actor::Property::WORLD_POSITION ) ); + constraint = Constraint::New(mCameraActor, Actor::Property::POSITION, CameraActorPositionConstraint(stageSize, mDefaultCameraDistance)); + constraint.AddSource(Source(mSourceActor, Actor::Property::WORLD_POSITION)); constraint.Apply(); // Apply constraint to render-task viewport position - constraint = Constraint::New( mTask, RenderTask::Property::VIEWPORT_POSITION, RenderTaskViewportPositionConstraint(stageSize) ); - constraint.AddSource( Source( self, Actor::Property::WORLD_POSITION ) ); - constraint.AddSource( Source( self, Actor::Property::SIZE ) ); - constraint.AddSource( Source( self, Actor::Property::WORLD_SCALE ) ); + constraint = Constraint::New(mTask, RenderTask::Property::VIEWPORT_POSITION, RenderTaskViewportPositionConstraint(stageSize)); + constraint.AddSource(Source(self, Actor::Property::WORLD_POSITION)); + constraint.AddSource(Source(self, Actor::Property::SIZE)); + constraint.AddSource(Source(self, Actor::Property::WORLD_SCALE)); constraint.Apply(); // Apply constraint to render-task viewport position - constraint = Constraint::New( mTask, RenderTask::Property::VIEWPORT_SIZE, RenderTaskViewportSizeConstraint() ); - constraint.AddSource( Source( self, Actor::Property::SIZE ) ); - constraint.AddSource( Source( self, Actor::Property::WORLD_SCALE ) ); + constraint = Constraint::New(mTask, RenderTask::Property::VIEWPORT_SIZE, RenderTaskViewportSizeConstraint()); + constraint.AddSource(Source(self, Actor::Property::SIZE)); + constraint.AddSource(Source(self, Actor::Property::WORLD_SCALE)); constraint.Apply(); + + DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) { + return std::unique_ptr( + new DevelControl::ControlAccessible(actor, Dali::Accessibility::Role::FILLER)); + }); } Magnifier::~Magnifier() { - } void Magnifier::InitializeRenderTask() @@ -238,7 +243,7 @@ void Magnifier::InitializeRenderTask() mCameraActor.SetType(Camera::FREE_LOOK); stage.Add(mCameraActor); - mTask.SetCameraActor( mCameraActor ); + mTask.SetCameraActor(mCameraActor); SetFrameVisibility(true); } @@ -254,20 +259,24 @@ void Magnifier::SetFrameVisibility(bool visible) { Actor self(Self()); - mFrame = Actor::New( ); - mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION); - mFrame.SetInheritScale(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 = 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.SetProperty(Actor::Property::SIZE_MODE_FACTOR, sizeOffset); + + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); - //TODO Set the renderer onto the control self when Actor::RemoveRenderer is supported - Toolkit::RendererFactory rendererFactory = Toolkit::RendererFactory::Get(); - Toolkit::ControlRenderer borderRenderer = rendererFactory.GetControlRenderer(IMAGE_BORDER_INDENT, Color::WHITE); - borderRenderer.SetOnStage( mFrame ); + 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 constraint = Constraint::New(mFrame, Actor::Property::POSITION, EqualToConstraint()); + constraint.AddSource(ParentSource(Actor::Property::WORLD_POSITION)); constraint.Apply(); self.Add(mFrame); @@ -287,6 +296,8 @@ void Magnifier::OnSizeSet(const Vector3& targetSize) // a constraint yet as Camera/CameraActor properties are not animatable/constrainable. mActorSize = targetSize; Update(); + + Control::OnSizeSet(targetSize); } float Magnifier::GetMagnificationFactor() const @@ -306,8 +317,8 @@ void Magnifier::Update() // should be updated when: // Magnifier's world size/scale changes. - Actor self(Self()); - Vector3 worldSize = mActorSize * self.GetCurrentWorldScale(); + Actor self(Self()); + Vector3 worldSize = mActorSize * self.GetCurrentProperty(Actor::Property::WORLD_SCALE); // Adjust field of view to scale content @@ -320,46 +331,46 @@ void Magnifier::Update() // |./ // |/ <--- fov/2 radians. // - const float fov = atanf( 0.5f * worldSize.height / mDefaultCameraDistance / mMagnificationFactor) * 2.0f; - mCameraActor.SetFieldOfView( fov ); + const float fov = atanf(0.5f * worldSize.height / mDefaultCameraDistance / mMagnificationFactor) * 2.0f; + mCameraActor.SetFieldOfView(fov); // Adjust aspect ratio to compensate for rectangular viewports. - mCameraActor.SetAspectRatio( worldSize.width / worldSize.height ); + mCameraActor.SetAspectRatio(worldSize.width / worldSize.height); } -void Magnifier::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +void Magnifier::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value) { - Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast( Dali::BaseHandle( object ) ); + Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast(Dali::BaseHandle(object)); - if( magnifier ) + if(magnifier) { - Magnifier& magnifierImpl( GetImpl( magnifier ) ); - switch( index ) + Magnifier& magnifierImpl(GetImpl(magnifier)); + switch(index) { case Toolkit::Magnifier::Property::FRAME_VISIBILITY: { - magnifierImpl.SetFrameVisibility( value.Get< bool >() ); + magnifierImpl.SetFrameVisibility(value.Get()); break; } case Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR: { - magnifierImpl.SetMagnificationFactor( value.Get< float >() ); + magnifierImpl.SetMagnificationFactor(value.Get()); break; } } } } -Property::Value Magnifier::GetProperty( BaseObject* object, Property::Index index ) +Property::Value Magnifier::GetProperty(BaseObject* object, Property::Index index) { Property::Value value; - Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast( Dali::BaseHandle( object ) ); + Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast(Dali::BaseHandle(object)); - if( magnifier ) + if(magnifier) { - Magnifier& magnifierImpl( GetImpl( magnifier ) ); - switch( index ) + Magnifier& magnifierImpl(GetImpl(magnifier)); + switch(index) { case Toolkit::Magnifier::Property::FRAME_VISIBILITY: {