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.25] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
progress-bar
/
progress-bar-impl.h
diff --git
a/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
b/dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
index
96540d2
..
f128859
100644
(file)
--- a/
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
+++ b/
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h
@@
-201,6
+201,11
@@
private:
void OnInitialize() override;
/**
void OnInitialize() override;
/**
+ * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+ */
+ DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+ /**
* Get the range of the valid values the ProgressBar handle can move between
*
* @param[in] currentSize The current size of the ProgressBar
* Get the range of the valid values the ProgressBar handle can move between
*
* @param[in] currentSize The current size of the ProgressBar
@@
-265,15
+270,40
@@
private:
Property::Map mSecondaryProgressVisualMap; ///< To backup visual properties when switching determinate/indeterminate.
protected:
Property::Map mSecondaryProgressVisualMap; ///< To backup visual properties when switching determinate/indeterminate.
protected:
-
struct AccessibleImpl
: public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::Value
+
class ProgressBarAccessible
: public DevelControl::ControlAccessible,
+
public virtual Dali::Accessibility::Value
{
{
+ public:
using DevelControl::ControlAccessible::ControlAccessible;
using DevelControl::ControlAccessible::ControlAccessible;
+ /**
+ * @copydoc Dali::Accessibility::Value::GetMinimum()
+ */
double GetMinimum() const override;
double GetMinimum() const override;
+
+ /**
+ * @copydoc Dali::Accessibility::Value::GetCurrent()
+ */
double GetCurrent() const override;
double GetCurrent() const override;
+
+ /**
+ * @copydoc Dali::Accessibility::Value::GetValueText()
+ */
+ std::string GetValueText() const override;
+
+ /**
+ * @copydoc Dali::Accessibility::Value::GetMaximum()
+ */
double GetMaximum() const override;
double GetMaximum() const override;
- bool SetCurrent(double) override;
+
+ /**
+ * @copydoc Dali::Accessibility::Value::SetCurrent()
+ */
+ bool SetCurrent(double) override;
+
+ /**
+ * @copydoc Dali::Accessibility::Value::GetMinimumIncrement()
+ */
double GetMinimumIncrement() const override;
};
};
double GetMinimumIncrement() const override;
};
};