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
Update keyboard focus direction enum for Control
[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
d4ac718
..
ea652fd
100755
(executable)
--- a/
dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/
dali-toolkit/internal/controls/slider/slider-impl.h
@@
-21,11
+21,12
@@
// EXTERNAL INCLUDES
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/adaptor-framework/timer.h>
// EXTERNAL INCLUDES
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/object/property-array.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/slider/slider.h>
-#include <dali-toolkit/public-api/controls/text-
view/text-view
.h>
+#include <dali-toolkit/
devel
-api/controls/slider/slider.h>
+#include <dali-toolkit/public-api/controls/text-
controls/text-label
.h>
namespace Dali
{
namespace Dali
{
@@
-49,13
+50,6
@@
class Slider : public Control
{
public:
{
public:
- // Properties
- enum
- {
- SLIDER_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- SLIDER_PROPERTY_END_INDEX = SLIDER_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
- };
-
typedef Property::Array MarkList;
/**
typedef Property::Array MarkList;
/**
@@
-294,9
+288,9
@@
protected:
virtual ~Slider();
/**
virtual ~Slider();
/**
- * @copydoc C
ontrol::OnControl
SizeSet( const Vector3& size )
+ * @copydoc C
ustomActorImpl::On
SizeSet( const Vector3& size )
*/
*/
- virtual void On
Control
SizeSet( const Vector3& size );
+ virtual void OnSizeSet( const Vector3& size );
private:
private:
@@
-441,7
+435,7
@@
private:
*
* @return The textview created for the popup
*/
*
* @return The textview created for the popup
*/
- Toolkit::Text
View
CreatePopupText();
+ Toolkit::Text
Label
CreatePopupText();
/**
* Create the value display for the slider
/**
* Create the value display for the slider
@@
-694,8
+688,8
@@
private:
ImageActor mPopup; ///< Popup backing
ImageActor mPopupArrow; ///< Popup arrow backing
ImageActor mPopup; ///< Popup backing
ImageActor mPopupArrow; ///< Popup arrow backing
- Toolkit::Text
View mValueTextView
; //< The text value in popup
- Toolkit::Text
View mHandleValueTextView
; ///< The text value on handle
+ Toolkit::Text
Label mValueTextLabel
; //< The text value in popup
+ Toolkit::Text
Label mHandleValueTextLabel
; ///< The text value on handle
Vector2 mHandleLastTouchPoint; ///< The last touch point for the handle
Timer mValueTimer; ///< Timer used to hide value view
Vector2 mHandleLastTouchPoint; ///< The last touch point for the handle
Timer mValueTimer; ///< Timer used to hide value view