projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Squashed implementation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
magnifier
/
magnifier-impl.cpp
diff --git
a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
index
b69313c
..
aa1416a
100644
(file)
--- a/
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
+++ b/
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-21,16
+21,18
@@
// EXTERNAL INCLUDES
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/animation/constraints.h>
// EXTERNAL INCLUDES
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/animation/constraints.h>
-#include <dali/
public
-api/common/stage.h>
+#include <dali/
devel
-api/common/stage.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/visuals/border-visual-properties.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
namespace Dali
{
namespace Dali
{
@@
-141,11
+143,16
@@
Dali::Toolkit::Magnifier Magnifier::New()
}
Magnifier::Magnifier()
}
Magnifier::Magnifier()
-: Control( ControlBehaviour(
ACTOR_BEHAVIOUR_NONE
) ),
+: Control( ControlBehaviour(
CONTROL_BEHAVIOUR_DEFAULT
) ),
mDefaultCameraDistance(1000.f),
mActorSize(Vector3::ZERO),
mMagnificationFactor(1.0f)
{
mDefaultCameraDistance(1000.f),
mActorSize(Vector3::ZERO),
mMagnificationFactor(1.0f)
{
+ DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+ return std::unique_ptr< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::FILLER ) );
+ } );
+
}
void Magnifier::SetSourceActor(Actor actor)
}
void Magnifier::SetSourceActor(Actor actor)
@@
-170,7
+177,7
@@
void Magnifier::Initialize()
// and what is not.
mSourceActor = Actor::New();
Stage().GetCurrent().Add(mSourceActor);
// and what is not.
mSourceActor = Actor::New();
Stage().GetCurrent().Add(mSourceActor);
- mSourceActor.SetP
arentOrigin(ParentOrigin::CENTER
);
+ mSourceActor.SetP
roperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER
);
Constraint constraint = Constraint::New<Vector3>( mSourceActor, Actor::Property::POSITION, EqualToConstraint() );
constraint.AddSource( Source( self, Toolkit::Magnifier::Property::SOURCE_POSITION ) );
constraint.Apply();
Constraint constraint = Constraint::New<Vector3>( mSourceActor, Actor::Property::POSITION, EqualToConstraint() );
constraint.AddSource( Source( self, Toolkit::Magnifier::Property::SOURCE_POSITION ) );
constraint.Apply();
@@
-257,20
+264,20
@@
void Magnifier::SetFrameVisibility(bool visible)
Actor self(Self());
mFrame = Actor::New( );
Actor self(Self());
mFrame = Actor::New( );
- mFrame.Set
InheritPosition(false
);
- mFrame.Set
InheritScale(true
);
+ mFrame.Set
Property( Actor::Property::INHERIT_POSITION, false
);
+ mFrame.Set
Property( 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.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.Set
SizeModeFactor(
sizeOffset );
+ mFrame.Set
Property( Actor::Property::SIZE_MODE_FACTOR,
sizeOffset );
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Property::Map map;
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Property::Map map;
- map[
RENDERER_TYPE ] = BORDER_RENDER
ER;
- map[
"borderColor"
] = Color::WHITE;
- map[
"borderSize"
] = IMAGE_BORDER_INDENT;
+ map[
Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::BORD
ER;
+ map[
Toolkit::BorderVisual::Property::COLOR
] = Color::WHITE;
+ map[
Toolkit::BorderVisual::Property::SIZE
] = IMAGE_BORDER_INDENT;
Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map );
Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map );
-
borderVisual.SetOnStag
e( mFrame );
+
Toolkit::GetImplementation(borderVisual).SetOnScen
e( mFrame );
Constraint constraint = Constraint::New<Vector3>( mFrame, Actor::Property::POSITION, EqualToConstraint() );
constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) );
Constraint constraint = Constraint::New<Vector3>( mFrame, Actor::Property::POSITION, EqualToConstraint() );
constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) );
@@
-286,8
+293,6
@@
void Magnifier::SetFrameVisibility(bool visible)
void Magnifier::OnSizeSet(const Vector3& targetSize)
{
void Magnifier::OnSizeSet(const Vector3& targetSize)
{
- Control::OnSizeSet( targetSize );
-
// TODO: Once Camera/CameraActor properties function as proper animatable properties
// this code can disappear.
// whenever the size of the magnifier changes, the field of view needs to change
// TODO: Once Camera/CameraActor properties function as proper animatable properties
// this code can disappear.
// whenever the size of the magnifier changes, the field of view needs to change
@@
-295,6
+300,8
@@
void Magnifier::OnSizeSet(const Vector3& targetSize)
// a constraint yet as Camera/CameraActor properties are not animatable/constrainable.
mActorSize = targetSize;
Update();
// a constraint yet as Camera/CameraActor properties are not animatable/constrainable.
mActorSize = targetSize;
Update();
+
+ Control::OnSizeSet( targetSize );
}
float Magnifier::GetMagnificationFactor() const
}
float Magnifier::GetMagnificationFactor() const
@@
-315,7
+322,7
@@
void Magnifier::Update()
// should be updated when:
// Magnifier's world size/scale changes.
Actor self(Self());
// should be updated when:
// Magnifier's world size/scale changes.
Actor self(Self());
- Vector3 worldSize = mActorSize * self.GetCurrent
WorldScale(
);
+ Vector3 worldSize = mActorSize * self.GetCurrent
Property< Vector3 >( Actor::Property::WORLD_SCALE
);
// Adjust field of view to scale content
// Adjust field of view to scale content