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 the SVACE error for facial animation loader" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.h
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.h
b/dali-toolkit/internal/controls/popup/popup-impl.h
index
5d9eae3
..
8f4aef0
100644
(file)
--- a/
dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.h
@@
-25,6
+25,7
@@
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
#include <dali-toolkit/internal/controls/control/control-data-impl.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
#include <dali-toolkit/internal/controls/control/control-data-impl.h>
@@
-240,11
+241,19
@@
public:
static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
protected:
static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
protected:
- struct AccessibleImpl : public Control::Impl::AccessibleImpl
+ class PopupAccessible : public DevelControl::ControlAccessible
{
{
- using Control::Impl::AccessibleImpl::AccessibleImpl;
+ public:
+ using DevelControl::ControlAccessible::ControlAccessible;
- std::string GetNameRaw() override;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetNameRaw()
+ */
+ std::string GetNameRaw() const override;
+
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+ */
Dali::Accessibility::States CalculateStates() override;
};
Dali::Accessibility::States CalculateStates() override;
};
@@
-428,6
+437,11
@@
private:
void OnInitialize() override;
/**
void OnInitialize() override;
/**
+ * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+ */
+ DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+ /**
* Called whenever the popup layout is re-set up.
* Normally due to a change in contents.
* Note: This is only done when the popup is shown.
* Called whenever the popup layout is re-set up.
* Normally due to a change in contents.
* Note: This is only done when the popup is shown.