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.3.21] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index
974dbcf
..
a5e9e95
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@
-27,6
+27,7
@@
#include <cstring> // for strcmp
// INTERNAL INCLUDES
#include <cstring> // for strcmp
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/internal/controls/control/control-data-impl.h>
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h>
#include <dali-toolkit/internal/controls/control/control-data-impl.h>
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h>
@@
-413,10
+414,7
@@
void PageTurnView::OnInitialize()
// enable the pan gesture which is attached to the control
EnableGestureDetection(GestureType::Value(GestureType::PAN));
// enable the pan gesture which is attached to the control
EnableGestureDetection(GestureType::Value(GestureType::PAN));
- DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new Control::Impl::AccessibleImpl(actor, Dali::Accessibility::Role::PAGE_TAB_LIST));
- });
+ Self().SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::PAGE_TAB_LIST);
}
Shader PageTurnView::CreateShader(const Property::Map& shaderMap)
}
Shader PageTurnView::CreateShader(const Property::Map& shaderMap)