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 remote-tracking branch 'origin/tizen' into new_text
[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
884f9b5
..
a8003c7
100755
(executable)
--- a/
dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/
dali-toolkit/internal/controls/slider/slider-impl.h
@@
-25,6
+25,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/slider/slider.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-controls/text-label.h>
namespace Dali
{
namespace Dali
{
@@
-48,13
+49,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;
/**
@@
-440,7
+434,7
@@
private:
*
* @return The textview created for the popup
*/
*
* @return The textview created for the popup
*/
-
//Toolkit::TextView
CreatePopupText();
+
Toolkit::TextLabel
CreatePopupText();
/**
* Create the value display for the slider
/**
* Create the value display for the slider
@@
-693,6
+687,8
@@
private:
ImageActor mPopup; ///< Popup backing
ImageActor mPopupArrow; ///< Popup arrow backing
ImageActor mPopup; ///< Popup backing
ImageActor mPopupArrow; ///< Popup arrow backing
+ Toolkit::TextLabel mValueTextLabel; //< The text value in popup
+ Toolkit::TextLabel 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