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
Merge "fix incorrect index range in emoji-helper" into 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
2e1251e
..
f28f92b
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
@@
-27,7
+27,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
-#include <dali-toolkit/
internal/controls/control/control-data-imp
l.h>
+#include <dali-toolkit/
devel-api/controls/control-deve
l.h>
#include <dali-toolkit/internal/helpers/color-conversion.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <dali-toolkit/internal/helpers/color-conversion.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
@@
-164,10
+164,7
@@
void TextSelectionToolbar::OnInitialize()
{
SetUp();
{
SetUp();
- DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new Control::Impl::AccessibleImpl(actor, Dali::Accessibility::Role::TOOL_BAR));
- });
+ Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::TOOL_BAR);
}
void TextSelectionToolbar::OnRelayout(const Vector2& size, RelayoutContainer& container)
}
void TextSelectionToolbar::OnRelayout(const Vector2& size, RelayoutContainer& container)