(Text Controller) Moved event handling, InputFont & Placeholder related methods into...
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-controller.cpp
index e0c63c8..31c1edf 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 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.
 
 // EXTERNAL INCLUDES
 #include <limits>
+#include <cmath>
 #include <memory.h>
-#include <dali/public-api/adaptor-framework/key.h>
 #include <dali/integration-api/debug.h>
-#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
-#include <dali/devel-api/text-abstraction/font-client.h>
-#include <dali/devel-api/adaptor-framework/key-devel.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/text-controls/placeholder-properties.h>
-#include <dali-toolkit/internal/text/bidirectional-support.h>
 #include <dali-toolkit/internal/text/character-set-conversion.h>
 #include <dali-toolkit/internal/text/layouts/layout-parameters.h>
 #include <dali-toolkit/internal/text/markup-processor.h>
-#include <dali-toolkit/internal/text/multi-language-support.h>
+#include <dali-toolkit/internal/text/text-controller-event-handler.h>
 #include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/text-controller-input-font-handler.h>
+#include <dali-toolkit/internal/text/text-controller-placeholder-handler.h>
 #include <dali-toolkit/internal/text/text-editable-control-interface.h>
-#include <dali-toolkit/internal/text/text-font-style.h>
 
 namespace
 {
 
 #if defined(DEBUG_ENABLED)
-  Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
 #endif
 
 const float MAX_FLOAT = std::numeric_limits<float>::max();
 
 const std::string EMPTY_STRING("");
 
-const std::string KEY_C_NAME = "c";
-const std::string KEY_V_NAME = "v";
-const std::string KEY_X_NAME = "x";
-
-const char * const PLACEHOLDER_TEXT = "text";
-const char * const PLACEHOLDER_TEXT_FOCUSED = "textFocused";
-const char * const PLACEHOLDER_COLOR = "color";
-const char * const PLACEHOLDER_FONT_FAMILY = "fontFamily";
-const char * const PLACEHOLDER_FONT_STYLE = "fontStyle";
-const char * const PLACEHOLDER_POINT_SIZE = "pointSize";
-const char * const PLACEHOLDER_PIXEL_SIZE = "pixelSize";
-const char * const PLACEHOLDER_ELLIPSIS = "ellipsis";
-
 float ConvertToEven( float value )
 {
   int intValue(static_cast<int>( value ));
   return static_cast<float>( intValue + ( intValue & 1 ) );
 }
 
+int ConvertPixelToPint( float pixel )
+{
+  unsigned int horizontalDpi = 0u;
+  unsigned int verticalDpi = 0u;
+  Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get();
+  fontClient.GetDpi( horizontalDpi, verticalDpi );
+
+  return ( pixel * 72.f ) / static_cast< float >( horizontalDpi );
+}
+
 } // namespace
 
 namespace Dali
@@ -79,44 +72,6 @@ namespace Toolkit
 namespace Text
 {
 
-/**
- * @brief Adds a new font description run for the selected text.
- *
- * The new font parameters are added after the call to this method.
- *
- * @param[in] eventData The event data pointer.
- * @param[in] logicalModel The logical model where to add the new font description run.
- * @param[out] startOfSelectedText Index to the first selected character.
- * @param[out] lengthOfSelectedText Number of selected characters.
- */
-FontDescriptionRun& UpdateSelectionFontStyleRun( EventData* eventData,
-                                                 LogicalModelPtr logicalModel,
-                                                 CharacterIndex& startOfSelectedText,
-                                                 Length& lengthOfSelectedText )
-{
-  const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition;
-
-  // Get start and end position of selection
-  startOfSelectedText = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition;
-  lengthOfSelectedText = ( handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition ) - startOfSelectedText;
-
-  // Add the font run.
-  const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count();
-  logicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u );
-
-  FontDescriptionRun& fontDescriptionRun = *( logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns );
-
-  fontDescriptionRun.characterRun.characterIndex = startOfSelectedText;
-  fontDescriptionRun.characterRun.numberOfCharacters = lengthOfSelectedText;
-
-  // Recalculate the selection highlight as the metrics may have changed.
-  eventData->mUpdateLeftSelectionPosition = true;
-  eventData->mUpdateRightSelectionPosition = true;
-  eventData->mUpdateHighlightBox = true;
-
-  return fontDescriptionRun;
-}
-
 // public : Constructor.
 
 ControllerPtr Controller::New()
@@ -130,10 +85,12 @@ ControllerPtr Controller::New( ControlInterface* controlInterface )
 }
 
 ControllerPtr Controller::New( ControlInterface* controlInterface,
-                               EditableControlInterface* editableControlInterface )
+                               EditableControlInterface* editableControlInterface,
+                               SelectableControlInterface* selectableControlInterface )
 {
   return ControllerPtr( new Controller( controlInterface,
-                                        editableControlInterface ) );
+                                        editableControlInterface,
+                                        selectableControlInterface ) );
 }
 
 // public : Configure the text controller.
@@ -383,6 +340,18 @@ void Controller::SetHorizontalAlignment( Text::HorizontalAlignment::Type alignme
     // Set the flag to redo the alignment operation.
     mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | ALIGN );
 
+    if( mImpl->mEventData )
+    {
+      mImpl->mEventData->mUpdateAlignment = true;
+
+      // Update the cursor if it's in editing mode
+      if( EventData::IsEditingState( mImpl->mEventData->mState ) )
+      {
+        mImpl->ChangeState( EventData::EDITING );
+        mImpl->mEventData->mUpdateCursorPosition = true;
+      }
+    }
+
     mImpl->RequestRelayout();
   }
 }
@@ -479,22 +448,100 @@ bool Controller::IsTextElideEnabled() const
   return mImpl->mModel->mElideEnabled;
 }
 
-void Controller::SetPlaceholderTextElideEnabled( bool enabled )
+void Controller::SetTextFitEnabled(bool enabled)
+{
+  mImpl->mTextFitEnabled = enabled;
+}
+
+bool Controller::IsTextFitEnabled() const
+{
+  return mImpl->mTextFitEnabled;
+}
+
+void Controller::SetTextFitMinSize( float minSize, FontSizeType type )
 {
-  mImpl->mEventData->mIsPlaceholderElideEnabled = enabled;
-  mImpl->mEventData->mPlaceholderEllipsisFlag = true;
+  switch( type )
+  {
+    case POINT_SIZE:
+    {
+      mImpl->mTextFitMinSize = minSize;
+      break;
+    }
+    case PIXEL_SIZE:
+    {
+      mImpl->mTextFitMinSize = ConvertPixelToPint( minSize );
+      break;
+    }
+  }
+}
 
-  // Update placeholder if there is no text
-  if( mImpl->IsShowingPlaceholderText() ||
-      ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) )
+float Controller::GetTextFitMinSize() const
+{
+  return mImpl->mTextFitMinSize;
+}
+
+void Controller::SetTextFitMaxSize( float maxSize, FontSizeType type )
+{
+  switch( type )
   {
-    ShowPlaceholderText();
+    case POINT_SIZE:
+    {
+      mImpl->mTextFitMaxSize = maxSize;
+      break;
+    }
+    case PIXEL_SIZE:
+    {
+      mImpl->mTextFitMaxSize = ConvertPixelToPint( maxSize );
+      break;
+    }
+  }
+}
+
+float Controller::GetTextFitMaxSize() const
+{
+  return mImpl->mTextFitMaxSize;
+}
+
+void Controller::SetTextFitStepSize( float step, FontSizeType type )
+{
+  switch( type )
+  {
+    case POINT_SIZE:
+    {
+      mImpl->mTextFitStepSize = step;
+      break;
+    }
+    case PIXEL_SIZE:
+    {
+      mImpl->mTextFitStepSize = ConvertPixelToPint( step );
+      break;
+    }
   }
 }
 
+float Controller::GetTextFitStepSize() const
+{
+  return mImpl->mTextFitStepSize;
+}
+
+void Controller::SetTextFitContentSize(Vector2 size)
+{
+  mImpl->mTextFitContentSize = size;
+}
+
+Vector2 Controller::GetTextFitContentSize() const
+{
+  return mImpl->mTextFitContentSize;
+}
+
+void Controller::SetPlaceholderTextElideEnabled( bool enabled )
+{
+  PlaceholderHandler::SetPlaceholderTextElideEnabled(*this, enabled);
+}
+
 bool Controller::IsPlaceholderTextElideEnabled() const
 {
-  return mImpl->mEventData->mIsPlaceholderElideEnabled;
+  return PlaceholderHandler::IsPlaceholderTextElideEnabled(*this);
 }
 
 void Controller::SetSelectionEnabled( bool enabled )
@@ -663,39 +710,12 @@ void Controller::GetText( std::string& text ) const
 
 void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( PLACEHOLDER_TYPE_INACTIVE == type )
-    {
-      mImpl->mEventData->mPlaceholderTextInactive = text;
-    }
-    else
-    {
-      mImpl->mEventData->mPlaceholderTextActive = text;
-    }
-
-    // Update placeholder if there is no text
-    if( mImpl->IsShowingPlaceholderText() ||
-        ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) )
-    {
-      ShowPlaceholderText();
-    }
-  }
+  PlaceholderHandler::SetPlaceholderText(*this, type, text);
 }
 
 void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( PLACEHOLDER_TYPE_INACTIVE == type )
-    {
-      text = mImpl->mEventData->mPlaceholderTextInactive;
-    }
-    else
-    {
-      text = mImpl->mEventData->mPlaceholderTextActive;
-    }
-  }
+  PlaceholderHandler::GetPlaceholderText(*this, type, text );
 }
 
 void Controller::UpdateAfterFontChange( const std::string& newDefaultFont )
@@ -726,6 +746,16 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
   DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str());
   mImpl->mFontDefaults->familyDefined = !defaultFontFamily.empty();
 
+  if( mImpl->mEventData )
+  {
+    // Update the cursor position if it's in editing mode
+    if( EventData::IsEditingState( mImpl->mEventData->mState ) )
+    {
+      mImpl->mEventData->mDecoratorUpdated = true;
+      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font family is updated.
+    }
+  }
+
   // Clear the font-specific data
   ClearFontData();
 
@@ -744,29 +774,12 @@ const std::string& Controller::GetDefaultFontFamily() const
 
 void Controller::SetPlaceholderFontFamily( const std::string& placeholderTextFontFamily )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( NULL == mImpl->mEventData->mPlaceholderFont )
-    {
-      mImpl->mEventData->mPlaceholderFont = new FontDefaults();
-    }
-
-    mImpl->mEventData->mPlaceholderFont->mFontDescription.family = placeholderTextFontFamily;
-    DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetPlaceholderFontFamily %s\n", placeholderTextFontFamily.c_str());
-    mImpl->mEventData->mPlaceholderFont->familyDefined = !placeholderTextFontFamily.empty();
-
-    mImpl->RequestRelayout();
-  }
+  PlaceholderHandler::SetPlaceholderFontFamily(*this, placeholderTextFontFamily);
 }
 
 const std::string& Controller::GetPlaceholderFontFamily() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->mFontDescription.family;
-  }
-
-  return EMPTY_STRING;
+  return PlaceholderHandler::GetPlaceholderFontFamily(*this);
 }
 
 void Controller::SetDefaultFontWeight( FontWeight weight )
@@ -779,6 +792,16 @@ void Controller::SetDefaultFontWeight( FontWeight weight )
   mImpl->mFontDefaults->mFontDescription.weight = weight;
   mImpl->mFontDefaults->weightDefined = true;
 
+  if( mImpl->mEventData )
+  {
+    // Update the cursor position if it's in editing mode
+    if( EventData::IsEditingState( mImpl->mEventData->mState ) )
+    {
+      mImpl->mEventData->mDecoratorUpdated = true;
+      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font weight is updated.
+    }
+  }
+
   // Clear the font-specific data
   ClearFontData();
 
@@ -807,37 +830,17 @@ FontWeight Controller::GetDefaultFontWeight() const
 
 void Controller::SetPlaceholderTextFontWeight( FontWeight weight )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( NULL == mImpl->mEventData->mPlaceholderFont )
-    {
-      mImpl->mEventData->mPlaceholderFont = new FontDefaults();
-    }
-
-    mImpl->mEventData->mPlaceholderFont->mFontDescription.weight = weight;
-    mImpl->mEventData->mPlaceholderFont->weightDefined = true;
-
-    mImpl->RequestRelayout();
-  }
+  PlaceholderHandler::SetPlaceholderTextFontWeight(*this, weight);
 }
 
 bool Controller::IsPlaceholderTextFontWeightDefined() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->weightDefined;
-  }
-  return false;
+  return PlaceholderHandler::IsPlaceholderTextFontWeightDefined(*this);;
 }
 
 FontWeight Controller::GetPlaceholderTextFontWeight() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->mFontDescription.weight;
-  }
-
-  return TextAbstraction::FontWeight::NORMAL;
+  return PlaceholderHandler::GetPlaceholderTextFontWeight(*this);
 }
 
 void Controller::SetDefaultFontWidth( FontWidth width )
@@ -850,6 +853,16 @@ void Controller::SetDefaultFontWidth( FontWidth width )
   mImpl->mFontDefaults->mFontDescription.width = width;
   mImpl->mFontDefaults->widthDefined = true;
 
+  if( mImpl->mEventData )
+  {
+    // Update the cursor position if it's in editing mode
+    if( EventData::IsEditingState( mImpl->mEventData->mState ) )
+    {
+      mImpl->mEventData->mDecoratorUpdated = true;
+      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font width is updated.
+    }
+  }
+
   // Clear the font-specific data
   ClearFontData();
 
@@ -878,37 +891,17 @@ FontWidth Controller::GetDefaultFontWidth() const
 
 void Controller::SetPlaceholderTextFontWidth( FontWidth width )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( NULL == mImpl->mEventData->mPlaceholderFont )
-    {
-      mImpl->mEventData->mPlaceholderFont = new FontDefaults();
-    }
-
-    mImpl->mEventData->mPlaceholderFont->mFontDescription.width = width;
-    mImpl->mEventData->mPlaceholderFont->widthDefined = true;
-
-    mImpl->RequestRelayout();
-  }
+  PlaceholderHandler::SetPlaceholderTextFontWidth(*this, width);
 }
 
 bool Controller::IsPlaceholderTextFontWidthDefined() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->widthDefined;
-  }
-  return false;
+  return PlaceholderHandler::IsPlaceholderTextFontWidthDefined(*this);
 }
 
 FontWidth Controller::GetPlaceholderTextFontWidth() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->mFontDescription.width;
-  }
-
-  return TextAbstraction::FontWidth::NORMAL;
+  return PlaceholderHandler::GetPlaceholderTextFontWidth(*this);
 }
 
 void Controller::SetDefaultFontSlant( FontSlant slant )
@@ -921,6 +914,16 @@ void Controller::SetDefaultFontSlant( FontSlant slant )
   mImpl->mFontDefaults->mFontDescription.slant = slant;
   mImpl->mFontDefaults->slantDefined = true;
 
+  if( mImpl->mEventData )
+  {
+    // Update the cursor position if it's in editing mode
+    if( EventData::IsEditingState( mImpl->mEventData->mState ) )
+    {
+      mImpl->mEventData->mDecoratorUpdated = true;
+      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font slant is updated.
+    }
+  }
+
   // Clear the font-specific data
   ClearFontData();
 
@@ -948,37 +951,17 @@ FontSlant Controller::GetDefaultFontSlant() const
 
 void Controller::SetPlaceholderTextFontSlant( FontSlant slant )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( NULL == mImpl->mEventData->mPlaceholderFont )
-    {
-      mImpl->mEventData->mPlaceholderFont = new FontDefaults();
-    }
-
-    mImpl->mEventData->mPlaceholderFont->mFontDescription.slant = slant;
-    mImpl->mEventData->mPlaceholderFont->slantDefined = true;
-
-    mImpl->RequestRelayout();
-  }
+  PlaceholderHandler::SetPlaceholderTextFontSlant(*this, slant);
 }
 
 bool Controller::IsPlaceholderTextFontSlantDefined() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->slantDefined;
-  }
-  return false;
+  return PlaceholderHandler::IsPlaceholderTextFontSlantDefined(*this);
 }
 
 FontSlant Controller::GetPlaceholderTextFontSlant() const
 {
-  if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) )
-  {
-    return mImpl->mEventData->mPlaceholderFont->mFontDescription.slant;
-  }
-
-  return TextAbstraction::FontSlant::NORMAL;
+  return PlaceholderHandler::GetPlaceholderTextFontSlant(*this);
 }
 
 void Controller::SetDefaultFontSize( float fontSize, FontSizeType type )
@@ -1010,6 +993,16 @@ void Controller::SetDefaultFontSize( float fontSize, FontSizeType type )
     }
   }
 
+  if( mImpl->mEventData )
+  {
+    // Update the cursor position if it's in editing mode
+    if( EventData::IsEditingState( mImpl->mEventData->mState ) )
+    {
+      mImpl->mEventData->mDecoratorUpdated = true;
+      mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font size is updated.
+    }
+  }
+
   // Clear the font-specific data
   ClearFontData();
 
@@ -1048,85 +1041,12 @@ float Controller::GetDefaultFontSize( FontSizeType type ) const
 
 void Controller::SetPlaceholderTextFontSize( float fontSize, FontSizeType type )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( NULL == mImpl->mEventData->mPlaceholderFont )
-    {
-      mImpl->mEventData->mPlaceholderFont = new FontDefaults();
-    }
-
-    switch( type )
-    {
-      case POINT_SIZE:
-      {
-        mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = fontSize;
-        mImpl->mEventData->mPlaceholderFont->sizeDefined = true;
-        mImpl->mEventData->mIsPlaceholderPixelSize = false; // Font size flag
-        break;
-      }
-      case PIXEL_SIZE:
-      {
-        // Point size = Pixel size * 72.f / DPI
-        unsigned int horizontalDpi = 0u;
-        unsigned int verticalDpi = 0u;
-        TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-        fontClient.GetDpi( horizontalDpi, verticalDpi );
-
-        mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = ( fontSize * 72.f ) / static_cast< float >( horizontalDpi );
-        mImpl->mEventData->mPlaceholderFont->sizeDefined = true;
-        mImpl->mEventData->mIsPlaceholderPixelSize = true; // Font size flag
-        break;
-      }
-    }
-
-    mImpl->RequestRelayout();
-  }
+  PlaceholderHandler::SetPlaceholderTextFontSize(*this, fontSize, type);
 }
 
 float Controller::GetPlaceholderTextFontSize( FontSizeType type ) const
 {
-  float value = 0.0f;
-  if( NULL != mImpl->mEventData )
-  {
-    switch( type )
-    {
-      case POINT_SIZE:
-      {
-        if( NULL != mImpl->mEventData->mPlaceholderFont )
-        {
-          value = mImpl->mEventData->mPlaceholderFont->mDefaultPointSize;
-        }
-        else
-        {
-          // If the placeholder text font size is not set, then return the default font size.
-          value = GetDefaultFontSize( POINT_SIZE );
-        }
-        break;
-      }
-      case PIXEL_SIZE:
-      {
-        if( NULL != mImpl->mEventData->mPlaceholderFont )
-        {
-          // Pixel size = Point size * DPI / 72.f
-          unsigned int horizontalDpi = 0u;
-          unsigned int verticalDpi = 0u;
-          TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
-          fontClient.GetDpi( horizontalDpi, verticalDpi );
-
-          value = mImpl->mEventData->mPlaceholderFont->mDefaultPointSize * static_cast< float >( horizontalDpi ) / 72.f;
-        }
-        else
-        {
-          // If the placeholder text font size is not set, then return the default font size.
-          value = GetDefaultFontSize( PIXEL_SIZE );
-        }
-        break;
-      }
-    }
-    return value;
-  }
-
-  return value;
+  return PlaceholderHandler::GetPlaceholderTextFontSize(*this, type);
 }
 
 void Controller::SetDefaultColor( const Vector4& color )
@@ -1137,6 +1057,10 @@ void Controller::SetDefaultColor( const Vector4& color )
   {
     mImpl->mModel->mVisualModel->SetTextColor( color );
 
+    mImpl->mModel->mLogicalModel->mColorRuns.Clear();
+
+    mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending | COLOR );
+
     mImpl->RequestRelayout();
   }
 }
@@ -1148,26 +1072,12 @@ const Vector4& Controller::GetDefaultColor() const
 
 void Controller::SetPlaceholderTextColor( const Vector4& textColor )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    mImpl->mEventData->mPlaceholderTextColor = textColor;
-  }
-
-  if( mImpl->IsShowingPlaceholderText() )
-  {
-    mImpl->mModel->mVisualModel->SetTextColor( textColor );
-    mImpl->RequestRelayout();
-  }
+  PlaceholderHandler::SetPlaceholderTextColor(*this, textColor);
 }
 
 const Vector4& Controller::GetPlaceholderTextColor() const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mPlaceholderTextColor;
-  }
-
-  return Color::BLACK;
+  return PlaceholderHandler::GetPlaceholderTextColor(*this);
 }
 
 void Controller::SetShadowOffset( const Vector2& shadowOffset )
@@ -1335,7 +1245,7 @@ const std::string& Controller::GetDefaultOutlineProperties() const
 
 bool Controller::SetDefaultLineSpacing( float lineSpacing )
 {
-  if( std::abs(lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing()) > Math::MACHINE_EPSILON_1000 )
+  if( std::fabs( lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing() ) > Math::MACHINE_EPSILON_1000 )
   {
     mImpl->mLayoutEngine.SetDefaultLineSpacing(lineSpacing);
     mImpl->mRecalculateNaturalSize = true;
@@ -1349,11 +1259,27 @@ float Controller::GetDefaultLineSpacing() const
   return mImpl->mLayoutEngine.GetDefaultLineSpacing();
 }
 
-void Controller::SetInputColor( const Vector4& color )
+bool Controller::SetDefaultLineSize( float lineSize )
 {
-  if( NULL != mImpl->mEventData )
+  if( std::fabs( lineSize - mImpl->mLayoutEngine.GetDefaultLineSize() ) > Math::MACHINE_EPSILON_1000 )
   {
-    mImpl->mEventData->mInputStyle.textColor = color;
+    mImpl->mLayoutEngine.SetDefaultLineSize(lineSize);
+    mImpl->mRecalculateNaturalSize = true;
+    return true;
+  }
+  return false;
+}
+
+float Controller::GetDefaultLineSize() const
+{
+  return mImpl->mLayoutEngine.GetDefaultLineSize();
+}
+
+void Controller::SetInputColor( const Vector4& color )
+{
+  if( NULL != mImpl->mEventData )
+  {
+    mImpl->mEventData->mInputStyle.textColor = color;
     mImpl->mEventData->mInputStyle.isDefaultColor = false;
 
     if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState )
@@ -1398,314 +1324,67 @@ const Vector4& Controller::GetInputColor() const
 
 void Controller::SetInputFontFamily( const std::string& fontFamily )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    mImpl->mEventData->mInputStyle.familyName = fontFamily;
-    mImpl->mEventData->mInputStyle.isFamilyDefined = true;
-
-    if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState )
-    {
-      CharacterIndex startOfSelectedText = 0u;
-      Length lengthOfSelectedText = 0u;
-      FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData,
-                                                                            mImpl->mModel->mLogicalModel,
-                                                                            startOfSelectedText,
-                                                                            lengthOfSelectedText );
-
-      fontDescriptionRun.familyLength = fontFamily.size();
-      fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength];
-      memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength );
-      fontDescriptionRun.familyDefined = true;
-
-      // The memory allocated for the font family name is freed when the font description is removed from the logical model.
-
-      // Request to relayout.
-      mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
-                                                               VALIDATE_FONTS            |
-                                                               SHAPE_TEXT                |
-                                                               GET_GLYPH_METRICS         |
-                                                               LAYOUT                    |
-                                                               UPDATE_LAYOUT_SIZE        |
-                                                               REORDER                   |
-                                                               ALIGN );
-      mImpl->mRecalculateNaturalSize = true;
-      mImpl->RequestRelayout();
-
-      mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText;
-
-      // As the font changes, recalculate the handle positions is needed.
-      mImpl->mEventData->mUpdateLeftSelectionPosition = true;
-      mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      mImpl->mEventData->mUpdateHighlightBox = true;
-      mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-  }
+  InputFontHandler::SetInputFontFamily(*this, fontFamily);
 }
 
 const std::string& Controller::GetInputFontFamily() const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mInputStyle.familyName;
-  }
-
-  // Return the default font's family if there is no EventData.
-  return GetDefaultFontFamily();
+  return InputFontHandler::GetInputFontFamily(*this);
 }
 
 void Controller::SetInputFontWeight( FontWeight weight )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    mImpl->mEventData->mInputStyle.weight = weight;
-    mImpl->mEventData->mInputStyle.isWeightDefined = true;
-
-    if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState )
-    {
-      CharacterIndex startOfSelectedText = 0u;
-      Length lengthOfSelectedText = 0u;
-      FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData,
-                                                                            mImpl->mModel->mLogicalModel,
-                                                                            startOfSelectedText,
-                                                                            lengthOfSelectedText );
-
-      fontDescriptionRun.weight = weight;
-      fontDescriptionRun.weightDefined = true;
-
-      // Request to relayout.
-      mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
-                                                               VALIDATE_FONTS            |
-                                                               SHAPE_TEXT                |
-                                                               GET_GLYPH_METRICS         |
-                                                               LAYOUT                    |
-                                                               UPDATE_LAYOUT_SIZE        |
-                                                               REORDER                   |
-                                                               ALIGN );
-      mImpl->mRecalculateNaturalSize = true;
-      mImpl->RequestRelayout();
-
-      mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText;
-
-      // As the font might change, recalculate the handle positions is needed.
-      mImpl->mEventData->mUpdateLeftSelectionPosition = true;
-      mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      mImpl->mEventData->mUpdateHighlightBox = true;
-      mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-  }
+  InputFontHandler::SetInputFontWeight(*this, weight);
 }
 
 bool Controller::IsInputFontWeightDefined() const
 {
-  bool defined = false;
-
-  if( NULL != mImpl->mEventData )
-  {
-    defined = mImpl->mEventData->mInputStyle.isWeightDefined;
-  }
-
-  return defined;
+  return InputFontHandler::IsInputFontWeightDefined(*this);
 }
 
 FontWeight Controller::GetInputFontWeight() const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mInputStyle.weight;
-  }
-
-  return GetDefaultFontWeight();
+  return InputFontHandler::GetInputFontWeight(*this);
 }
 
 void Controller::SetInputFontWidth( FontWidth width )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    mImpl->mEventData->mInputStyle.width = width;
-    mImpl->mEventData->mInputStyle.isWidthDefined = true;
-
-    if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState )
-    {
-      CharacterIndex startOfSelectedText = 0u;
-      Length lengthOfSelectedText = 0u;
-      FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData,
-                                                                            mImpl->mModel->mLogicalModel,
-                                                                            startOfSelectedText,
-                                                                            lengthOfSelectedText );
-
-      fontDescriptionRun.width = width;
-      fontDescriptionRun.widthDefined = true;
-
-      // Request to relayout.
-      mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
-                                                               VALIDATE_FONTS            |
-                                                               SHAPE_TEXT                |
-                                                               GET_GLYPH_METRICS         |
-                                                               LAYOUT                    |
-                                                               UPDATE_LAYOUT_SIZE        |
-                                                               REORDER                   |
-                                                               ALIGN );
-      mImpl->mRecalculateNaturalSize = true;
-      mImpl->RequestRelayout();
-
-      mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText;
-
-      // As the font might change, recalculate the handle positions is needed.
-      mImpl->mEventData->mUpdateLeftSelectionPosition = true;
-      mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      mImpl->mEventData->mUpdateHighlightBox = true;
-      mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-  }
+  InputFontHandler::SetInputFontWidth(*this, width);
 }
 
 bool Controller::IsInputFontWidthDefined() const
 {
-  bool defined = false;
-
-  if( NULL != mImpl->mEventData )
-  {
-    defined = mImpl->mEventData->mInputStyle.isWidthDefined;
-  }
-
-  return defined;
+  return InputFontHandler::IsInputFontWidthDefined(*this);
 }
 
 FontWidth Controller::GetInputFontWidth() const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mInputStyle.width;
-  }
-
-  return GetDefaultFontWidth();
+  return InputFontHandler::GetInputFontWidth(*this);
 }
 
 void Controller::SetInputFontSlant( FontSlant slant )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    mImpl->mEventData->mInputStyle.slant = slant;
-    mImpl->mEventData->mInputStyle.isSlantDefined = true;
-
-    if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState )
-    {
-      CharacterIndex startOfSelectedText = 0u;
-      Length lengthOfSelectedText = 0u;
-      FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData,
-                                                                            mImpl->mModel->mLogicalModel,
-                                                                            startOfSelectedText,
-                                                                            lengthOfSelectedText );
-
-      fontDescriptionRun.slant = slant;
-      fontDescriptionRun.slantDefined = true;
-
-      // Request to relayout.
-      mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
-                                                               VALIDATE_FONTS            |
-                                                               SHAPE_TEXT                |
-                                                               GET_GLYPH_METRICS         |
-                                                               LAYOUT                    |
-                                                               UPDATE_LAYOUT_SIZE        |
-                                                               REORDER                   |
-                                                               ALIGN );
-      mImpl->mRecalculateNaturalSize = true;
-      mImpl->RequestRelayout();
-
-      mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText;
-
-      // As the font might change, recalculate the handle positions is needed.
-      mImpl->mEventData->mUpdateLeftSelectionPosition = true;
-      mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      mImpl->mEventData->mUpdateHighlightBox = true;
-      mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-  }
+  InputFontHandler::SetInputFontSlant(*this, slant);
 }
 
 bool Controller::IsInputFontSlantDefined() const
 {
-  bool defined = false;
-
-  if( NULL != mImpl->mEventData )
-  {
-    defined = mImpl->mEventData->mInputStyle.isSlantDefined;
-  }
-
-  return defined;
+  return InputFontHandler::IsInputFontSlantDefined(*this);
 }
 
 FontSlant Controller::GetInputFontSlant() const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mInputStyle.slant;
-  }
-
-  return GetDefaultFontSlant();
+  return InputFontHandler::GetInputFontSlant(*this);
 }
 
 void Controller::SetInputFontPointSize( float size )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    mImpl->mEventData->mInputStyle.size = size;
-    mImpl->mEventData->mInputStyle.isSizeDefined = true;
-
-    if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState )
-    {
-      CharacterIndex startOfSelectedText = 0u;
-      Length lengthOfSelectedText = 0u;
-      FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData,
-                                                                            mImpl->mModel->mLogicalModel,
-                                                                            startOfSelectedText,
-                                                                            lengthOfSelectedText );
-
-      fontDescriptionRun.size = static_cast<PointSize26Dot6>( size * 64.f );
-      fontDescriptionRun.sizeDefined = true;
-
-      // Request to relayout.
-      mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
-                                                               VALIDATE_FONTS            |
-                                                               SHAPE_TEXT                |
-                                                               GET_GLYPH_METRICS         |
-                                                               LAYOUT                    |
-                                                               UPDATE_LAYOUT_SIZE        |
-                                                               REORDER                   |
-                                                               ALIGN );
-      mImpl->mRecalculateNaturalSize = true;
-      mImpl->RequestRelayout();
-
-      mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText;
-      mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText;
-
-      // As the font might change, recalculate the handle positions is needed.
-      mImpl->mEventData->mUpdateLeftSelectionPosition = true;
-      mImpl->mEventData->mUpdateRightSelectionPosition = true;
-      mImpl->mEventData->mUpdateHighlightBox = true;
-      mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-  }
+  InputFontHandler::SetInputFontPointSize(*this, size);
 }
 
 float Controller::GetInputFontPointSize() const
 {
-  if( NULL != mImpl->mEventData )
-  {
-    return mImpl->mEventData->mInputStyle.size;
-  }
-
-  // Return the default font's point size if there is no EventData.
-  return GetDefaultFontSize( Text::Controller::POINT_SIZE );
+  return InputFontHandler::GetInputFontPointSize(*this);
 }
 
 void Controller::SetInputLineSpacing( float lineSpacing )
@@ -1923,7 +1602,6 @@ Vector3 Controller::GetNaturalSize()
                                                                            GET_SCRIPTS       |
                                                                            VALIDATE_FONTS    |
                                                                            GET_LINE_BREAKS   |
-                                                                           GET_WORD_BREAKS   |
                                                                            BIDI_INFO         |
                                                                            SHAPE_TEXT        |
                                                                            GET_GLYPH_METRICS );
@@ -1983,6 +1661,97 @@ Vector3 Controller::GetNaturalSize()
   return naturalSize;
 }
 
+bool Controller::CheckForTextFit( float pointSize, Size& layoutSize )
+{
+  Size textSize;
+  mImpl->mFontDefaults->mFitPointSize = pointSize;
+  mImpl->mFontDefaults->sizeDefined = true;
+  ClearFontData();
+
+  // Operations that can be done only once until the text changes.
+  const OperationsMask onlyOnceOperations = static_cast<OperationsMask>( CONVERT_TO_UTF32 |
+                                                                              GET_SCRIPTS |
+                                                                           VALIDATE_FONTS |
+                                                                          GET_LINE_BREAKS |
+                                                                                BIDI_INFO |
+                                                                                SHAPE_TEXT|
+                                                                         GET_GLYPH_METRICS );
+
+  mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u;
+  mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count();
+
+  // Make sure the model is up-to-date before layouting
+  mImpl->UpdateModel( onlyOnceOperations );
+
+  DoRelayout( Size( layoutSize.width, MAX_FLOAT ),
+              static_cast<OperationsMask>( onlyOnceOperations | LAYOUT),
+              textSize);
+
+  // Clear the update info. This info will be set the next time the text is updated.
+  mImpl->mTextUpdateInfo.Clear();
+  mImpl->mTextUpdateInfo.mClearAll = true;
+
+  if( textSize.width > layoutSize.width || textSize.height > layoutSize.height )
+  {
+    return false;
+  }
+  return true;
+}
+
+void Controller::FitPointSizeforLayout( Size layoutSize )
+{
+  const OperationsMask operations  = mImpl->mOperationsPending;
+  if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) || mImpl->mTextFitContentSize != layoutSize )
+  {
+    bool actualellipsis = mImpl->mModel->mElideEnabled;
+    float minPointSize = mImpl->mTextFitMinSize;
+    float maxPointSize = mImpl->mTextFitMaxSize;
+    float pointInterval = mImpl->mTextFitStepSize;
+
+    mImpl->mModel->mElideEnabled = false;
+    Vector<float> pointSizeArray;
+
+    // check zero value
+    if( pointInterval < 1.f )
+    {
+      mImpl->mTextFitStepSize = pointInterval = 1.0f;
+    }
+
+    pointSizeArray.Reserve( static_cast< unsigned int >( ceil( ( maxPointSize - minPointSize ) / pointInterval ) ) );
+
+    for( float i = minPointSize; i < maxPointSize; i += pointInterval )
+    {
+      pointSizeArray.PushBack( i );
+    }
+
+    pointSizeArray.PushBack( maxPointSize );
+
+    int bestSizeIndex = 0;
+    int min = bestSizeIndex + 1;
+    int max = pointSizeArray.Size() - 1;
+    while( min <= max )
+    {
+      int destI = ( min + max ) / 2;
+
+      if( CheckForTextFit( pointSizeArray[destI], layoutSize ) )
+      {
+        bestSizeIndex = min;
+        min = destI + 1;
+      }
+      else
+      {
+        max = destI - 1;
+        bestSizeIndex = max;
+      }
+    }
+
+    mImpl->mModel->mElideEnabled = actualellipsis;
+    mImpl->mFontDefaults->mFitPointSize = pointSizeArray[bestSizeIndex];
+    mImpl->mFontDefaults->sizeDefined = true;
+    ClearFontData();
+  }
+}
+
 float Controller::GetHeightForWidth( float width )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", this, width );
@@ -1999,7 +1768,6 @@ float Controller::GetHeightForWidth( float width )
                                                                            GET_SCRIPTS       |
                                                                            VALIDATE_FONTS    |
                                                                            GET_LINE_BREAKS   |
-                                                                           GET_WORD_BREAKS   |
                                                                            BIDI_INFO         |
                                                                            SHAPE_TEXT        |
                                                                            GET_GLYPH_METRICS );
@@ -2106,107 +1874,12 @@ void Controller::GetHiddenInputOption(Property::Map& options )
 
 void Controller::SetPlaceholderProperty( const Property::Map& map )
 {
-  const Property::Map::SizeType count = map.Count();
-
-  for( Property::Map::SizeType position = 0; position < count; ++position )
-  {
-    KeyValuePair keyValue = map.GetKeyValue( position );
-    Property::Key& key = keyValue.first;
-    Property::Value& value = keyValue.second;
-
-    if( key == Toolkit::Text::PlaceHolder::Property::TEXT  || key == PLACEHOLDER_TEXT )
-    {
-      std::string text = "";
-      value.Get( text );
-      SetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, text );
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::TEXT_FOCUSED || key == PLACEHOLDER_TEXT_FOCUSED )
-    {
-      std::string text = "";
-      value.Get( text );
-      SetPlaceholderText( Controller::PLACEHOLDER_TYPE_ACTIVE, text );
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::COLOR || key == PLACEHOLDER_COLOR )
-    {
-      Vector4 textColor;
-      value.Get( textColor );
-      if( GetPlaceholderTextColor() != textColor )
-      {
-        SetPlaceholderTextColor( textColor );
-      }
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::FONT_FAMILY || key == PLACEHOLDER_FONT_FAMILY )
-    {
-      std::string fontFamily = "";
-      value.Get( fontFamily );
-      SetPlaceholderFontFamily( fontFamily );
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::FONT_STYLE || key == PLACEHOLDER_FONT_STYLE )
-    {
-      SetFontStyleProperty( this, value, Text::FontStyle::PLACEHOLDER );
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::POINT_SIZE || key == PLACEHOLDER_POINT_SIZE )
-    {
-      float pointSize;
-      value.Get( pointSize );
-      if( !Equals( GetPlaceholderTextFontSize( Text::Controller::POINT_SIZE ), pointSize ) )
-      {
-        SetPlaceholderTextFontSize( pointSize, Text::Controller::POINT_SIZE );
-      }
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::PIXEL_SIZE || key == PLACEHOLDER_PIXEL_SIZE )
-    {
-      float pixelSize;
-      value.Get( pixelSize );
-      if( !Equals( GetPlaceholderTextFontSize( Text::Controller::PIXEL_SIZE ), pixelSize ) )
-      {
-        SetPlaceholderTextFontSize( pixelSize, Text::Controller::PIXEL_SIZE );
-      }
-    }
-    else if( key == Toolkit::Text::PlaceHolder::Property::ELLIPSIS || key == PLACEHOLDER_ELLIPSIS )
-    {
-      bool ellipsis;
-      value.Get( ellipsis );
-      SetPlaceholderTextElideEnabled( ellipsis );
-    }
-  }
+  PlaceholderHandler::SetPlaceholderProperty(*this, map);
 }
 
 void Controller::GetPlaceholderProperty( Property::Map& map )
 {
-  if( NULL != mImpl->mEventData )
-  {
-    if( !mImpl->mEventData->mPlaceholderTextActive.empty() )
-    {
-      map[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = mImpl->mEventData->mPlaceholderTextActive;
-    }
-    if( !mImpl->mEventData->mPlaceholderTextInactive.empty() )
-    {
-      map[ Text::PlaceHolder::Property::TEXT ] = mImpl->mEventData->mPlaceholderTextInactive;
-    }
-
-    map[ Text::PlaceHolder::Property::COLOR ] = mImpl->mEventData->mPlaceholderTextColor;
-    map[ Text::PlaceHolder::Property::FONT_FAMILY ] = GetPlaceholderFontFamily();
-
-    Property::Value fontStyleMapGet;
-    GetFontStyleProperty( this, fontStyleMapGet, Text::FontStyle::PLACEHOLDER );
-    map[ Text::PlaceHolder::Property::FONT_STYLE ] = fontStyleMapGet;
-
-    // Choose font size : POINT_SIZE or PIXEL_SIZE
-    if( !mImpl->mEventData->mIsPlaceholderPixelSize )
-    {
-      map[ Text::PlaceHolder::Property::POINT_SIZE ] = GetPlaceholderTextFontSize( Text::Controller::POINT_SIZE );
-    }
-    else
-    {
-      map[ Text::PlaceHolder::Property::PIXEL_SIZE ] = GetPlaceholderTextFontSize( Text::Controller::PIXEL_SIZE );
-    }
-
-    if( mImpl->mEventData->mPlaceholderEllipsisFlag )
-    {
-      map[ Text::PlaceHolder::Property::ELLIPSIS ] = IsPlaceholderTextElideEnabled();
-    }
-  }
+  PlaceholderHandler::GetPlaceholderProperty(*this, map);
 }
 
 Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection()
@@ -2221,7 +1894,6 @@ Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection()
                                                                            GET_SCRIPTS       |
                                                                            VALIDATE_FONTS    |
                                                                            GET_LINE_BREAKS   |
-                                                                           GET_WORD_BREAKS   |
                                                                            BIDI_INFO         |
                                                                            SHAPE_TEXT        |
                                                                            GET_GLYPH_METRICS );
@@ -2245,6 +1917,9 @@ Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection()
     // Clear the update info. This info will be set the next time the text is updated.
     mImpl->mTextUpdateInfo.Clear();
 
+    // FullRelayoutNeeded should be true because DoRelayout is MAX_FLOAT, MAX_FLOAT.
+    mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true;
+
     mImpl->mUpdateTextDirection = false;
   }
 
@@ -2442,557 +2117,97 @@ void Controller::ProcessInputStyleChangedSignals()
 
     if( NULL != mImpl->mEditableControlInterface )
     {
-      // Emit the input style changed signal.
-      mImpl->mEditableControlInterface->InputStyleChanged( mask );
-    }
-  }
-
-  mImpl->mEventData->mInputStyleChangedQueue.Clear();
-}
-
-// public : Text-input Event Queuing.
-
-void Controller::KeyboardFocusGainEvent()
-{
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" );
-
-  if( NULL != mImpl->mEventData )
-  {
-    if( ( EventData::INACTIVE == mImpl->mEventData->mState ) ||
-        ( EventData::INTERRUPTED == mImpl->mEventData->mState ) )
-    {
-      mImpl->ChangeState( EventData::EDITING );
-      mImpl->mEventData->mUpdateCursorPosition = true; //If editing started without tap event, cursor update must be triggered.
-      mImpl->mEventData->mUpdateInputStyle = true;
-      mImpl->mEventData->mScrollAfterUpdatePosition = true;
-    }
-    mImpl->NotifyInputMethodContextMultiLineStatus();
-    if( mImpl->IsShowingPlaceholderText() )
-    {
-      // Show alternative placeholder-text when editing
-      ShowPlaceholderText();
-    }
-
-    mImpl->RequestRelayout();
-  }
-}
-
-void Controller::KeyboardFocusLostEvent()
-{
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" );
-
-  if( NULL != mImpl->mEventData )
-  {
-    if( EventData::INTERRUPTED != mImpl->mEventData->mState )
-    {
-      mImpl->ChangeState( EventData::INACTIVE );
-
-      if( !mImpl->IsShowingRealText() )
-      {
-        // Revert to regular placeholder-text when not editing
-        ShowPlaceholderText();
-      }
-    }
-  }
-  mImpl->RequestRelayout();
-}
-
-bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
-{
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" );
-
-  bool textChanged = false;
-  bool relayoutNeeded = false;
-
-  if( ( NULL != mImpl->mEventData ) &&
-      ( keyEvent.state == KeyEvent::Down ) )
-  {
-    int keyCode = keyEvent.keyCode;
-    const std::string& keyString = keyEvent.keyPressed;
-    const std::string keyName = keyEvent.keyPressedName;
-
-    const bool isNullKey = ( 0 == keyCode ) && ( keyString.empty() );
-
-    // Pre-process to separate modifying events from non-modifying input events.
-    if( isNullKey )
-    {
-      // In some platforms arrive key events with no key code.
-      // Do nothing.
-      return false;
-    }
-    else if( Dali::DALI_KEY_ESCAPE == keyCode || Dali::DALI_KEY_BACK == keyCode  || Dali::DALI_KEY_SEARCH == keyCode )
-    {
-      // Do nothing
-      return false;
-    }
-    else if( ( Dali::DALI_KEY_CURSOR_LEFT  == keyCode ) ||
-             ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) ||
-             ( Dali::DALI_KEY_CURSOR_UP    == keyCode ) ||
-             ( Dali::DALI_KEY_CURSOR_DOWN  == keyCode ) )
-    {
-      // If don't have any text, do nothing.
-      if( !mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters )
-      {
-        return false;
-      }
-
-      uint32_t cursorPosition = mImpl->mEventData->mPrimaryCursorPosition;
-      uint32_t numberOfCharacters = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters;
-      uint32_t cursorLine = mImpl->mModel->mVisualModel->GetLineOfCharacter( cursorPosition );
-      uint32_t numberOfLines = mImpl->mModel->GetNumberOfLines();
-
-      // Logic to determine whether this text control will lose focus or not.
-      if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode && 0 == cursorPosition && !keyEvent.IsShiftModifier() ) ||
-          ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode && numberOfCharacters == cursorPosition && !keyEvent.IsShiftModifier() ) ||
-          ( Dali::DALI_KEY_CURSOR_DOWN == keyCode && cursorLine == numberOfLines -1 ) ||
-          ( Dali::DALI_KEY_CURSOR_DOWN == keyCode && numberOfCharacters == cursorPosition && cursorLine -1 == numberOfLines -1 ) ||
-          ( Dali::DALI_KEY_CURSOR_UP == keyCode && cursorLine == 0 ) ||
-          ( Dali::DALI_KEY_CURSOR_UP == keyCode && numberOfCharacters == cursorPosition && cursorLine == 1 ) )
-      {
-        // Release the active highlight.
-        if( mImpl->mEventData->mState == EventData::SELECTING )
-        {
-          mImpl->ChangeState( EventData::EDITING );
-
-          // Update selection position.
-          mImpl->mEventData->mLeftSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition;
-          mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition;
-          mImpl->mEventData->mUpdateCursorPosition = true;
-          mImpl->RequestRelayout();
-        }
-        return false;
-      }
-
-      mImpl->mEventData->mCheckScrollAmount = true;
-      Event event( Event::CURSOR_KEY_EVENT );
-      event.p1.mInt = keyCode;
-      event.p2.mBool = keyEvent.IsShiftModifier();
-      mImpl->mEventData->mEventQueue.push_back( event );
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-    }
-    else if ( Dali::DevelKey::DALI_KEY_CONTROL_LEFT == keyCode || Dali::DevelKey::DALI_KEY_CONTROL_RIGHT == keyCode )
-    {
-      // Left or Right Control key event is received before Ctrl-C/V/X key event is received
-      // If not handle it here, any selected text will be deleted
-
-      // Do nothing
-      return false;
-    }
-    else if ( keyEvent.IsCtrlModifier() )
-    {
-      bool consumed = false;
-      if (keyName == KEY_C_NAME)
-      {
-        // Ctrl-C to copy the selected text
-        TextPopupButtonTouched( Toolkit::TextSelectionPopup::COPY );
-        consumed = true;
-      }
-      else if (keyName == KEY_V_NAME)
-      {
-        // Ctrl-V to paste the copied text
-        TextPopupButtonTouched( Toolkit::TextSelectionPopup::PASTE );
-        consumed = true;
-      }
-      else if (keyName == KEY_X_NAME)
-      {
-        // Ctrl-X to cut the selected text
-        TextPopupButtonTouched( Toolkit::TextSelectionPopup::CUT );
-        consumed = true;
-      }
-      return consumed;
-    }
-    else if( ( Dali::DALI_KEY_BACKSPACE == keyCode ) ||
-             ( Dali::DevelKey::DALI_KEY_DELETE == keyCode ) )
-    {
-      textChanged = DeleteEvent( keyCode );
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-    }
-    else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) ||
-             IsKey( keyEvent, Dali::DALI_KEY_MENU ) ||
-             IsKey( keyEvent, Dali::DALI_KEY_HOME ) )
-    {
-      // Power key/Menu/Home key behaviour does not allow edit mode to resume.
-      mImpl->ChangeState( EventData::INACTIVE );
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-
-      // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text.
-    }
-    else if( ( Dali::DALI_KEY_SHIFT_LEFT == keyCode ) || ( Dali::DALI_KEY_SHIFT_RIGHT == keyCode ) )
-    {
-      // DALI_KEY_SHIFT_LEFT or DALI_KEY_SHIFT_RIGHT is the key code for Shift. It's sent (by the InputMethodContext?) when the predictive text is enabled
-      // and a character is typed after the type of a upper case latin character.
-
-      // Do nothing.
-      return false;
-    }
-    else if( ( Dali::DALI_KEY_VOLUME_UP == keyCode ) || ( Dali::DALI_KEY_VOLUME_DOWN == keyCode ) )
-    {
-      // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text.
-      // Do nothing.
-      return false;
-    }
-    else
-    {
-      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() );
-
-      if( !keyString.empty() )
-      {
-        // InputMethodContext is no longer handling key-events
-        mImpl->ClearPreEditFlag();
-
-        InsertText( keyString, COMMIT );
-
-        textChanged = true;
-
-        // Will request for relayout.
-        relayoutNeeded = true;
-      }
-
-    }
-
-    if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) &&
-         ( mImpl->mEventData->mState != EventData::INACTIVE ) &&
-         ( !isNullKey ) &&
-         ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) &&
-         ( Dali::DALI_KEY_SHIFT_RIGHT != keyCode ) &&
-         ( Dali::DALI_KEY_VOLUME_UP != keyCode ) &&
-         ( Dali::DALI_KEY_VOLUME_DOWN != keyCode ) )
-    {
-      // Should not change the state if the key is the shift send by the InputMethodContext.
-      // Otherwise, when the state is SELECTING the text controller can't send the right
-      // surrounding info to the InputMethodContext.
-      mImpl->ChangeState( EventData::EDITING );
-
-      // Will request for relayout.
-      relayoutNeeded = true;
-    }
-
-    if( relayoutNeeded )
-    {
-      mImpl->RequestRelayout();
-    }
-  }
-
-  if( textChanged &&
-      ( NULL != mImpl->mEditableControlInterface ) )
-  {
-    // Do this last since it provides callbacks into application code
-    mImpl->mEditableControlInterface->TextChanged();
-  }
-
-  return true;
-}
-
-void Controller::TapEvent( unsigned int tapCount, float x, float y )
-{
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" );
-
-  if( NULL != mImpl->mEventData )
-  {
-    DALI_LOG_INFO( gLogFilter, Debug::Concise, "TapEvent state:%d \n", mImpl->mEventData->mState );
-    EventData::State state( mImpl->mEventData->mState );
-    bool relayoutNeeded( false );   // to avoid unnecessary relayouts when tapping an empty text-field
-
-    if( mImpl->IsClipboardVisible() )
-    {
-      if( EventData::INACTIVE == state || EventData::EDITING == state)
-      {
-        mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE );
-      }
-      relayoutNeeded = true;
-    }
-    else if( 1u == tapCount )
-    {
-      if( EventData::EDITING_WITH_POPUP == state || EventData::EDITING_WITH_PASTE_POPUP == state )
-      {
-        mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE );  // If Popup shown hide it here so can be shown again if required.
-      }
-
-      if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != state ) )
-      {
-        mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE );
-        relayoutNeeded = true;
-      }
-      else
-      {
-        if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() )
-        {
-          // Hide placeholder text
-          ResetText();
-        }
-
-        if( EventData::INACTIVE == state )
-        {
-          mImpl->ChangeState( EventData::EDITING );
-        }
-        else if( !mImpl->IsClipboardEmpty() )
-        {
-          mImpl->ChangeState( EventData::EDITING_WITH_POPUP );
-        }
-        relayoutNeeded = true;
-      }
-    }
-    else if( 2u == tapCount )
-    {
-      if( mImpl->mEventData->mSelectionEnabled &&
-          mImpl->IsShowingRealText() )
-      {
-        relayoutNeeded = true;
-        mImpl->mEventData->mIsLeftHandleSelected = true;
-        mImpl->mEventData->mIsRightHandleSelected = true;
-      }
-    }
-
-    // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
-    if( relayoutNeeded )
-    {
-      Event event( Event::TAP_EVENT );
-      event.p1.mUint = tapCount;
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      mImpl->mEventData->mEventQueue.push_back( event );
-
-      mImpl->RequestRelayout();
-    }
-  }
-
-  // Reset keyboard as tap event has occurred.
-  mImpl->ResetInputMethodContext();
-}
-
-void Controller::PanEvent( Gesture::State state, const Vector2& displacement )
-{
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
-
-  if( NULL != mImpl->mEventData )
-  {
-    Event event( Event::PAN_EVENT );
-    event.p1.mInt = state;
-    event.p2.mFloat = displacement.x;
-    event.p3.mFloat = displacement.y;
-    mImpl->mEventData->mEventQueue.push_back( event );
-
-    mImpl->RequestRelayout();
-  }
-}
-
-void Controller::LongPressEvent( Gesture::State state, float x, float y  )
-{
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" );
-
-  if( ( state == Gesture::Started ) &&
-      ( NULL != mImpl->mEventData ) )
-  {
-    // The 1st long-press on inactive text-field is treated as tap
-    if( EventData::INACTIVE == mImpl->mEventData->mState )
-    {
-      mImpl->ChangeState( EventData::EDITING );
-
-      Event event( Event::TAP_EVENT );
-      event.p1.mUint = 1;
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      mImpl->mEventData->mEventQueue.push_back( event );
-
-      mImpl->RequestRelayout();
-    }
-    else if( !mImpl->IsShowingRealText() )
-    {
-      Event event( Event::LONG_PRESS_EVENT );
-      event.p1.mInt = state;
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      mImpl->mEventData->mEventQueue.push_back( event );
-      mImpl->RequestRelayout();
-    }
-    else if( !mImpl->IsClipboardVisible() )
-    {
-      // Reset the InputMethodContext to commit the pre-edit before selecting the text.
-      mImpl->ResetInputMethodContext();
-
-      Event event( Event::LONG_PRESS_EVENT );
-      event.p1.mInt = state;
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      mImpl->mEventData->mEventQueue.push_back( event );
-      mImpl->RequestRelayout();
-
-      mImpl->mEventData->mIsLeftHandleSelected = true;
-      mImpl->mEventData->mIsRightHandleSelected = true;
-    }
-  }
-}
-
-void Controller::SelectEvent( float x, float y, bool selectAll )
-{
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" );
-
-  if( NULL != mImpl->mEventData )
-  {
-    if( selectAll )
-    {
-      Event event( Event::SELECT_ALL );
-      mImpl->mEventData->mEventQueue.push_back( event );
-    }
-    else
-    {
-      Event event( Event::SELECT );
-      event.p2.mFloat = x;
-      event.p3.mFloat = y;
-      mImpl->mEventData->mEventQueue.push_back( event );
-    }
-
-    mImpl->mEventData->mCheckScrollAmount = true;
-    mImpl->mEventData->mIsLeftHandleSelected = true;
-    mImpl->mEventData->mIsRightHandleSelected = true;
-    mImpl->RequestRelayout();
-  }
-}
-
-InputMethodContext::CallbackData Controller::OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent )
-{
-  // Whether the text needs to be relaid-out.
-  bool requestRelayout = false;
-
-  // Whether to retrieve the text and cursor position to be sent to the InputMethodContext.
-  bool retrieveText = false;
-  bool retrieveCursor = false;
-
-  switch( inputMethodContextEvent.eventName )
-  {
-    case InputMethodContext::COMMIT:
-    {
-      InsertText( inputMethodContextEvent.predictiveString, Text::Controller::COMMIT );
-      requestRelayout = true;
-      retrieveCursor = true;
-      break;
-    }
-    case InputMethodContext::PRE_EDIT:
-    {
-      InsertText( inputMethodContextEvent.predictiveString, Text::Controller::PRE_EDIT );
-      requestRelayout = true;
-      retrieveCursor = true;
-      break;
-    }
-    case InputMethodContext::DELETE_SURROUNDING:
-    {
-      const bool textDeleted = RemoveText( inputMethodContextEvent.cursorOffset,
-                                           inputMethodContextEvent.numberOfChars,
-                                           DONT_UPDATE_INPUT_STYLE );
-
-      if( textDeleted )
-      {
-        if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) ||
-            !mImpl->IsPlaceholderAvailable() )
-        {
-          mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
-        }
-        else
-        {
-          ShowPlaceholderText();
-        }
-        mImpl->mEventData->mUpdateCursorPosition = true;
-        mImpl->mEventData->mScrollAfterDelete = true;
-
-        requestRelayout = true;
-      }
-      break;
-    }
-    case InputMethodContext::GET_SURROUNDING:
-    {
-      retrieveText = true;
-      retrieveCursor = true;
-      break;
-    }
-    case InputMethodContext::PRIVATE_COMMAND:
-    {
-      // PRIVATECOMMAND event is just for getting the private command message
-      retrieveText = true;
-      retrieveCursor = true;
-      break;
-    }
-    case InputMethodContext::VOID:
-    {
-      // do nothing
-      break;
+      // Emit the input style changed signal.
+      mImpl->mEditableControlInterface->InputStyleChanged( mask );
     }
-  } // end switch
-
-  if( requestRelayout )
-  {
-    mImpl->mOperationsPending = ALL_OPERATIONS;
-    mImpl->RequestRelayout();
   }
 
-  std::string text;
-  CharacterIndex cursorPosition = 0u;
-  Length numberOfWhiteSpaces = 0u;
+  mImpl->mEventData->mInputStyleChangedQueue.Clear();
+}
 
-  if( retrieveCursor )
-  {
-    numberOfWhiteSpaces = mImpl->GetNumberOfWhiteSpaces( 0u );
+// public : Text-input Event Queuing.
 
-    cursorPosition = mImpl->GetLogicalCursorPosition();
+void Controller::KeyboardFocusGainEvent()
+{
+  EventHandler::KeyboardFocusGainEvent(*this);
+}
 
-    if( cursorPosition < numberOfWhiteSpaces )
-    {
-      cursorPosition = 0u;
-    }
-    else
-    {
-      cursorPosition -= numberOfWhiteSpaces;
-    }
-  }
+void Controller::KeyboardFocusLostEvent()
+{
+  EventHandler::KeyboardFocusLostEvent(*this);
+}
 
-  if( retrieveText )
-  {
-    if( !mImpl->IsShowingPlaceholderText() )
-    {
-      // Retrieves the normal text string.
-      mImpl->GetText( numberOfWhiteSpaces, text );
-    }
-    else
-    {
-      // When the current text is Placeholder Text, the surrounding text should be empty string.
-      // It means DALi should send empty string ("") to IME.
-      text = "";
-    }
-  }
+bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
+{
+  return EventHandler::KeyEvent(*this, keyEvent);
+}
+
+void Controller::TapEvent( unsigned int tapCount, float x, float y )
+{
+  EventHandler::TapEvent(*this, tapCount, x, y);
+}
+
+void Controller::PanEvent( GestureState state, const Vector2& displacement )
+{
+  EventHandler::PanEvent(*this, state, displacement);
+}
 
-  InputMethodContext::CallbackData callbackData( ( retrieveText || retrieveCursor ), cursorPosition, text, false );
+void Controller::LongPressEvent( GestureState state, float x, float y )
+{
+  EventHandler::LongPressEvent(*this, state, x, y);
+}
+
+void Controller::SelectEvent( float x, float y, SelectionType selectType )
+{
+  EventHandler::SelectEvent(*this, x, y, selectType);
+}
 
-  if( requestRelayout &&
-      ( NULL != mImpl->mEditableControlInterface ) )
+void Controller::SetTextSelectionRange(const uint32_t *start, const uint32_t *end)
+{
+  if( mImpl->mEventData )
   {
-    // Do this last since it provides callbacks into application code
-    mImpl->mEditableControlInterface->TextChanged();
+    mImpl->mEventData->mCheckScrollAmount = true;
+    mImpl->mEventData->mIsLeftHandleSelected = true;
+    mImpl->mEventData->mIsRightHandleSelected = true;
+    mImpl->SetTextSelectionRange(start, end);
+    mImpl->RequestRelayout();
+    KeyboardFocusGainEvent();
   }
+}
 
-  return callbackData;
+Uint32Pair Controller::GetTextSelectionRange() const
+{
+  return mImpl->GetTextSelectionRange();
 }
 
-void Controller::PasteClipboardItemEvent()
+void Controller::SelectWholeText()
 {
-  // Retrieve the clipboard contents first
-  ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() );
-  std::string stringToPaste( notifier.GetContent() );
+  SelectEvent( 0.f, 0.f, SelectionType::ALL );
+}
 
-  // Commit the current pre-edit text; the contents of the clipboard should be appended
-  mImpl->ResetInputMethodContext();
+void Controller::SelectNone()
+{
+  SelectEvent( 0.f, 0.f, SelectionType::NONE );
+}
 
-  // Temporary disable hiding clipboard
-  mImpl->SetClipboardHideEnable( false );
+string Controller::GetSelectedText() const
+{
+  string text;
+  if( EventData::SELECTING == mImpl->mEventData->mState )
+  {
+    mImpl->RetrieveSelection( text, false );
+  }
+  return text;
+}
 
-  // Paste
-  PasteText( stringToPaste );
+InputMethodContext::CallbackData Controller::OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent )
+{
+  return EventHandler::OnInputMethodContextEvent(*this, inputMethodContext, inputMethodContextEvent);
+}
 
-  mImpl->SetClipboardHideEnable( true );
+void Controller::PasteClipboardItemEvent()
+{
+  EventHandler::PasteClipboardItemEvent(*this);
 }
 
 // protected : Inherit from Text::Decorator::ControllerInterface.
@@ -3010,139 +2225,30 @@ void Controller::AddDecoration( Actor& actor, bool needsClipping )
   }
 }
 
-void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y )
+bool Controller::IsEditable() const
 {
-  DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" );
+  return mImpl->IsEditable();
+}
 
-  if( NULL != mImpl->mEventData )
+void Controller::SetEditable( bool editable )
+{
+  mImpl->SetEditable( editable );
+  if(mImpl->mEventData && mImpl->mEventData->mDecorator)
   {
-    switch( handleType )
-    {
-      case GRAB_HANDLE:
-      {
-        Event event( Event::GRAB_HANDLE_EVENT );
-        event.p1.mUint  = state;
-        event.p2.mFloat = x;
-        event.p3.mFloat = y;
-
-        mImpl->mEventData->mEventQueue.push_back( event );
-        break;
-      }
-      case LEFT_SELECTION_HANDLE:
-      {
-        Event event( Event::LEFT_SELECTION_HANDLE_EVENT );
-        event.p1.mUint  = state;
-        event.p2.mFloat = x;
-        event.p3.mFloat = y;
-
-        mImpl->mEventData->mEventQueue.push_back( event );
-        break;
-      }
-      case RIGHT_SELECTION_HANDLE:
-      {
-        Event event( Event::RIGHT_SELECTION_HANDLE_EVENT );
-        event.p1.mUint  = state;
-        event.p2.mFloat = x;
-        event.p3.mFloat = y;
-
-        mImpl->mEventData->mEventQueue.push_back( event );
-        break;
-      }
-      case LEFT_SELECTION_HANDLE_MARKER:
-      case RIGHT_SELECTION_HANDLE_MARKER:
-      {
-        // Markers do not move the handles.
-        break;
-      }
-      case HANDLE_TYPE_COUNT:
-      {
-        DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" );
-      }
-    }
-
-    mImpl->RequestRelayout();
+    mImpl->mEventData->mDecorator->SetEditable( editable );
   }
 }
 
+void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y )
+{
+  EventHandler::DecorationEvent(*this, handleType, state, x, y);
+}
+
 // protected : Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
 
 void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button )
 {
-  if( NULL == mImpl->mEventData )
-  {
-    return;
-  }
-
-  switch( button )
-  {
-    case Toolkit::TextSelectionPopup::CUT:
-    {
-      mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text
-      mImpl->mOperationsPending = ALL_OPERATIONS;
-
-      if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) ||
-          !mImpl->IsPlaceholderAvailable() )
-      {
-        mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
-      }
-      else
-      {
-        ShowPlaceholderText();
-      }
-
-      mImpl->mEventData->mUpdateCursorPosition = true;
-      mImpl->mEventData->mScrollAfterDelete = true;
-
-      mImpl->RequestRelayout();
-
-      if( NULL != mImpl->mEditableControlInterface )
-      {
-        mImpl->mEditableControlInterface->TextChanged();
-      }
-      break;
-    }
-    case Toolkit::TextSelectionPopup::COPY:
-    {
-      mImpl->SendSelectionToClipboard( false ); // Text not modified
-
-      mImpl->mEventData->mUpdateCursorPosition = true;
-
-      mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup
-      break;
-    }
-    case Toolkit::TextSelectionPopup::PASTE:
-    {
-      mImpl->RequestGetTextFromClipboard(); // Request clipboard service to retrieve an item
-      break;
-    }
-    case Toolkit::TextSelectionPopup::SELECT:
-    {
-      const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
-
-      if( mImpl->mEventData->mSelectionEnabled )
-      {
-        // Creates a SELECT event.
-        SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false );
-      }
-      break;
-    }
-    case Toolkit::TextSelectionPopup::SELECT_ALL:
-    {
-      // Creates a SELECT_ALL event
-      SelectEvent( 0.f, 0.f, true );
-      break;
-    }
-    case Toolkit::TextSelectionPopup::CLIPBOARD:
-    {
-      mImpl->ShowClipboard();
-      break;
-    }
-    case Toolkit::TextSelectionPopup::NONE:
-    {
-      // Nothing to do.
-      break;
-    }
-  }
+  EventHandler::TextPopupButtonTouched(*this, button);
 }
 
 void Controller::DisplayTimeExpired()
@@ -3498,6 +2604,14 @@ bool Controller::RemoveText( int cursorOffset,
         }
       }
 
+      // If the number of current text and the number of characters to be deleted are same,
+      // it means all texts should be removed and all Preedit variables should be initialized.
+      if( ( currentText.Count() - numberOfCharacters == 0 ) && ( cursorIndex == 0 ) )
+      {
+        mImpl->ClearPreEditFlag();
+        mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0;
+      }
+
       // Updates the text style runs by removing characters. Runs with no characters are removed.
       mImpl->mModel->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfCharacters );
 
@@ -3512,6 +2626,11 @@ bool Controller::RemoveText( int cursorOffset,
 
       mImpl->mEventData->mScrollAfterDelete = true;
 
+      if( EventData::INACTIVE == mImpl->mEventData->mState )
+      {
+        mImpl->ChangeState( EventData::EDITING );
+      }
+
       DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters );
       removed = true;
     }
@@ -3577,7 +2696,7 @@ bool Controller::DoRelayout( const Size& size,
     // Make sure the index is not out of bound
     if ( charactersToGlyph.Count() != glyphsPerCharacter.Count() ||
          requestedNumberOfCharacters > charactersToGlyph.Count() ||
-         ( lastIndex >= charactersToGlyph.Count() && charactersToGlyph.Count() > 0u ) )
+         ( lastIndex > charactersToGlyph.Count() && charactersToGlyph.Count() > 0u ) )
     {
       std::string currentText;
       GetText( currentText );
@@ -3604,38 +2723,16 @@ bool Controller::DoRelayout( const Size& size,
       return true;
     }
 
-    const Vector<LineBreakInfo>& lineBreakInfo = mImpl->mModel->mLogicalModel->mLineBreakInfo;
-    const Vector<WordBreakInfo>& wordBreakInfo = mImpl->mModel->mLogicalModel->mWordBreakInfo;
-    const Vector<CharacterDirection>& characterDirection = mImpl->mModel->mLogicalModel->mCharacterDirections;
-    const Vector<GlyphInfo>& glyphs = mImpl->mModel->mVisualModel->mGlyphs;
-    const Vector<CharacterIndex>& glyphsToCharactersMap = mImpl->mModel->mVisualModel->mGlyphsToCharacters;
-    const Vector<Length>& charactersPerGlyph = mImpl->mModel->mVisualModel->mCharactersPerGlyph;
-    const Character* const textBuffer = mImpl->mModel->mLogicalModel->mText.Begin();
-    const float outlineWidth = static_cast<float>( mImpl->mModel->GetOutlineWidth() );
-
     // Set the layout parameters.
     Layout::Parameters layoutParameters( size,
-                                         textBuffer,
-                                         lineBreakInfo.Begin(),
-                                         wordBreakInfo.Begin(),
-                                         ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL,
-                                         glyphs.Begin(),
-                                         glyphsToCharactersMap.Begin(),
-                                         charactersPerGlyph.Begin(),
-                                         charactersToGlyphBuffer,
-                                         glyphsPerCharacterBuffer,
-                                         totalNumberOfGlyphs,
-                                         mImpl->mModel->mHorizontalAlignment,
-                                         mImpl->mModel->mLineWrapMode,
-                                         outlineWidth,
-                                         mImpl->mModel->mIgnoreSpacesAfterText,
-                                         mImpl->mModel->mMatchSystemLanguageDirection );
+                                         mImpl->mModel);
 
     // Resize the vector of positions to have the same size than the vector of glyphs.
     Vector<Vector2>& glyphPositions = mImpl->mModel->mVisualModel->mGlyphPositions;
     glyphPositions.Resize( totalNumberOfGlyphs );
 
     // Whether the last character is a new paragraph character.
+    const Character* const textBuffer = mImpl->mModel->mLogicalModel->mText.Begin();
     mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph =  TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mModel->mLogicalModel->mText.Count() - 1u ) ) );
     layoutParameters.isLastNewParagraph = mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph;
 
@@ -3671,8 +2768,6 @@ bool Controller::DoRelayout( const Size& size,
     bool isAutoScrollEnabled = mImpl->mIsAutoScrollEnabled;
     Size newLayoutSize;
     viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters,
-                                                   glyphPositions,
-                                                   mImpl->mModel->mVisualModel->mLines,
                                                    newLayoutSize,
                                                    elideTextEnabled,
                                                    isAutoScrollEnabled );
@@ -3689,46 +2784,10 @@ bool Controller::DoRelayout( const Size& size,
         mImpl->mIsTextDirectionRTL = false;
       }
 
-      // Reorder the lines
-      if( NO_OPERATION != ( REORDER & operations ) )
+      if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && !mImpl->mModel->mVisualModel->mLines.Empty() )
       {
-        Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = mImpl->mModel->mLogicalModel->mBidirectionalParagraphInfo;
-        Vector<BidirectionalLineInfoRun>& bidirectionalLineInfo = mImpl->mModel->mLogicalModel->mBidirectionalLineInfo;
-
-        // Check first if there are paragraphs with bidirectional info.
-        if( 0u != bidirectionalInfo.Count() )
-        {
-          // Get the lines
-          const Length numberOfLines = mImpl->mModel->mVisualModel->mLines.Count();
-
-          // Reorder the lines.
-          bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters.
-          ReorderLines( bidirectionalInfo,
-                        startIndex,
-                        requestedNumberOfCharacters,
-                        mImpl->mModel->mVisualModel->mLines,
-                        bidirectionalLineInfo );
-
-          // Set the bidirectional info per line into the layout parameters.
-          layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin();
-          layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count();
-
-          // Re-layout the text. Reorder those lines with right to left characters.
-          mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters,
-                                                         startIndex,
-                                                         requestedNumberOfCharacters,
-                                                         glyphPositions );
-
-          if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) )
-          {
-            const LineRun* const firstline = mImpl->mModel->mVisualModel->mLines.Begin();
-            if ( firstline )
-            {
-              mImpl->mIsTextDirectionRTL = firstline->direction;
-            }
-          }
-        }
-      } // REORDER
+        mImpl->mIsTextDirectionRTL = mImpl->mModel->mVisualModel->mLines[0u].direction;
+      }
 
       // Sets the layout size.
       if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) )
@@ -3743,11 +2802,23 @@ bool Controller::DoRelayout( const Size& size,
     // The laid-out lines.
     Vector<LineRun>& lines = mImpl->mModel->mVisualModel->mLines;
 
+    CharacterIndex alignStartIndex = startIndex;
+    Length alignRequestedNumberOfCharacters = requestedNumberOfCharacters;
+
+    // the whole text needs to be full aligned.
+    // If you do not do a full aligned, only the last line of the multiline input is aligned.
+    if(  mImpl->mEventData && mImpl->mEventData->mUpdateAlignment )
+    {
+      alignStartIndex = 0u;
+      alignRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count();
+      mImpl->mEventData->mUpdateAlignment = false;
+    }
+
     // Need to align with the control's size as the text may contain lines
     // starting either with left to right text or right to left.
     mImpl->mLayoutEngine.Align( size,
-                                startIndex,
-                                requestedNumberOfCharacters,
+                                alignStartIndex,
+                                alignRequestedNumberOfCharacters,
                                 mImpl->mModel->mHorizontalAlignment,
                                 lines,
                                 mImpl->mModel->mAlignmentOffset,
@@ -3799,159 +2870,27 @@ void Controller::CalculateVerticalOffset( const Size& controlSize )
 
 void Controller::ProcessModifyEvents()
 {
-  Vector<ModifyEvent>& events = mImpl->mModifyEvents;
-
-  if( 0u == events.Count() )
-  {
-    // Nothing to do.
-    return;
-  }
-
-  for( Vector<ModifyEvent>::ConstIterator it = events.Begin(),
-         endIt = events.End();
-       it != endIt;
-       ++it )
-  {
-    const ModifyEvent& event = *it;
-
-    if( ModifyEvent::TEXT_REPLACED == event.type )
-    {
-      // A (single) replace event should come first, otherwise we wasted time processing NOOP events
-      DALI_ASSERT_DEBUG( it == events.Begin() && "Unexpected TEXT_REPLACED event" );
-
-      TextReplacedEvent();
-    }
-    else if( ModifyEvent::TEXT_INSERTED == event.type )
-    {
-      TextInsertedEvent();
-    }
-    else if( ModifyEvent::TEXT_DELETED == event.type )
-    {
-      // Placeholder-text cannot be deleted
-      if( !mImpl->IsShowingPlaceholderText() )
-      {
-        TextDeletedEvent();
-      }
-    }
-  }
-
-  if( NULL != mImpl->mEventData )
-  {
-    // When the text is being modified, delay cursor blinking
-    mImpl->mEventData->mDecorator->DelayCursorBlink();
-
-    // Update selection position after modifying the text
-    mImpl->mEventData->mLeftSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition;
-    mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition;
-  }
-
-  // Discard temporary text
-  events.Clear();
+  EventHandler::ProcessModifyEvents(*this);
 }
 
 void Controller::TextReplacedEvent()
 {
-  // The natural size needs to be re-calculated.
-  mImpl->mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  mImpl->mUpdateTextDirection = true;
-
-  // Apply modifications to the model
-  mImpl->mOperationsPending = ALL_OPERATIONS;
+  EventHandler::TextReplacedEvent(*this);
 }
 
 void Controller::TextInsertedEvent()
 {
-  DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" );
-
-  if( NULL == mImpl->mEventData )
-  {
-    return;
-  }
-
-  mImpl->mEventData->mCheckScrollAmount = true;
-
-  // The natural size needs to be re-calculated.
-  mImpl->mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  mImpl->mUpdateTextDirection = true;
-
-  // Apply modifications to the model; TODO - Optimize this
-  mImpl->mOperationsPending = ALL_OPERATIONS;
+  EventHandler::TextInsertedEvent(*this);
 }
 
 void Controller::TextDeletedEvent()
 {
-  DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" );
-
-  if( NULL == mImpl->mEventData )
-  {
-    return;
-  }
-
-  mImpl->mEventData->mCheckScrollAmount = true;
-
-  // The natural size needs to be re-calculated.
-  mImpl->mRecalculateNaturalSize = true;
-
-  // The text direction needs to be updated.
-  mImpl->mUpdateTextDirection = true;
-
-  // Apply modifications to the model; TODO - Optimize this
-  mImpl->mOperationsPending = ALL_OPERATIONS;
+  EventHandler::TextDeletedEvent(*this);
 }
 
 bool Controller::DeleteEvent( int keyCode )
 {
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p KeyCode : %d \n", this, keyCode );
-
-  bool removed = false;
-
-  if( NULL == mImpl->mEventData )
-  {
-    return removed;
-  }
-
-  // InputMethodContext is no longer handling key-events
-  mImpl->ClearPreEditFlag();
-
-  if( EventData::SELECTING == mImpl->mEventData->mState )
-  {
-    removed = RemoveSelectedText();
-  }
-  else if( ( mImpl->mEventData->mPrimaryCursorPosition > 0 ) && ( keyCode == Dali::DALI_KEY_BACKSPACE) )
-  {
-    // Remove the character before the current cursor position
-    removed = RemoveText( -1,
-                          1,
-                          UPDATE_INPUT_STYLE );
-  }
-  else if( keyCode == Dali::DevelKey::DALI_KEY_DELETE )
-  {
-    // Remove the character after the current cursor position
-    removed = RemoveText( 0,
-                          1,
-                          UPDATE_INPUT_STYLE );
-  }
-
-  if( removed )
-  {
-    if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) ||
-        !mImpl->IsPlaceholderAvailable() )
-    {
-      mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
-    }
-    else
-    {
-      ShowPlaceholderText();
-    }
-    mImpl->mEventData->mUpdateCursorPosition = true;
-    mImpl->mEventData->mScrollAfterDelete = true;
-  }
-
-  return removed;
+  return EventHandler::DeleteEvent(*this, keyCode);
 }
 
 // private : Helpers.
@@ -4125,24 +3064,28 @@ bool Controller::ShouldClearFocusOnEscape() const
   return mImpl->mShouldClearFocusOnEscape;
 }
 
+Actor Controller::CreateBackgroundActor()
+{
+  return mImpl->CreateBackgroundActor();
+}
+
 // private : Private contructors & copy operator.
 
 Controller::Controller()
-: mImpl( NULL )
+: Controller(nullptr, nullptr, nullptr)
 {
-  mImpl = new Controller::Impl( NULL, NULL );
 }
 
 Controller::Controller( ControlInterface* controlInterface )
+:Controller( controlInterface, nullptr, nullptr)
 {
-  mImpl = new Controller::Impl( controlInterface, NULL );
 }
 
 Controller::Controller( ControlInterface* controlInterface,
-                        EditableControlInterface* editableControlInterface )
+                        EditableControlInterface* editableControlInterface,
+                        SelectableControlInterface* selectableControlInterface )
+: mImpl(new Controller::Impl(controlInterface, editableControlInterface, selectableControlInterface))
 {
-  mImpl = new Controller::Impl( controlInterface,
-                                editableControlInterface );
 }
 
 // The copy constructor and operator are left unimplemented.