X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.h;h=d51ba2a09109f5bad65bfcae2b9dc2a3bead0fec;hp=6fbced99a5a0cc72ebfc10ebbe3bba652c1fb2b3;hb=73e02f6f3ea83cbdf3d894a7d067c4dafc0ac54d;hpb=3994a8fa38310fc7dd7bbfbf37c982cea8d199da

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
old mode 100644
new mode 100755
index 6fbced9..d51ba2a
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -20,13 +20,14 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/devel-api/adaptor-framework/input-method-context.h>
 #include <dali/public-api/animation/animation.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
 #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>
@@ -42,7 +43,6 @@ namespace Toolkit
 
 namespace Internal
 {
-
 /**
  * @brief A control which renders a long text string with styles.
  */
@@ -76,6 +76,16 @@ public:
   static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
   /**
+   * @copydoc Dali::Toollkit::TextEditor::GetInputMethodContext()
+   */
+  InputMethodContext GetInputMethodContext();
+
+  /**
+   * @copydoc Dali::Toollkit::TextEditor::MaxLengthReachedSignal()
+   */
+  DevelTextEditor::MaxLengthReachedSignalType&  MaxLengthReachedSignal();
+
+  /**
    * Connects a callback function with the object's signals.
    * @param[in] object The object providing the signal.
    * @param[in] tracker Used to disconnect the signal.
@@ -97,107 +107,107 @@ public:
   Toolkit::TextEditor::InputStyleChangedSignalType& InputStyleChangedSignal();
 
   /**
-   * @copydoc DevelTextEditor::ScrollStateChangedSignal()
+   * @copydoc TextEditor::ScrollStateChangedSignal()
    */
-  Toolkit::DevelTextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal();
+  Toolkit::TextEditor::ScrollStateChangedSignalType& ScrollStateChangedSignal();
 
 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::OnStageConnection()
+   * @copydoc Control::OnSceneConnection()
    */
-  virtual void OnStageConnection( 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()
    */
-  virtual void TextChanged();
+  void TextChanged() override;
 
   /**
    * @copydoc Text::ControlInterface::MaxLengthReached()
    */
-  virtual void MaxLengthReached();
+  void MaxLengthReached() override;
 
   /**
    * @copydoc Text::ControlInterface::InputStyleChanged()
    */
-  virtual void InputStyleChanged( Text::InputStyle::Mask inputStyleMask );
+  void InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) override;
 
   /**
    * @copydoc Text::ControlInterface::AddDecoration()
    */
-  virtual void AddDecoration( Actor& actor, bool needsClipping );
+  void AddDecoration( Actor& actor, bool needsClipping ) override;
 
 private: // Implementation
 
   /**
-   * @copydoc Dali::Toolkit::Text::Controller::(ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent)
+   * @copydoc Dali::Toolkit::Text::Controller::(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent)
    */
-  ImfManager::ImfCallbackData OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent );
+  InputMethodContext::CallbackData OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent );
 
   /**
    * @brief Callback when Clipboard signals an item should be pasted
@@ -233,7 +243,7 @@ private: // Implementation
    * @param[in] actor TextEditor touched
    * @param[in] touch Touch information
    */
-  bool OnTouched( Actor actor, const TouchData& touch );
+  bool OnTouched( Actor actor, const TouchEvent& touch );
 
   /**
    * @brief Callbacks called on idle.
@@ -275,16 +285,17 @@ private: // Implementation
    */
   void RenderText( Text::Controller::UpdateTextType updateTextType );
 
-  // Connection needed to re-render text, when a text editor returns to the stage.
-  void OnStageConnect( Dali::Actor actor );
+  // Connection needed to re-render text, when a text editor returns to the scene.
+  void OnSceneConnect( Dali::Actor actor );
 
 private: // Data
   // Signals
   Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
   Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
-  Toolkit::DevelTextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal;
+  Toolkit::TextEditor::ScrollStateChangedSignalType mScrollStateChangedSignal;
+  Toolkit::DevelTextEditor::MaxLengthReachedSignalType mMaxLengthReachedSignal;
 
-  ImfManager          mImfManager;
+  InputMethodContext mInputMethodContext;
   Text::ControllerPtr mController;
   Text::RendererPtr mRenderer;
   Text::DecoratorPtr mDecorator;
@@ -301,6 +312,7 @@ private: // Data
 
   float mAlignmentOffset;
   float mScrollAnimationDuration;
+  float mLineSpacing;
   int mRenderingBackend;
   bool mHasBeenStaged:1;
   bool mScrollAnimationEnabled:1;