X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fslider%2Fslider-impl.h;h=a8003c70d39a3765d692d897b89d6e21a643e0d1;hp=884f9b5cd10fdc28a99fc045428b10db946e8532;hb=56d412791a44c2a79135d2293c13fddb135c9d54;hpb=928136dbb9e23970f3894eabc7c8b224003b77be

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h
index 884f9b5..a8003c7 100755
--- 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>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 
 namespace Dali
 {
@@ -48,13 +49,6 @@ class Slider : public Control
 {
 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;
 
   /**
@@ -440,7 +434,7 @@ private:
    *
    * @return The textview created for the popup
    */
-  //Toolkit::TextView CreatePopupText();
+  Toolkit::TextLabel CreatePopupText();
 
   /**
    * Create the value display for the slider
@@ -693,6 +687,8 @@ private:
   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