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
[dali_2.0.2] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-selection-toolbar-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
index
3736f67
..
792dead
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
@@
-167,6
+167,11
@@
Property::Value TextSelectionToolbar::GetProperty( BaseObject* object, Property:
void TextSelectionToolbar::OnInitialize()
{
SetUp();
void TextSelectionToolbar::OnInitialize()
{
SetUp();
+
+ DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+ return std::unique_ptr< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::TOOL_BAR ));
+ } );
}
void TextSelectionToolbar::OnRelayout( const Vector2& size, RelayoutContainer& container )
}
void TextSelectionToolbar::OnRelayout( const Vector2& size, RelayoutContainer& container )
@@
-385,12
+390,6
@@
TextSelectionToolbar::TextSelectionToolbar()
mDividerIndexes(),
mFirstScrollEnd( false )
{
mDividerIndexes(),
mFirstScrollEnd( false )
{
- DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor )
- {
- return std::unique_ptr< Dali::Accessibility::Accessible >(
- new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::TOOL_BAR, true ) );
- }
- );
}
TextSelectionToolbar::~TextSelectionToolbar()
}
TextSelectionToolbar::~TextSelectionToolbar()