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] Fix role setting
[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
d05cbd3
..
0be5d46
100644
(file)
--- a/
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
+++ b/
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
@@
-32,6
+32,7
@@
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.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
{
@@
-219,6
+220,11
@@
void Magnifier::Initialize()
constraint.AddSource( Source( self, Actor::Property::SIZE ) );
constraint.AddSource( Source( self, Actor::Property::WORLD_SCALE ) );
constraint.Apply();
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< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::FILLER ) );
+ } );
}
Magnifier::~Magnifier()
}
Magnifier::~Magnifier()
@@
-271,7
+277,7
@@
void Magnifier::SetFrameVisibility(bool visible)
map[ Toolkit::BorderVisual::Property::COLOR ] = Color::WHITE;
map[ Toolkit::BorderVisual::Property::SIZE ] = IMAGE_BORDER_INDENT;
Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map );
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).SetOnS
tag
e( mFrame );
+ Toolkit::GetImplementation(borderVisual).SetOnS
cen
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 ) );