X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=165234b295b1a360f3ef2949570d32ea1e4d3e5c;hb=5359a575636e678baf178dab5209b587be1a7551;hp=b788d809bd7fc44ea3911c000bae04df0a1e57e3;hpb=6de1ee72f32ce241e32d653b427348cf553cf006;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index b788d80..165234b 100755
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -28,6 +28,7 @@
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
+#include <dali-toolkit/internal/text/text-selectable-control-interface.h>
 #include <dali-toolkit/internal/text/text-controller.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
@@ -42,7 +43,7 @@ namespace Internal
 /**
  * @brief A control which renders a short text string.
  */
-class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface
+class TextField : public Control, public Text::ControlInterface, public Text::EditableControlInterface, public Text::SelectableControlInterface
 {
 public:
 
@@ -107,7 +108,7 @@ public:
    */
   void SelectWholeText();
 
-    /**
+  /**
    * @brief Called to unselect the whole texts.
    */
   void SelectNone();
@@ -117,91 +118,113 @@ private: // From Control
   /**
    * @copydoc Control::OnInitialize()
    */
-  virtual void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * @copydoc Control::OnStyleChange()
    */
-  virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
+  void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override;
 
   /**
    * @copydoc Control::GetNaturalSize()
    */
-  virtual Vector3 GetNaturalSize();
+  Vector3 GetNaturalSize() override;
 
   /**
    * @copydoc Control::GetHeightForWidth()
    */
-  virtual float GetHeightForWidth( float width );
+  float GetHeightForWidth( float width ) override;
 
   /**
    * @copydoc Control::OnInitialize()
    */
-  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+  void OnRelayout( const Vector2& size, RelayoutContainer& container ) override;
 
   /**
    * @copydoc Control::OnKeyInputFocusGained()
    */
-  virtual void OnKeyInputFocusGained();
+  void OnKeyInputFocusGained() override;
 
   /**
    * @copydoc Control::OnKeyInputFocusLost()
    */
-  virtual void OnKeyInputFocusLost();
+  void OnKeyInputFocusLost() override;
 
   /**
    * @copydoc Control::OnTap()
    */
-  virtual void OnTap( const TapGesture& tap );
+  void OnTap( const TapGesture& tap ) override;
 
   /**
    * @copydoc Control::OnPan()
    */
-  virtual void OnPan( const PanGesture& gesture );
+  void OnPan( const PanGesture& gesture ) override;
 
   /**
    * @copydoc Control::OnLongPress()
    */
-  virtual void OnLongPress( const LongPressGesture& gesture );
+  void OnLongPress( const LongPressGesture& gesture ) override;
 
   /**
    * @copydoc Control::OnSceneConnection()
    */
-  virtual void OnSceneConnection( int depth );
+  void OnSceneConnection( int depth ) override;
 
   /**
    * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
    */
-  virtual bool OnKeyEvent(const KeyEvent& event);
+  bool OnKeyEvent(const KeyEvent& event) override;
 
 // From ControlInterface
 
   /**
    * @copydoc Text::ControlInterface::RequestTextRelayout()
    */
-  virtual void RequestTextRelayout();
+  void RequestTextRelayout() override;
 
 // From EditableControlInterface
 
   /**
-   * @copydoc Text::ControlInterface::TextChanged()
+   * @copydoc Text::EditableControlInterface::TextChanged()
+   */
+  void TextChanged() override;
+
+  /**
+   * @copydoc Text::EditableControlInterface::MaxLengthReached()
+   */
+  void MaxLengthReached() override;
+
+  /**
+   * @copydoc Text::EditableControlInterface::InputStyleChanged()
+   */
+  void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override;
+
+  /**
+   * @copydoc Text::EditableControlInterface::AddDecoration()
+   */
+  void AddDecoration( Actor& actor, bool needsClipping ) override;
+
+// From SelectableControlInterface
+public:
+  /**
+   * @copydoc Text::SelectableControlInterface::SetTextSelectionRange()
    */
-  virtual void TextChanged();
+  void SetTextSelectionRange(const uint32_t *start, const uint32_t *end) override;
 
   /**
-   * @copydoc Text::ControlInterface::MaxLengthReached()
+   * @copydoc Text::SelectableControlInterface::GetTextSelectionRange()
    */
-  virtual void MaxLengthReached();
+  Uint32Pair GetTextSelectionRange() const override;
 
   /**
-   * @copydoc Text::ControlInterface::InputStyleChanged()
+   * @copydoc Text::EditableControlInterface::IsEditable()
    */
-  virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
+  bool IsEditable() const override;
 
   /**
-   * @copydoc Text::ControlInterface::AddDecoration()
+   * @copydoc Text::EditableControlInterface::SetEditable()
    */
-  virtual void AddDecoration( Actor& actor, bool needsClipping );
+  void SetEditable( bool editable ) override;
 
 private: // Implementation