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.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
slider
/
slider-impl.h
diff --git
a/dali-toolkit/internal/controls/slider/slider-impl.h
b/dali-toolkit/internal/controls/slider/slider-impl.h
index
7385953
..
799bd2c
100644
(file)
--- a/
dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/
dali-toolkit/internal/controls/slider/slider-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_SLIDER_H
/*
#define DALI_TOOLKIT_INTERNAL_SLIDER_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
3
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-319,6
+319,11
@@
private:
void OnInitialize() override;
/**
void OnInitialize() override;
/**
+ * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+ */
+ DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+ /**
* Hit region touch
*
* @param[in] actor The actor the event is raised for
* Hit region touch
*
* @param[in] actor The actor the event is raised for
@@
-336,6
+341,11
@@
private:
void OnPan(Actor actor, const PanGesture& gesture);
/**
void OnPan(Actor actor, const PanGesture& gesture);
/**
+ * @copydoc Control::OnPan
+ */
+ using Control::OnPan;
+
+ /**
* Map a position onto a domain and return the result as a percentage
*
* @param[in] point The point to map onto the domain
* Map a position onto a domain and return the result as a percentage
*
* @param[in] point The point to map onto the domain
@@
-749,15
+759,40
@@
private:
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
{
{
+ 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;
};
};