This change finishes establishing the new naming convention for
Accessible objects, which now mirror the names of DALi/NUI classes,
e.g. ActorAccessible, ControlAccessible (previously AccessibleImpl),
NUIViewAccessible (previously AccessibleImpl_NUI), and now
<Control>::AccessibleImpl becomes <Control>::<Control>Accessible.
Change-Id: I8ba65736da4527d19107cee877541f776ba017ca
32 files changed:
return mForegroundPadding;
}
return mForegroundPadding;
}
-std::string Button::AccessibleImpl::GetNameRaw() const
+std::string Button::ButtonAccessible::GetNameRaw() const
{
std::string labelText;
auto slf = Toolkit::Button::DownCast(Self());
{
std::string labelText;
auto slf = Toolkit::Button::DownCast(Self());
-Property::Index Button::AccessibleImpl::GetNamePropertyIndex()
+Property::Index Button::ButtonAccessible::GetNamePropertyIndex()
{
Property::Index label = Toolkit::Button::Property::LABEL;
Property::Map labelMap = Self().GetProperty<Property::Map>(label);
{
Property::Index label = Toolkit::Button::Property::LABEL;
Property::Map labelMap = Self().GetProperty<Property::Map>(label);
-Dali::Accessibility::States Button::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States Button::ButtonAccessible::CalculateStates()
{
auto tmp = DevelControl::ControlAccessible::CalculateStates();
tmp[Dali::Accessibility::State::SELECTABLE] = true;
{
auto tmp = DevelControl::ControlAccessible::CalculateStates();
tmp[Dali::Accessibility::State::SELECTABLE] = true;
bool mClickActionPerforming; ///< Used to manage signal emissions during action
protected:
bool mClickActionPerforming; ///< Used to manage signal emissions during action
protected:
- struct AccessibleImpl : public DevelControl::ControlAccessible
+ class ButtonAccessible : public DevelControl::ControlAccessible
using DevelControl::ControlAccessible::ControlAccessible;
using DevelControl::ControlAccessible::ControlAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+ */
Dali::Accessibility::States CalculateStates() override;
Dali::Accessibility::States CalculateStates() override;
- std::string GetNameRaw() const override;
- Property::Index GetNamePropertyIndex() override;
+
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetNameRaw()
+ */
+ std::string GetNameRaw() const override;
+
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetNamePropertyIndex()
+ */
+ Property::Index GetNamePropertyIndex() override;
Button::OnInitialize();
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
Button::OnInitialize();
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::CHECK_BOX));
+ return std::make_unique<CheckBoxButtonAccessible>(actor, Dali::Accessibility::Role::CHECK_BOX);
-Dali::Accessibility::States CheckBoxButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States CheckBoxButton::CheckBoxButtonAccessible::CalculateStates()
- auto state = Button::AccessibleImpl::CalculateStates();
+ auto state = Button::ButtonAccessible::CalculateStates();
auto self = Toolkit::Button::DownCast(Self());
if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
{
auto self = Toolkit::Button::DownCast(Self());
if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
{
CheckBoxButton& operator=(const CheckBoxButton&);
protected:
CheckBoxButton& operator=(const CheckBoxButton&);
protected:
- struct AccessibleImpl : public Button::AccessibleImpl
+ class CheckBoxButtonAccessible : public Button::ButtonAccessible
- using Button::AccessibleImpl::AccessibleImpl;
+ public:
+ using Button::ButtonAccessible::ButtonAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+ */
Dali::Accessibility::States CalculateStates() override;
};
Dali::Accessibility::States CalculateStates() override;
};
void OnStateChange(State newState) override;
};
void OnStateChange(State newState) override;
};
self.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
self.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::PUSH_BUTTON));
+ return std::make_unique<PushButtonAccessible>(actor, Dali::Accessibility::Role::PUSH_BUTTON);
-Dali::Accessibility::States PushButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States PushButton::PushButtonAccessible::CalculateStates()
- auto state = Button::AccessibleImpl::CalculateStates();
+ auto state = Button::ButtonAccessible::CalculateStates();
auto self = Toolkit::Button::DownCast(Self());
state[Dali::Accessibility::State::PRESSED] = self.GetProperty<bool>(Toolkit::Button::Property::SELECTED);
return state;
auto self = Toolkit::Button::DownCast(Self());
state[Dali::Accessibility::State::PRESSED] = self.GetProperty<bool>(Toolkit::Button::Property::SELECTED);
return state;
IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
protected:
IconAlignment mIconAlignment; ///< The alignment of the icon against the label.
protected:
- struct AccessibleImpl : public Button::AccessibleImpl
+ class PushButtonAccessible : public Button::ButtonAccessible
- using Button::AccessibleImpl::AccessibleImpl;
+ public:
+ using Button::ButtonAccessible::ButtonAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+ */
Dali::Accessibility::States CalculateStates() override;
};
Dali::Accessibility::States CalculateStates() override;
};
void OnStateChange(State newState) override;
};
void OnStateChange(State newState) override;
};
Button::OnInitialize();
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
Button::OnInitialize();
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::RADIO_BUTTON));
+ return std::make_unique<RadioButtonAccessible>(actor, Dali::Accessibility::Role::RADIO_BUTTON);
-Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States RadioButton::RadioButtonAccessible::CalculateStates()
- auto state = Button::AccessibleImpl::CalculateStates();
+ auto state = Button::ButtonAccessible::CalculateStates();
auto self = Toolkit::Button::DownCast(Self());
if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
auto self = Toolkit::Button::DownCast(Self());
if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
RadioButton& operator=(const RadioButton& origin);
protected:
RadioButton& operator=(const RadioButton& origin);
protected:
- struct AccessibleImpl : public Button::AccessibleImpl
+ class RadioButtonAccessible : public Button::ButtonAccessible
- using Button::AccessibleImpl::AccessibleImpl;
+ public:
+ using Button::ButtonAccessible::ButtonAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+ */
Dali::Accessibility::States CalculateStates() override;
};
};
Dali::Accessibility::States CalculateStates() override;
};
};
self.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
self.SetProperty(Actor::Property::LEAVE_REQUIRED, true);
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::TOGGLE_BUTTON));
+ return std::make_unique<ToggleButtonAccessible>(actor, Dali::Accessibility::Role::TOGGLE_BUTTON);
-Dali::Accessibility::States ToggleButton::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States ToggleButton::ToggleButtonAccessible::CalculateStates()
- auto states = Button::AccessibleImpl::CalculateStates();
+ auto states = Button::ButtonAccessible::CalculateStates();
auto button = Toolkit::ToggleButton::DownCast(Self());
if(button.GetProperty<int>(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX))
{
auto button = Toolkit::ToggleButton::DownCast(Self());
if(button.GetProperty<int>(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX))
{
-std::string ToggleButton::AccessibleImpl::GetDescriptionRaw() const
+std::string ToggleButton::ToggleButtonAccessible::GetDescriptionRaw() const
{
auto button = Toolkit::ToggleButton::DownCast(Self());
auto index = button.GetProperty<int>(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX);
{
auto button = Toolkit::ToggleButton::DownCast(Self());
auto index = button.GetProperty<int>(Toolkit::ToggleButton::Property::CURRENT_STATE_INDEX);
return tooltips[index].Get<std::string>();
}
return tooltips[index].Get<std::string>();
}
-Property::Index ToggleButton::AccessibleImpl::GetDescriptionPropertyIndex()
+Property::Index ToggleButton::ToggleButtonAccessible::GetDescriptionPropertyIndex()
{
return Toolkit::ToggleButton::Property::TOOLTIPS;
}
{
return Toolkit::ToggleButton::Property::TOOLTIPS;
}
std::vector<Toolkit::Visual::Base> mToggleDisabledSelectedVisuals; ///< Save all disabled selected visuals.
std::vector<std::string> mToggleTooltips; ///< Toggle tooltips.
unsigned int mCurrentToggleIndex; ///< The index of state.
std::vector<Toolkit::Visual::Base> mToggleDisabledSelectedVisuals; ///< Save all disabled selected visuals.
std::vector<std::string> mToggleTooltips; ///< Toggle tooltips.
unsigned int mCurrentToggleIndex; ///< The index of state.
- struct AccessibleImpl : public Button::AccessibleImpl
+ class ToggleButtonAccessible : public Button::ButtonAccessible
- using Button::AccessibleImpl::AccessibleImpl;
+ public:
+ using Button::ButtonAccessible::ButtonAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::CalculateStates()
+ */
Dali::Accessibility::States CalculateStates() override;
Dali::Accessibility::States CalculateStates() override;
- std::string GetDescriptionRaw() const override;
- Property::Index GetDescriptionPropertyIndex() override;
+
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetDescriptionRaw()
+ */
+ std::string GetDescriptionRaw() const override;
+
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::GetDescriptionPropertyIndex()
+ */
+ Property::Index GetDescriptionPropertyIndex() override;
void OnStateChange(State newState) override;
};
void OnStateChange(State newState) override;
};
DevelControl::AppendAccessibilityAttribute(Toolkit::Control::DownCast(self), "sub-role", "Alert");
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
DevelControl::AppendAccessibilityAttribute(Toolkit::Control::DownCast(self), "sub-role", "Alert");
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true));
+ return std::make_unique<PopupAccessible>(actor, Dali::Accessibility::Role::DIALOG, true);
-std::string Popup::AccessibleImpl::GetNameRaw() const
+std::string Popup::PopupAccessible::GetNameRaw() const
{
auto popup = Toolkit::Popup::DownCast(Self());
std::string title;
{
auto popup = Toolkit::Popup::DownCast(Self());
std::string title;
-Dali::Accessibility::States Popup::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States Popup::PopupAccessible::CalculateStates()
{
auto states = DevelControl::ControlAccessible::CalculateStates();
auto popup = Toolkit::Popup::DownCast(Self());
{
auto states = DevelControl::ControlAccessible::CalculateStates();
auto popup = Toolkit::Popup::DownCast(Self());
static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
protected:
static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
protected:
- struct AccessibleImpl : public DevelControl::ControlAccessible
+ class PopupAccessible : public DevelControl::ControlAccessible
using DevelControl::ControlAccessible::ControlAccessible;
using DevelControl::ControlAccessible::ControlAccessible;
- std::string GetNameRaw() const 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;
};
void ProgressBar::OnInitialize()
{
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
void ProgressBar::OnInitialize()
{
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::PROGRESS_BAR));
+ return std::make_unique<ProgressBarAccessible>(actor, Dali::Accessibility::Role::PROGRESS_BAR);
});
//Enable highightability
Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
});
//Enable highightability
Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
-double ProgressBar::AccessibleImpl::GetMinimum() const
+double ProgressBar::ProgressBarAccessible::GetMinimum() const
{
return DEFAULT_LOWER_BOUND;
}
{
return DEFAULT_LOWER_BOUND;
}
-double ProgressBar::AccessibleImpl::GetCurrent() const
+double ProgressBar::ProgressBarAccessible::GetCurrent() const
{
auto self = Toolkit::ProgressBar::DownCast(Self());
return self.GetProperty(Toolkit::ProgressBar::Property::PROGRESS_VALUE).Get<float>();
}
{
auto self = Toolkit::ProgressBar::DownCast(Self());
return self.GetProperty(Toolkit::ProgressBar::Property::PROGRESS_VALUE).Get<float>();
}
-double ProgressBar::AccessibleImpl::GetMaximum() const
+double ProgressBar::ProgressBarAccessible::GetMaximum() const
{
return DEFAULT_UPPER_BOUND;
}
{
return DEFAULT_UPPER_BOUND;
}
-bool ProgressBar::AccessibleImpl::SetCurrent(double current)
+bool ProgressBar::ProgressBarAccessible::SetCurrent(double current)
{
if(current < GetMinimum() || current > GetMaximum())
{
{
if(current < GetMinimum() || current > GetMaximum())
{
-double ProgressBar::AccessibleImpl::GetMinimumIncrement() const
+double ProgressBar::ProgressBarAccessible::GetMinimumIncrement() const
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
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::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;
};
};
Self().SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
Self().SetProperty(Actor::Property::DRAW_MODE, DrawMode::OVERLAY_2D);
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_BAR));
+ return std::make_unique<ScrollBarAccessible>(actor, Dali::Accessibility::Role::SCROLL_BAR);
-double ScrollBar::AccessibleImpl::GetMinimum() const
+double ScrollBar::ScrollBarAccessible::GetMinimum() const
{
auto self = Toolkit::ScrollBar::DownCast(Self());
Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyMinScrollPosition) : 0.0f;
}
{
auto self = Toolkit::ScrollBar::DownCast(Self());
Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyMinScrollPosition) : 0.0f;
}
-double ScrollBar::AccessibleImpl::GetCurrent() const
+double ScrollBar::ScrollBarAccessible::GetCurrent() const
{
auto self = Toolkit::ScrollBar::DownCast(Self());
Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyScrollPosition) : 0.0f;
}
{
auto self = Toolkit::ScrollBar::DownCast(Self());
Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyScrollPosition) : 0.0f;
}
-double ScrollBar::AccessibleImpl::GetMaximum() const
+double ScrollBar::ScrollBarAccessible::GetMaximum() const
{
auto self = Toolkit::ScrollBar::DownCast(Self());
Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyMaxScrollPosition) : 1.0f;
}
{
auto self = Toolkit::ScrollBar::DownCast(Self());
Handle scrollableHandle = GetImpl(self).mScrollableObject.GetHandle();
return scrollableHandle ? scrollableHandle.GetCurrentProperty<float>(GetImpl(self).mPropertyMaxScrollPosition) : 1.0f;
}
-bool ScrollBar::AccessibleImpl::SetCurrent(double current)
+bool ScrollBar::ScrollBarAccessible::SetCurrent(double current)
{
if(current < GetMinimum() || current > GetMaximum())
{
{
if(current < GetMinimum() || current > GetMaximum())
{
-double ScrollBar::AccessibleImpl::GetMinimumIncrement() const
+double ScrollBar::ScrollBarAccessible::GetMinimumIncrement() const
bool mIndicatorFirstShow : 1; ///< True if the indicator has never been shown
protected:
bool mIndicatorFirstShow : 1; ///< True if the indicator has never been shown
protected:
- struct AccessibleImpl : public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::Value
+ class ScrollBarAccessible : public DevelControl::ControlAccessible,
+ public virtual Dali::Accessibility::Value
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::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;
};
};
self.WheelEventSignal().Connect(this, &ItemView::OnWheelEvent);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
self.WheelEventSignal().Connect(this, &ItemView::OnWheelEvent);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
+ return std::make_unique<ItemViewAccessible>(actor, Dali::Accessibility::Role::SCROLL_PANE);
-bool ItemView::AccessibleImpl::ScrollToChild(Actor child)
+bool ItemView::ItemViewAccessible::ScrollToChild(Actor child)
{
auto itemView = Dali::Toolkit::ItemView::DownCast(Self());
Toolkit::GetImpl(itemView).OnKeyboardFocusChangeCommitted(child);
{
auto itemView = Dali::Toolkit::ItemView::DownCast(Self());
Toolkit::GetImpl(itemView).OnKeyboardFocusChangeCommitted(child);
void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) override;
protected:
void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) override;
protected:
- struct AccessibleImpl : public Scrollable::AccessibleImpl
+ class ItemViewAccessible : public Scrollable::ScrollableAccessible
- using Scrollable::AccessibleImpl::AccessibleImpl;
+ public:
+ using Scrollable::ScrollableAccessible::ScrollableAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::ScrollToChild()
+ */
bool ScrollToChild(Actor child) override;
};
bool ScrollToChild(Actor child) override;
};
self.WheelEventSignal().Connect(this, &ScrollView::OnWheelEvent);
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
self.WheelEventSignal().Connect(this, &ScrollView::OnWheelEvent);
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
+ return std::make_unique<ScrollViewAccessible>(actor, Dali::Accessibility::Role::SCROLL_PANE);
return mSnapStartedSignal;
}
return mSnapStartedSignal;
}
-bool ScrollView::AccessibleImpl::ScrollToChild(Actor child)
+bool ScrollView::ScrollViewAccessible::ScrollToChild(Actor child)
{
auto scrollView = Dali::Toolkit::ScrollView::DownCast(Self());
if(Toolkit::GetImpl(scrollView).FindClosestActor() == child)
{
auto scrollView = Dali::Toolkit::ScrollView::DownCast(Self());
if(Toolkit::GetImpl(scrollView).FindClosestActor() == child)
void WrapPosition(Vector2& position) const;
protected:
void WrapPosition(Vector2& position) const;
protected:
- struct AccessibleImpl : public Scrollable::AccessibleImpl
+ class ScrollViewAccessible : public Scrollable::ScrollableAccessible
- using Scrollable::AccessibleImpl::AccessibleImpl;
+ public:
+ using Scrollable::ScrollableAccessible::ScrollableAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::ScrollToChild()
+ */
bool ScrollToChild(Actor child) override;
};
bool ScrollToChild(Actor child) override;
};
-bool Scrollable::AccessibleImpl::IsScrollable() const
+bool Scrollable::ScrollableAccessible::IsScrollable() const
void Scrollable::OnInitialize()
{
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
void Scrollable::OnInitialize()
{
DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
+ return std::make_unique<ScrollableAccessible>(actor, Dali::Accessibility::Role::SCROLL_PANE);
virtual void SetOvershootSize(const Vector2& size) = 0;
protected: // From Control
virtual void SetOvershootSize(const Vector2& size) = 0;
protected: // From Control
- struct AccessibleImpl : public DevelControl::ControlAccessible
+ class ScrollableAccessible : public DevelControl::ControlAccessible
using DevelControl::ControlAccessible::ControlAccessible;
using DevelControl::ControlAccessible::ControlAccessible;
+ /**
+ * @copydoc Dali::Accessibility::Component::IsScrollable()
+ */
bool IsScrollable() const override;
};
bool IsScrollable() const override;
};
self.TouchedSignal().Connect(this, &Slider::OnTouch);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
self.TouchedSignal().Connect(this, &Slider::OnTouch);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::SLIDER));
+ return std::make_unique<SliderAccessible>(actor, Dali::Accessibility::Role::SLIDER);
-double Slider::AccessibleImpl::GetMinimum() const
+double Slider::SliderAccessible::GetMinimum() const
{
auto self = Toolkit::Slider::DownCast(Self());
return self.GetProperty(Toolkit::Slider::Property::LOWER_BOUND).Get<float>();
}
{
auto self = Toolkit::Slider::DownCast(Self());
return self.GetProperty(Toolkit::Slider::Property::LOWER_BOUND).Get<float>();
}
-double Slider::AccessibleImpl::GetCurrent() const
+double Slider::SliderAccessible::GetCurrent() const
{
auto self = Toolkit::Slider::DownCast(Self());
return self.GetProperty(Toolkit::Slider::Property::VALUE).Get<float>();
}
{
auto self = Toolkit::Slider::DownCast(Self());
return self.GetProperty(Toolkit::Slider::Property::VALUE).Get<float>();
}
-double Slider::AccessibleImpl::GetMaximum() const
+double Slider::SliderAccessible::GetMaximum() const
{
auto self = Toolkit::Slider::DownCast(Self());
return self.GetProperty(Toolkit::Slider::Property::UPPER_BOUND).Get<float>();
}
{
auto self = Toolkit::Slider::DownCast(Self());
return self.GetProperty(Toolkit::Slider::Property::UPPER_BOUND).Get<float>();
}
-bool Slider::AccessibleImpl::SetCurrent(double current)
+bool Slider::SliderAccessible::SetCurrent(double current)
{
if(current < GetMinimum() || current > GetMaximum())
return false;
{
if(current < GetMinimum() || current > GetMaximum())
return false;
-double Slider::AccessibleImpl::GetMinimumIncrement() const
+double Slider::SliderAccessible::GetMinimumIncrement() const
{
auto self = Toolkit::Slider::DownCast(Self());
{
auto self = Toolkit::Slider::DownCast(Self());
mSnapToMarks : 1; ///< Turn on or off snapping to marks
protected:
mSnapToMarks : 1; ///< Turn on or off snapping to marks
protected:
- struct AccessibleImpl : public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::Value
+ class SliderAccessible : public DevelControl::ControlAccessible,
+ public virtual Dali::Accessibility::Value
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::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;
};
};
self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::LINK));
+ return std::make_unique<TextAnchorAccessible>(actor, Dali::Accessibility::Role::LINK);
-int32_t TextAnchor::AccessibleImpl::GetEndIndex() const
+int32_t TextAnchor::TextAnchorAccessible::GetEndIndex() const
{
auto self = Toolkit::TextAnchor::DownCast(Self());
return self.GetProperty(Toolkit::TextAnchor::Property::END_CHARACTER_INDEX).Get<int>();
}
{
auto self = Toolkit::TextAnchor::DownCast(Self());
return self.GetProperty(Toolkit::TextAnchor::Property::END_CHARACTER_INDEX).Get<int>();
}
-int32_t TextAnchor::AccessibleImpl::GetStartIndex() const
+int32_t TextAnchor::TextAnchorAccessible::GetStartIndex() const
{
auto self = Toolkit::TextAnchor::DownCast(Self());
return self.GetProperty(Toolkit::TextAnchor::Property::START_CHARACTER_INDEX).Get<int>();
}
{
auto self = Toolkit::TextAnchor::DownCast(Self());
return self.GetProperty(Toolkit::TextAnchor::Property::START_CHARACTER_INDEX).Get<int>();
}
-int32_t TextAnchor::AccessibleImpl::GetAnchorCount() const
+int32_t TextAnchor::TextAnchorAccessible::GetAnchorCount() const
-Dali::Accessibility::Accessible* TextAnchor::AccessibleImpl::GetAnchorAccessible(int32_t anchorIndex) const
+Dali::Accessibility::Accessible* TextAnchor::TextAnchorAccessible::GetAnchorAccessible(int32_t anchorIndex) const
{
return Control::Impl::GetAccessibilityObject(Self());
}
{
return Control::Impl::GetAccessibilityObject(Self());
}
-std::string TextAnchor::AccessibleImpl::GetAnchorUri(int32_t anchorIndex) const
+std::string TextAnchor::TextAnchorAccessible::GetAnchorUri(int32_t anchorIndex) const
{
auto self = Toolkit::TextAnchor::DownCast(Self());
return self.GetProperty(Toolkit::TextAnchor::Property::URI).Get<std::string>();
}
{
auto self = Toolkit::TextAnchor::DownCast(Self());
return self.GetProperty(Toolkit::TextAnchor::Property::URI).Get<std::string>();
}
-bool TextAnchor::AccessibleImpl::IsValid() const
+bool TextAnchor::TextAnchorAccessible::IsValid() const
{
return !GetAnchorUri(0).empty();
}
{
return !GetAnchorUri(0).empty();
}
/**
* @brief This structure is to connect TextAnchor with Accessible functions.
*/
/**
* @brief This structure is to connect TextAnchor with Accessible functions.
*/
- struct AccessibleImpl : public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::Hyperlink
+ class TextAnchorAccessible : public DevelControl::ControlAccessible,
+ public virtual Dali::Accessibility::Hyperlink
using DevelControl::ControlAccessible::ControlAccessible;
using DevelControl::ControlAccessible::ControlAccessible;
/**
* @copydoc Dali::Accessibility::Hyperlink::GetEndIndex()
*/
/**
* @copydoc Dali::Accessibility::Hyperlink::GetEndIndex()
*/
self.Add(mStencil);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
self.Add(mStencil);
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY));
+ return std::make_unique<TextEditorAccessible>(actor, Dali::Accessibility::Role::ENTRY);
});
Accessibility::Bridge::EnabledSignal().Connect(this, &TextEditor::OnAccessibilityStatusChanged);
});
Accessibility::Bridge::EnabledSignal().Connect(this, &TextEditor::OnAccessibilityStatusChanged);
-std::string TextEditor::AccessibleImpl::GetName() const
+std::string TextEditor::TextEditorAccessible::GetName() const
{
auto self = Toolkit::TextEditor::DownCast(Self());
return self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
}
{
auto self = Toolkit::TextEditor::DownCast(Self());
return self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
}
-std::string TextEditor::AccessibleImpl::GetText(size_t startOffset, size_t endOffset) const
+std::string TextEditor::TextEditorAccessible::GetText(size_t startOffset, size_t endOffset) const
{
if(endOffset <= startOffset)
{
{
if(endOffset <= startOffset)
{
return text.substr(startOffset, endOffset - startOffset);
}
return text.substr(startOffset, endOffset - startOffset);
}
-size_t TextEditor::AccessibleImpl::GetCharacterCount() const
+size_t TextEditor::TextEditorAccessible::GetCharacterCount() const
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-size_t TextEditor::AccessibleImpl::GetCursorOffset() const
+size_t TextEditor::TextEditorAccessible::GetCursorOffset() const
{
auto slf = Toolkit::TextEditor::DownCast(Self());
return Dali::Toolkit::GetImpl(slf).GetTextController()->GetCursorPosition();
}
{
auto slf = Toolkit::TextEditor::DownCast(Self());
return Dali::Toolkit::GetImpl(slf).GetTextController()->GetCursorPosition();
}
-bool TextEditor::AccessibleImpl::SetCursorOffset(size_t offset)
+bool TextEditor::TextEditorAccessible::SetCursorOffset(size_t offset)
{
auto slf = Toolkit::TextEditor::DownCast(Self());
auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
{
auto slf = Toolkit::TextEditor::DownCast(Self());
auto txt = slf.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-Dali::Accessibility::Range TextEditor::AccessibleImpl::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary) const
+Dali::Accessibility::Range TextEditor::TextEditorAccessible::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary) const
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-Dali::Accessibility::Range TextEditor::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex) const
+Dali::Accessibility::Range TextEditor::TextEditorAccessible::GetRangeOfSelection(size_t selectionIndex) const
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
}
return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
}
-bool TextEditor::AccessibleImpl::RemoveSelection(size_t selectionIndex)
+bool TextEditor::TextEditorAccessible::RemoveSelection(size_t selectionIndex)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
-bool TextEditor::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
+bool TextEditor::TextEditorAccessible::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
-Rect<> TextEditor::AccessibleImpl::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type)
+Rect<> TextEditor::TextEditorAccessible::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type)
{
if (endOffset <= startOffset || endOffset <= 0)
{
{
if (endOffset <= startOffset || endOffset <= 0)
{
-bool TextEditor::AccessibleImpl::CopyText(size_t startPosition, size_t endPosition)
+bool TextEditor::TextEditorAccessible::CopyText(size_t startPosition, size_t endPosition)
{
if(endPosition <= startPosition)
{
{
if(endPosition <= startPosition)
{
-bool TextEditor::AccessibleImpl::CutText(size_t startPosition, size_t endPosition)
+bool TextEditor::TextEditorAccessible::CutText(size_t startPosition, size_t endPosition)
{
if(endPosition <= startPosition)
{
{
if(endPosition <= startPosition)
{
-bool TextEditor::AccessibleImpl::DeleteText(size_t startPosition, size_t endPosition)
+bool TextEditor::TextEditorAccessible::DeleteText(size_t startPosition, size_t endPosition)
{
if(endPosition <= startPosition)
{
{
if(endPosition <= startPosition)
{
-Dali::Accessibility::States TextEditor::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States TextEditor::TextEditorAccessible::CalculateStates()
{
using namespace Dali::Accessibility;
{
using namespace Dali::Accessibility;
-bool TextEditor::AccessibleImpl::InsertText(size_t startPosition, std::string text)
+bool TextEditor::TextEditorAccessible::InsertText(size_t startPosition, std::string text)
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto insertedText = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto insertedText = self.GetProperty(Toolkit::TextEditor::Property::TEXT).Get<std::string>();
-bool TextEditor::AccessibleImpl::SetTextContents(std::string newContents)
+bool TextEditor::TextEditorAccessible::SetTextContents(std::string newContents)
{
auto self = Toolkit::TextEditor::DownCast(Self());
self.SetProperty(Toolkit::TextEditor::Property::TEXT, std::move(newContents));
return true;
}
{
auto self = Toolkit::TextEditor::DownCast(Self());
self.SetProperty(Toolkit::TextEditor::Property::TEXT, std::move(newContents));
return true;
}
-int32_t TextEditor::AccessibleImpl::GetLinkCount() const
+int32_t TextEditor::TextEditorAccessible::GetLinkCount() const
{
auto self = Toolkit::TextEditor::DownCast(Self());
return Dali::Toolkit::GetImpl(self).mAnchorActors.size();
}
{
auto self = Toolkit::TextEditor::DownCast(Self());
return Dali::Toolkit::GetImpl(self).mAnchorActors.size();
}
-Accessibility::Hyperlink* TextEditor::AccessibleImpl::GetLink(int32_t linkIndex) const
+Accessibility::Hyperlink* TextEditor::TextEditorAccessible::GetLink(int32_t linkIndex) const
{
if(linkIndex < 0 || linkIndex >= GetLinkCount())
{
{
if(linkIndex < 0 || linkIndex >= GetLinkCount())
{
return dynamic_cast<Accessibility::Hyperlink*>(Dali::Accessibility::Accessible::Get(anchorActor));
}
return dynamic_cast<Accessibility::Hyperlink*>(Dali::Accessibility::Accessible::Get(anchorActor));
}
-int32_t TextEditor::AccessibleImpl::GetLinkIndex(int32_t characterOffset) const
+int32_t TextEditor::TextEditorAccessible::GetLinkIndex(int32_t characterOffset) const
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
{
auto self = Toolkit::TextEditor::DownCast(Self());
auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
/**
* @brief This structure is to connect TextEditor with Accessible functions.
*/
/**
* @brief This structure is to connect TextEditor with Accessible functions.
*/
- struct AccessibleImpl : public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::EditableText,
- public virtual Dali::Accessibility::Hypertext
+ class TextEditorAccessible : public DevelControl::ControlAccessible,
+ public virtual Dali::Accessibility::EditableText,
+ public virtual Dali::Accessibility::Hypertext
using DevelControl::ControlAccessible::ControlAccessible;
/**
using DevelControl::ControlAccessible::ControlAccessible;
/**
}
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
}
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::ENTRY));
+ return std::make_unique<TextFieldAccessible>(actor, Dali::Accessibility::Role::ENTRY);
});
Accessibility::Bridge::EnabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged);
});
Accessibility::Bridge::EnabledSignal().Connect(this, &TextField::OnAccessibilityStatusChanged);
return mController->GetTextPosition(startIndex, endIndex);
}
return mController->GetTextPosition(startIndex, endIndex);
}
-std::string TextField::AccessibleImpl::GetName() const
+std::string TextField::TextFieldAccessible::GetName() const
{
auto self = Toolkit::TextField::DownCast(Self());
if(IsHiddenInput(self))
{
auto self = Toolkit::TextField::DownCast(Self());
if(IsHiddenInput(self))
return self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
}
return self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
}
-std::string TextField::AccessibleImpl::GetText(size_t startOffset, size_t endOffset) const
+std::string TextField::TextFieldAccessible::GetText(size_t startOffset, size_t endOffset) const
{
if(endOffset <= startOffset)
{
{
if(endOffset <= startOffset)
{
return text.substr(startOffset, endOffset - startOffset);
}
return text.substr(startOffset, endOffset - startOffset);
}
-size_t TextField::AccessibleImpl::GetCharacterCount() const
+size_t TextField::TextFieldAccessible::GetCharacterCount() const
{
auto self = Toolkit::TextField::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextField::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-size_t TextField::AccessibleImpl::GetCursorOffset() const
+size_t TextField::TextFieldAccessible::GetCursorOffset() const
{
auto self = Toolkit::TextField::DownCast(Self());
return Dali::Toolkit::GetImpl(self).GetTextController()->GetCursorPosition();
}
{
auto self = Toolkit::TextField::DownCast(Self());
return Dali::Toolkit::GetImpl(self).GetTextController()->GetCursorPosition();
}
-bool TextField::AccessibleImpl::SetCursorOffset(size_t offset)
+bool TextField::TextFieldAccessible::SetCursorOffset(size_t offset)
{
auto self = Toolkit::TextField::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextField::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-Dali::Accessibility::Range TextField::AccessibleImpl::GetTextAtOffset(
+Dali::Accessibility::Range TextField::TextFieldAccessible::GetTextAtOffset(
size_t offset, Dali::Accessibility::TextBoundary boundary) const
{
auto self = Toolkit::TextField::DownCast(Self());
size_t offset, Dali::Accessibility::TextBoundary boundary) const
{
auto self = Toolkit::TextField::DownCast(Self());
-Dali::Accessibility::Range TextField::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex) const
+Dali::Accessibility::Range TextField::TextFieldAccessible::GetRangeOfSelection(size_t selectionIndex) const
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
return {startOffset, endOffset, value};
}
return {startOffset, endOffset, value};
}
-bool TextField::AccessibleImpl::RemoveSelection(size_t selectionIndex)
+bool TextField::TextFieldAccessible::RemoveSelection(size_t selectionIndex)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
-bool TextField::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
+bool TextField::TextFieldAccessible::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
-Rect<> TextField::AccessibleImpl::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type)
+Rect<> TextField::TextFieldAccessible::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type)
{
if (endOffset <= startOffset || endOffset <= 0)
{
{
if (endOffset <= startOffset || endOffset <= 0)
{
-bool TextField::AccessibleImpl::CopyText(size_t startPosition, size_t endPosition)
+bool TextField::TextFieldAccessible::CopyText(size_t startPosition, size_t endPosition)
{
if(endPosition <= startPosition)
{
{
if(endPosition <= startPosition)
{
-bool TextField::AccessibleImpl::CutText(size_t startPosition, size_t endPosition)
+bool TextField::TextFieldAccessible::CutText(size_t startPosition, size_t endPosition)
{
if(endPosition <= startPosition)
{
{
if(endPosition <= startPosition)
{
-bool TextField::AccessibleImpl::DeleteText(size_t startPosition, size_t endPosition)
+bool TextField::TextFieldAccessible::DeleteText(size_t startPosition, size_t endPosition)
{
if(endPosition <= startPosition)
{
{
if(endPosition <= startPosition)
{
-Dali::Accessibility::States TextField::AccessibleImpl::CalculateStates()
+Dali::Accessibility::States TextField::TextFieldAccessible::CalculateStates()
{
using namespace Dali::Accessibility;
{
using namespace Dali::Accessibility;
-bool TextField::AccessibleImpl::InsertText(size_t startPosition, std::string text)
+bool TextField::TextFieldAccessible::InsertText(size_t startPosition, std::string text)
{
auto self = Toolkit::TextField::DownCast(Self());
auto insertedText = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextField::DownCast(Self());
auto insertedText = self.GetProperty(Toolkit::TextField::Property::TEXT).Get<std::string>();
-bool TextField::AccessibleImpl::SetTextContents(std::string newContents)
+bool TextField::TextFieldAccessible::SetTextContents(std::string newContents)
{
auto self = Toolkit::TextField::DownCast(Self());
self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(newContents));
return true;
}
{
auto self = Toolkit::TextField::DownCast(Self());
self.SetProperty(Toolkit::TextField::Property::TEXT, std::move(newContents));
return true;
}
-int32_t TextField::AccessibleImpl::GetLinkCount() const
+int32_t TextField::TextFieldAccessible::GetLinkCount() const
{
auto self = Toolkit::TextField::DownCast(Self());
return Dali::Toolkit::GetImpl(self).mAnchorActors.size();
}
{
auto self = Toolkit::TextField::DownCast(Self());
return Dali::Toolkit::GetImpl(self).mAnchorActors.size();
}
-Accessibility::Hyperlink* TextField::AccessibleImpl::GetLink(int32_t linkIndex) const
+Accessibility::Hyperlink* TextField::TextFieldAccessible::GetLink(int32_t linkIndex) const
{
if(linkIndex < 0 || linkIndex >= GetLinkCount())
{
{
if(linkIndex < 0 || linkIndex >= GetLinkCount())
{
return dynamic_cast<Accessibility::Hyperlink*>(Dali::Accessibility::Accessible::Get(anchorActor));
}
return dynamic_cast<Accessibility::Hyperlink*>(Dali::Accessibility::Accessible::Get(anchorActor));
}
-int32_t TextField::AccessibleImpl::GetLinkIndex(int32_t characterOffset) const
+int32_t TextField::TextFieldAccessible::GetLinkIndex(int32_t characterOffset) const
{
auto self = Toolkit::TextField::DownCast(Self());
auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
{
auto self = Toolkit::TextField::DownCast(Self());
auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
/**
* @brief This structure is to connect TextField with Accessible functions.
*/
/**
* @brief This structure is to connect TextField with Accessible functions.
*/
- struct AccessibleImpl : public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::EditableText,
- public virtual Dali::Accessibility::Hypertext
+ class TextFieldAccessible : public DevelControl::ControlAccessible,
+ public virtual Dali::Accessibility::EditableText,
+ public virtual Dali::Accessibility::Hypertext
using DevelControl::ControlAccessible::ControlAccessible;
/**
using DevelControl::ControlAccessible::ControlAccessible;
/**
engine.SetCursorWidth(0u); // Do not layout space for the cursor.
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
engine.SetCursorWidth(0u); // Do not layout space for the cursor.
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::unique_ptr<Dali::Accessibility::Accessible>(
- new AccessibleImpl(actor, Dali::Accessibility::Role::LABEL));
+ return std::make_unique<TextLabelAccessible>(actor, Dali::Accessibility::Role::LABEL);
});
Accessibility::Bridge::EnabledSignal().Connect(this, &TextLabel::OnAccessibilityStatusChanged);
});
Accessibility::Bridge::EnabledSignal().Connect(this, &TextLabel::OnAccessibilityStatusChanged);
return mController->GetTextPosition(startIndex, endIndex);
}
return mController->GetTextPosition(startIndex, endIndex);
}
-std::string TextLabel::AccessibleImpl::GetNameRaw() const
+std::string TextLabel::TextLabelAccessible::GetNameRaw() const
{
auto self = Toolkit::TextLabel::DownCast(Self());
return self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
}
{
auto self = Toolkit::TextLabel::DownCast(Self());
return self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
}
-Property::Index TextLabel::AccessibleImpl::GetNamePropertyIndex()
+Property::Index TextLabel::TextLabelAccessible::GetNamePropertyIndex()
{
return Toolkit::TextLabel::Property::TEXT;
}
{
return Toolkit::TextLabel::Property::TEXT;
}
-std::string TextLabel::AccessibleImpl::GetText(size_t startOffset, size_t endOffset) const
+std::string TextLabel::TextLabelAccessible::GetText(size_t startOffset, size_t endOffset) const
{
if(endOffset <= startOffset)
{
{
if(endOffset <= startOffset)
{
return text.substr(startOffset, endOffset - startOffset);
}
return text.substr(startOffset, endOffset - startOffset);
}
-size_t TextLabel::AccessibleImpl::GetCharacterCount() const
+size_t TextLabel::TextLabelAccessible::GetCharacterCount() const
{
auto self = Toolkit::TextLabel::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextLabel::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
-size_t TextLabel::AccessibleImpl::GetCursorOffset() const
+size_t TextLabel::TextLabelAccessible::GetCursorOffset() const
-bool TextLabel::AccessibleImpl::SetCursorOffset(size_t offset)
+bool TextLabel::TextLabelAccessible::SetCursorOffset(size_t offset)
-Dali::Accessibility::Range TextLabel::AccessibleImpl::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary) const
+Dali::Accessibility::Range TextLabel::TextLabelAccessible::GetTextAtOffset(size_t offset, Dali::Accessibility::TextBoundary boundary) const
{
auto self = Toolkit::TextLabel::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
{
auto self = Toolkit::TextLabel::DownCast(Self());
auto text = self.GetProperty(Toolkit::TextLabel::Property::TEXT).Get<std::string>();
-Dali::Accessibility::Range TextLabel::AccessibleImpl::GetRangeOfSelection(size_t selectionIndex) const
+Dali::Accessibility::Range TextLabel::TextLabelAccessible::GetRangeOfSelection(size_t selectionIndex) const
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
}
return {static_cast<size_t>(indices.first), static_cast<size_t>(indices.second), value};
}
-bool TextLabel::AccessibleImpl::RemoveSelection(size_t selectionIndex)
+bool TextLabel::TextLabelAccessible::RemoveSelection(size_t selectionIndex)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
-bool TextLabel::AccessibleImpl::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
+bool TextLabel::TextLabelAccessible::SetRangeOfSelection(size_t selectionIndex, size_t startOffset, size_t endOffset)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
{
// Since DALi supports only one selection indexes higher than 0 are ignored
if(selectionIndex > 0)
-Rect<> TextLabel::AccessibleImpl::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type)
+Rect<> TextLabel::TextLabelAccessible::GetRangeExtents(size_t startOffset, size_t endOffset, Accessibility::CoordinateType type)
{
if (endOffset <= startOffset || endOffset <= 0)
{
{
if (endOffset <= startOffset || endOffset <= 0)
{
-int32_t TextLabel::AccessibleImpl::GetLinkCount() const
+int32_t TextLabel::TextLabelAccessible::GetLinkCount() const
{
auto self = Toolkit::TextLabel::DownCast(Self());
return Dali::Toolkit::GetImpl(self).mAnchorActors.size();
}
{
auto self = Toolkit::TextLabel::DownCast(Self());
return Dali::Toolkit::GetImpl(self).mAnchorActors.size();
}
-Accessibility::Hyperlink* TextLabel::AccessibleImpl::GetLink(int32_t linkIndex) const
+Accessibility::Hyperlink* TextLabel::TextLabelAccessible::GetLink(int32_t linkIndex) const
{
if(linkIndex < 0 || linkIndex >= GetLinkCount())
{
{
if(linkIndex < 0 || linkIndex >= GetLinkCount())
{
return dynamic_cast<Accessibility::Hyperlink*>(Dali::Accessibility::Accessible::Get(anchorActor));
}
return dynamic_cast<Accessibility::Hyperlink*>(Dali::Accessibility::Accessible::Get(anchorActor));
}
-int32_t TextLabel::AccessibleImpl::GetLinkIndex(int32_t characterOffset) const
+int32_t TextLabel::TextLabelAccessible::GetLinkIndex(int32_t characterOffset) const
{
auto self = Toolkit::TextLabel::DownCast(Self());
auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
{
auto self = Toolkit::TextLabel::DownCast(Self());
auto controller = Dali::Toolkit::GetImpl(self).GetTextController();
/**
* @brief This structure is to connect TextLabel with Accessible functions.
*/
/**
* @brief This structure is to connect TextLabel with Accessible functions.
*/
- struct AccessibleImpl : public DevelControl::ControlAccessible,
- public virtual Dali::Accessibility::Text,
- public virtual Dali::Accessibility::Hypertext
+ class TextLabelAccessible : public DevelControl::ControlAccessible,
+ public virtual Dali::Accessibility::Text,
+ public virtual Dali::Accessibility::Hypertext
using DevelControl::ControlAccessible::ControlAccessible;
/**
using DevelControl::ControlAccessible::ControlAccessible;
/**