X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fslider%2Fslider-impl.h;h=884f9b5cd10fdc28a99fc045428b10db946e8532;hp=8da4de103f2bfed5fbcc1892c56018427224be57;hb=93fb6a1d3dc8872275bde30ef6a05407a67d694c;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/optional/dali-toolkit/internal/controls/slider/slider-impl.h b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
index 8da4de1..884f9b5 100755
--- a/optional/dali-toolkit/internal/controls/slider/slider-impl.h
+++ b/optional/dali-toolkit/internal/controls/slider/slider-impl.h
@@ -1,27 +1,30 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_SLIDER_H__
 #define __DALI_TOOLKIT_INTERNAL_SLIDER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/adaptor-framework/timer.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #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>
 
 namespace Dali
 {
@@ -41,10 +44,17 @@ typedef Dali::IntrusivePtr< Slider > SliderPtr;
 /**
  * @copydoc Toolkit::Slider
  */
-class Slider : public ControlImpl
+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;
 
   /**
@@ -283,7 +293,7 @@ protected:
   virtual ~Slider();
 
   /**
-   * @copydoc Toolkit::ControlImpl::OnControlSizeSet( const Vector3& size )
+   * @copydoc Control::OnControlSizeSet( const Vector3& size )
    */
   virtual void OnControlSizeSet( const Vector3& size );
 
@@ -339,7 +349,7 @@ private:
    * @param[in] actor The actor the event is raised for
    * @param[in] gesture The pan event info
    */
-  void OnPan( Actor actor, PanGesture gestur );
+  void OnPan( Actor actor, const PanGesture& gesture );
 
   /**
    * Map a position onto a domain and return the result as a percentage
@@ -430,7 +440,7 @@ private:
    *
    * @return The textview created for the popup
    */
-  Toolkit::TextView CreatePopupText();
+  //Toolkit::TextView CreatePopupText();
 
   /**
    * Create the value display for the slider
@@ -683,8 +693,6 @@ private:
   ImageActor mPopup;                        ///< Popup backing
   ImageActor mPopupArrow;                   ///< Popup arrow backing
 
-  Toolkit::TextView mValueTextView;         //< The text value in popup
-  Toolkit::TextView mHandleValueTextView;   ///< The text value on handle
   Vector2 mHandleLastTouchPoint;            ///< The last touch point for the handle
   Timer mValueTimer;                        ///< Timer used to hide value view