Reposition the text's popup when the text is scrolled.
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / decorator / text-decorator.cpp
index 4df7c51..58ccff6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/actor.h>
-#include <dali/public-api/adaptor-framework/timer.h>
-#include <dali/public-api/actors/image-actor.h>
+#include <dali/integration-api/debug.h>
 #include <dali/public-api/actors/layer.h>
-#include <dali/public-api/common/constants.h>
-#include <dali/public-api/events/tap-gesture.h>
-#include <dali/public-api/events/tap-gesture-detector.h>
+#include <dali/public-api/adaptor-framework/timer.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/touch-data.h>
 #include <dali/public-api/events/pan-gesture.h>
-#include <dali/public-api/events/pan-gesture-detector.h>
 #include <dali/public-api/images/resource-image.h>
-#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/math/vector4.h>
-#include <dali/public-api/images/nine-patch-image.h>
-#include <dali/public-api/signals/connection-tracker.h>
-#include <libintl.h>
+#include <dali/public-api/object/property-notification.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/renderer.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/public-api/controls/buttons/push-button.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
 
 #ifdef DEBUG_ENABLED
 #define DECORATOR_DEBUG
+
+#endif
+
+#define MAKE_SHADER(A)#A
+
+namespace
+{
+const char* VERTEX_SHADER = MAKE_SHADER(
+attribute mediump vec2    aPosition;
+uniform   mediump mat4    uMvpMatrix;
+
+void main()
+{
+  mediump vec4 position = vec4( aPosition, 0.0, 1.0 );
+  gl_Position = uMvpMatrix * position;
+}
+);
+
+const char* FRAGMENT_SHADER = MAKE_SHADER(
+uniform      lowp vec4 uColor;
+
+void main()
+{
+  gl_FragColor = uColor;
+}
+);
+}
+
+namespace Dali
+{
+namespace Internal
+{
+namespace
+{
+#ifdef DECORATOR_DEBUG
+Integration::Log::Filter* gLogFilter( Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_TEXT_DECORATOR") );
 #endif
+}
+}
+}
 
-// todo Move this to adaptor??
-#define GET_LOCALE_TEXT(string) dgettext("elementary", string)
 
 // Local Data
 namespace
 {
+const Dali::Vector3 DEFAULT_GRAB_HANDLE_RELATIVE_SIZE( 1.25f, 1.5f, 1.0f );
+const Dali::Vector3 DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE( 1.25f, 1.5f, 1.0f );
+const Dali::Vector3 ACTIVE_LAYER_ANCHOR_POINT( 0.5f, 0.5f, 0.5f );
 
-const char* DEFAULT_GRAB_HANDLE_IMAGE( DALI_IMAGE_DIR "insertpoint-icon.png" );
-const char* DEFAULT_SELECTION_HANDLE_ONE( DALI_IMAGE_DIR "text-input-selection-handle-left.png" );
-const char* DEFAULT_SELECTION_HANDLE_TWO( DALI_IMAGE_DIR "text-input-selection-handle-right.png" );
-//const char* DEFAULT_SELECTION_HANDLE_ONE_PRESSED( DALI_IMAGE_DIR "text-input-selection-handle-left-press.png" );
-//const char* DEFAULT_SELECTION_HANDLE_TWO_PRESSED( DALI_IMAGE_DIR "text-input-selection-handle-right-press.png" );
-const char* DEFAULT_CURSOR_IMAGE( DALI_IMAGE_DIR "decorator-cursor.png");
-
-const Dali::Vector3 DEFAULT_GRAB_HANDLE_RELATIVE_SIZE( 1.5f, 2.0f, 1.0f );
-const Dali::Vector3 DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE( 1.5f, 1.5f, 1.0f );
-
-const std::size_t CURSOR_BLINK_INTERVAL = 500; // Cursor blink interval
-const std::size_t MILLISECONDS = 1000;
-
-const std::string POPUP_BACKGROUND( DALI_IMAGE_DIR "popup_bubble_bg.#.png" );
-const std::string POPUP_BACKGROUND_EFFECT( DALI_IMAGE_DIR "popup_bubble_bg_ef.#.png" );
-const std::string POPUP_BACKGROUND_LINE( DALI_IMAGE_DIR "popup_bubble_bg_line.#.png" );
-
-const Dali::Vector4 DEFAULT_POPUP_BACKGROUND( Dali::Vector4( .20f, 0.29f, 0.44f, 1.0f ) );
-const Dali::Vector4 DEFAULT_POPUP_BACKGROUND_PRESSED( Dali::Vector4( 0.07f, 0.10f, 0.17f, 1.0f ) );
-const Dali::Vector4 DEFAULT_POPUP_LINE_COLOR( Dali::Vector4( 0.36f, 0.45f, 0.59f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_ICON( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_ICON_PRESSED( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_TEXT( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-const Dali::Vector4 DEFAULT_OPTION_TEXT_PRESSED( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-
-const std::string OPTION_ICON_CLIPBOARD( DALI_IMAGE_DIR "copy_paste_icon_clipboard.png" );
-const std::string OPTION_ICON_COPY( DALI_IMAGE_DIR "copy_paste_icon_copy.png" );
-const std::string OPTION_ICON_CUT( DALI_IMAGE_DIR "copy_paste_icon_cut.png" );
-const std::string OPTION_ICON_PASTE( DALI_IMAGE_DIR "copy_paste_icon_paste.png" );
-const std::string OPTION_ICON_SELECT( DALI_IMAGE_DIR "copy_paste_icon_select.png" );
-const std::string OPTION_ICON_SELECT_ALL( DALI_IMAGE_DIR "copy_paste_icon_select_all.png" );
-
-const Dali::Vector2 DEFAULT_POPUP_MAX_SIZE( 470.0f, 120.0f ); ///< The maximum size of the popup.
-
-const float OPTION_TEXT_LINE_HEIGHT( 32.0f );     ///< The line height of the text.
-const Dali::Vector2 OPTION_ICON_SIZE( 0.f, 0.f );       ///< The size of the icon.
-const float OPTION_GAP_ICON_TEXT( 6.f );          ///< The gap between the icon and the text
-const float OPTION_MARGIN_WIDTH( 10.f );          ///< The margin between the right or lefts edge and the text or icon.
-const float OPTION_MAX_WIDTH( DEFAULT_POPUP_MAX_SIZE.width / 6 ); ///< The maximum width of the option (currently set to the max)
-const float OPTION_MIN_WIDTH( 86.0f );           ///< The minimum width of the option.
-
-const float POPUP_DIVIDER_WIDTH( 1.f );        ///< The size of the divider.
-
-const Dali::Vector2 POPUP_TAIL_SIZE( 20.0f, 16.0f ); ///< The size of the tail.
-const float POPUP_TAIL_Y_OFFSET( 5.f );        ///< The y offset of the tail (when its position is on the bottom).
-const float POPUP_TAIL_TOP_Y_OFFSET( 3.f );    ///< The y offset of the tail (when its position is on the top).
-
-const float HIDE_POPUP_ANIMATION_DURATION( 0.2f ); ///< Duration of popup hide animation in seconds.
-const float SHOW_POPUP_ANIMATION_DURATION( 0.2f ); ///< Duration of popup show animation in seconds.
-
-const char* const OPTION_SELECT_WORD = "option-select_word";                       // "Select Word" popup option.
-const char* const OPTION_SELECT_ALL("option-select_all");                          // "Select All" popup option.
-const char* const OPTION_CUT("option-cut");                                        // "Cut" popup option.
-const char* const OPTION_COPY("option-copy");                                      // "Copy" popup option.
-const char* const OPTION_PASTE("option-paste");                                    // "Paste" popup option.
-const char* const OPTION_CLIPBOARD("option-clipboard");                            // "Clipboard" popup option.
-
-enum Buttons
-{
-  ButtonsCut,
-  ButtonsCopy,
-  ButtonsPaste,
-  ButtonsSelect,
-  ButtonsSelectAll,
-  ButtonsClipboard,
-  ButtonsEnumEnd
-};
+const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color. TODO: due some problems, maybe with the blending function in the text clipping, the color is fully opaque.
+
+const Dali::Vector4 HANDLE_COLOR( 0.0f, (183.0f / 255.0f), (229.0f / 255.0f), 1.0f  );
+
+const unsigned int CURSOR_BLINK_INTERVAL = 500u; ///< Cursor blink interval in milliseconds.
+const float TO_MILLISECONDS = 1000.f;            ///< Converts from seconds to milliseconds.
+const float TO_SECONDS = 1.f / TO_MILLISECONDS;  ///< Converts from milliseconds to seconds.
+
+const unsigned int SCROLL_TICK_INTERVAL = 50u; ///< Scroll interval in milliseconds.
+const float SCROLL_THRESHOLD = 10.f;           ///< Threshold in pixels close to the edges of the decorator boundaries from where the scroll timer starts to emit signals.
+const float SCROLL_SPEED = 300.f;              ///< The scroll speed in pixels/second.
 
-struct ButtonRequirement
-{
-  ButtonRequirement()
-  : id( ButtonsEnumEnd ),
-    priority( 0u ),
-    name(),
-    caption(),
-    icon(),
-    enabled( false )
-  {}
-
-  ButtonRequirement( Buttons buttonId,
-                     std::size_t buttonPriority,
-                     const std::string& buttonName,
-                     const std::string& buttonCaption,
-                     Dali::ResourceImage buttonIcon,
-                     bool buttonEnabled )
-  : id( buttonId ),
-    priority( buttonPriority ),
-    name( buttonName ),
-    caption( buttonCaption ),
-    icon( buttonIcon ),
-    enabled( buttonEnabled )
-  {}
-
-  Buttons id;
-  std::size_t priority;
-  std::string name;
-  std::string caption;
-  Dali::ResourceImage icon;
-  bool enabled;
+const float SCROLL_DISTANCE = SCROLL_SPEED * SCROLL_TICK_INTERVAL * TO_SECONDS; ///< Distance in pixels scrolled in one second.
+
+const float CURSOR_WIDTH = 1.f; ///< The cursor's width in pixels.
+
+const float POPUP_PADDING = 2.f; ///< Padding space between the highlight box and the text's popup.
+
+/**
+ * structure to hold coordinates of each quad, which will make up the mesh.
+ */
+struct QuadCoordinates
+{
+  /**
+   * Default constructor
+   */
+  QuadCoordinates()
+  {
+  }
+
+  /**
+   * Constructor
+   * @param[in] x1 left co-ordinate
+   * @param[in] y1 top co-ordinate
+   * @param[in] x2 right co-ordinate
+   * @param[in] y2 bottom co-ordinate
+   */
+  QuadCoordinates(float x1, float y1, float x2, float y2)
+  : min(x1, y1),
+    max(x2, y2)
+  {
+  }
+
+  Dali::Vector2 min;                          ///< top-left (minimum) position of quad
+  Dali::Vector2 max;                          ///< bottom-right (maximum) position of quad
 };
 
-// Comparison function for ButtonRequirement Priority
-bool PriorityCompare( ButtonRequirement const& a, ButtonRequirement const& b)
+typedef std::vector<QuadCoordinates> QuadContainer;
+
+/**
+ * @brief Takes a bounding rectangle in the local coordinates of an actor and returns the world coordinates Bounding Box.
+ * @param[in] boundingRectangle local bounding
+ * @param[out] Vector4 World coordinate bounding Box.
+ */
+void LocalToWorldCoordinatesBoundingBox( const Dali::Rect<int>& boundingRectangle, Dali::Vector4& boundingBox )
+{
+  // Convert to world coordinates and store as a Vector4 to be compatible with Property Notifications.
+  Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
+
+  const float originX = boundingRectangle.x - 0.5f * stageSize.width;
+  const float originY = boundingRectangle.y - 0.5f * stageSize.height;
+
+  boundingBox = Dali::Vector4( originX,
+                               originY,
+                               originX + boundingRectangle.width,
+                               originY + boundingRectangle.height );
+}
+
+void WorldToLocalCoordinatesBoundingBox( const Dali::Vector4& boundingBox, Dali::Rect<int>& boundingRectangle )
 {
-  return a.priority < b.priority;
+  // Convert to local coordinates and store as a Dali::Rect.
+  Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
+
+  boundingRectangle.x = boundingBox.x + 0.5f * stageSize.width;
+  boundingRectangle.y = boundingBox.y + 0.5f * stageSize.height;
+  boundingRectangle.width = boundingBox.z - boundingBox.x;
+  boundingRectangle.height = boundingBox.w - boundingBox.y;
 }
 
 } // end of namespace
@@ -173,190 +178,513 @@ namespace Text
 
 struct Decorator::Impl : public ConnectionTracker
 {
+  enum ScrollDirection
+  {
+    SCROLL_NONE,
+    SCROLL_RIGHT,
+    SCROLL_LEFT,
+    SCROLL_TOP,
+    SCROLL_BOTTOM
+  };
+
   struct CursorImpl
   {
     CursorImpl()
-    : x(0.0f),
-      y(0.0f),
-      height(0.0f),
-      color(Dali::Color::WHITE)
+    : color( Dali::Color::BLACK ),
+      position(),
+      cursorHeight( 0.0f ),
+      lineHeight( 0.0f )
     {
     }
 
-    float x;
-    float y;
-    float height;
-
     Vector4 color;
+    Vector2 position;
+    float cursorHeight;
+    float lineHeight;
   };
 
-  struct SelectionHandleImpl
+  struct HandleImpl
   {
-    SelectionHandleImpl()
-    : x(0.0f),
-      y(0.0f),
-      cursorHeight(0.0f),
-      flipped(false)
+    HandleImpl()
+    : position(),
+      globalPosition(),
+      size(),
+      lineHeight( 0.0f ),
+      grabDisplacementX( 0.f ),
+      grabDisplacementY( 0.f ),
+      active( false ),
+      horizontallyVisible( false ),
+      verticallyVisible( false ),
+      pressed( false ),
+      verticallyFlippedPreferred( false ),
+      horizontallyFlipped( false ),
+      verticallyFlipped( false ),
+      verticallyFlippedOnTouch( false )
     {
     }
 
-    float x;
-    float y;
-    float cursorHeight; ///< Not the handle height
-    bool flipped;
-
-    ImageActor actor;
+    ImageView actor;
     Actor grabArea;
-
-    Image pressedImage;
-    Image releasedImage;
+    ImageView markerActor;
+
+    Vector2 position;
+    Vector2 globalPosition;
+    Size    size;
+    float   lineHeight;              ///< Not the handle height
+    float   grabDisplacementX;
+    float   grabDisplacementY;
+    bool    active                     : 1;
+    bool    horizontallyVisible        : 1;
+    bool    verticallyVisible          : 1;
+    bool    pressed                    : 1;
+    bool    verticallyFlippedPreferred : 1; ///< Whether the handle is preferred to be vertically flipped.
+    bool    horizontallyFlipped        : 1; ///< Whether the handle has been horizontally flipped.
+    bool    verticallyFlipped          : 1; ///< Whether the handle has been vertically flipped.
+    bool    verticallyFlippedOnTouch   : 1; ///< Whether the handle is vertically flipped on touch.
   };
 
   struct PopupImpl
   {
     PopupImpl()
-    : mVisiblePopUpSize( Vector2( 100.0f, 100.0f ) ),
-      mRequiredPopUpSize( Vector2( 100.0f, 100.0f ) ),
-      mMaxWidth( DEFAULT_POPUP_MAX_SIZE.width ),
-      mBackgroundColor( DEFAULT_POPUP_BACKGROUND ),
-      mBackgroundPressedColor( DEFAULT_POPUP_BACKGROUND_PRESSED ),
-      mLineColor( DEFAULT_POPUP_LINE_COLOR ),
-      mIconColor( DEFAULT_OPTION_ICON ),
-      mIconPressedColor( DEFAULT_OPTION_ICON_PRESSED ),
-      mTextColor( DEFAULT_OPTION_TEXT ),
-      mTextPressedColor( DEFAULT_OPTION_TEXT_PRESSED )
-      {
-      }
+    : position()
+    {
+    }
 
-      Actor mRoot;                                        // The actor which all popup content is added to (i.e. panel and buttons)
-      Actor mButtons;                                     // Actor which holds all the buttons, sensitivity can be set oActor buttons via this actor
-      Layer mStencilLayer;                                // Layer to enable clipping when buttons exceed popup
-      ImageActor mBackground;                             // The background popup panel
-      ImageActor mTail;                                   // The tail for the popup
-      ImageActor mTailEffect;                             // the tail effect
-      ImageActor mTailLine;                               // The border/outline around the tail
-
-      Size mVisiblePopUpSize;                             // Visible Size of popup excluding content that needs scrolling.
-      Size mRequiredPopUpSize;                            // Total size of popup including any invisible margin
-      float mMaxWidth;                                    // Max width of the Popup
-
-      Vector4 mNinePatchMargins;                          // Margins between the edge of the cropped image and the nine patch rect (left, right, top, bottom).
-
-      Size mContentSize;                                  // Size of Content (i.e. Buttons)
-      //Animation mAnimation;                               // Popup Hide/Show animation.
-
-      std::vector<ButtonRequirement> mOrderListOfButtons; // List of buttons in the order to be displayed and a flag to indicate if needed.
-
-      Vector4 mBackgroundColor;             // Color of the background of the text input popup
-      Vector4 mBackgroundPressedColor;      // Color of the option background.
-      Vector4 mLineColor;                   // Color of the line around the text input popup
-      Vector4 mIconColor;                   // Color of the popup icon.
-      Vector4 mIconPressedColor;            // Color of the popup icon when pressed.
-      Vector4 mTextColor;                   // Color of the popup text.
-      Vector4 mTextPressedColor;            // Color of the popup text when pressed.
-
-      // Priority of Options/Buttons in the Cut and Paste pop-up, higher priority buttons are displayed first, left to right.
-      std::size_t mSelectOptionPriority;    // Position of Select Button
-      std::size_t mSelectAllOptionPriority; // Position of Select All button
-      std::size_t mCutOptionPriority;       // Position of Cut button
-      std::size_t mCopyOptionPriority;      // Position of Copy button
-      std::size_t mPasteOptionPriority;     // Position of Paste button
-      std::size_t mClipboardOptionPriority; // Position of Clipboard button
-
-      bool mShowIcons; // Flag to show icons
+    TextSelectionPopup actor;
+    Vector3 position;
   };
 
-
-  Impl( Dali::Toolkit::Internal::Control& parent, Observer& observer )
-  : mTextControlParent(parent),
-    mObserver(observer),
-    mActiveCursor(ACTIVE_CURSOR_NONE),
-    mActiveGrabHandle(false),
-    mActiveSelection( false ),
-    mActiveCopyPastePopup( false ),
+  Impl( ControllerInterface& controller,
+        TextSelectionPopupCallbackInterface& callbackInterface )
+  : mController( controller ),
+    mEnabledPopupButtons( TextSelectionPopup::NONE ),
+    mTextSelectionPopupCallbackInterface( callbackInterface ),
+    mHandleColor( HANDLE_COLOR ),
+    mBoundingBox(),
+    mHighlightColor( LIGHT_BLUE ),
+    mHighlightPosition( Vector2::ZERO ),
+    mActiveCursor( ACTIVE_CURSOR_NONE ),
     mCursorBlinkInterval( CURSOR_BLINK_INTERVAL ),
     mCursorBlinkDuration( 0.0f ),
+    mCursorWidth( CURSOR_WIDTH ),
+    mHandleScrolling( HANDLE_TYPE_COUNT ),
+    mHandleReleased( HANDLE_TYPE_COUNT ),
+    mScrollDirection( SCROLL_NONE ),
+    mScrollThreshold( SCROLL_THRESHOLD ),
+    mScrollSpeed( SCROLL_SPEED ),
+    mScrollDistance( SCROLL_DISTANCE ),
+    mTextDepth( 0u ),
+    mActiveCopyPastePopup( false ),
+    mPopupSetNewPosition( true ),
     mCursorBlinkStatus( true ),
-    mGrabDisplacementX( 0.0f ),
-    mGrabDisplacementY( 0.0f ),
-    mBoundingBox( Rect<int>() )
+    mDelayCursorBlink( false ),
+    mPrimaryCursorVisible( false ),
+    mSecondaryCursorVisible( false ),
+    mFlipSelectionHandlesOnCross( false ),
+    mFlipLeftSelectionHandleDirection( false ),
+    mFlipRightSelectionHandleDirection( false ),
+    mIsHandlePanning( false ),
+    mIsHandleCurrentlyCrossed( false ),
+    mIsHandlePreviouslyCrossed( false ),
+    mNotifyEndOfScroll( false ),
+    mHorizontalScrollingEnabled( false ),
+    mVerticalScrollingEnabled( false ),
+    mSmoothHandlePanEnabled( false ),
+    mIsHighlightBoxActive( false )
   {
+    mQuadVertexFormat[ "aPosition" ] = Property::VECTOR2;
+    mHighlightShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
+    SetupGestures();
   }
 
   /**
    * Relayout of the decorations owned by the decorator.
-   * @param[in] size The Size of the UI control the decorater is adding it's decorations to.
+   * @param[in] size The Size of the UI control the decorator is adding it's decorations to.
    */
   void Relayout( const Vector2& size )
   {
+    mControlSize = size;
+
     // TODO - Remove this if nothing is active
     CreateActiveLayer();
 
     // Show or hide the cursors
     CreateCursors();
+
     if( mPrimaryCursor )
     {
-      mPrimaryCursor.SetPosition( mCursor[PRIMARY_CURSOR].x, mCursor[PRIMARY_CURSOR].y );
+      const CursorImpl& cursor = mCursor[PRIMARY_CURSOR];
+      mPrimaryCursorVisible = ( ( mControlSize.width - ( cursor.position.x + mCursorWidth ) > -Math::MACHINE_EPSILON_1000 ) &&
+                                ( cursor.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+                                ( mControlSize.height - ( cursor.position.y + cursor.cursorHeight ) > -Math::MACHINE_EPSILON_1000 ) &&
+                                ( cursor.position.y > -Math::MACHINE_EPSILON_1000 ) );
+      if( mPrimaryCursorVisible )
+      {
+        mPrimaryCursor.SetPosition( cursor.position.x,
+                                    cursor.position.y );
+        mPrimaryCursor.SetSize( Size( mCursorWidth, cursor.cursorHeight ) );
+      }
+      mPrimaryCursor.SetVisible( mPrimaryCursorVisible && mCursorBlinkStatus );
     }
     if( mSecondaryCursor )
     {
-      mSecondaryCursor.SetPosition( mCursor[SECONDARY_CURSOR].x, mCursor[SECONDARY_CURSOR].y );
+      const CursorImpl& cursor = mCursor[SECONDARY_CURSOR];
+      mSecondaryCursorVisible = ( ( mControlSize.width - ( cursor.position.x + mCursorWidth ) > -Math::MACHINE_EPSILON_1000 ) &&
+                                  ( cursor.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+                                  ( mControlSize.height - ( cursor.position.y + cursor.cursorHeight ) > -Math::MACHINE_EPSILON_1000 ) &&
+                                  ( cursor.position.y > -Math::MACHINE_EPSILON_1000 ) );
+      if( mSecondaryCursorVisible )
+      {
+        mSecondaryCursor.SetPosition( cursor.position.x,
+                                      cursor.position.y );
+        mSecondaryCursor.SetSize( Size( mCursorWidth, cursor.cursorHeight ) );
+      }
+      mSecondaryCursor.SetVisible( mSecondaryCursorVisible && mCursorBlinkStatus );
     }
 
     // Show or hide the grab handle
-    if( mActiveGrabHandle )
+    HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+    bool newGrabHandlePosition = false;
+    grabHandle.horizontallyVisible = false;
+    grabHandle.verticallyVisible = false;
+    if( grabHandle.active )
     {
-      SetupTouchEvents();
+      grabHandle.horizontallyVisible = ( ( mControlSize.width - ( grabHandle.position.x + floor( 0.5f * mCursorWidth ) ) > -Math::MACHINE_EPSILON_1000 ) &&
+                                         ( grabHandle.position.x > -Math::MACHINE_EPSILON_1000 ) );
+      grabHandle.verticallyVisible = ( ( ( mControlSize.height - grabHandle.lineHeight ) - grabHandle.position.y > -Math::MACHINE_EPSILON_1000 ) &&
+                                       ( grabHandle.position.y > -Math::MACHINE_EPSILON_1000 ) );
+
+      const bool isVisible = grabHandle.horizontallyVisible && grabHandle.verticallyVisible;
+      if( isVisible )
+      {
+        CreateGrabHandle();
 
-      CreateGrabHandle();
+        // Sets the grab handle position and calculate if it needs to be vertically flipped if it exceeds the boundary box.
+        SetGrabHandlePosition();
 
-      mGrabHandle.SetPosition( mCursor[PRIMARY_CURSOR].x, mCursor[PRIMARY_CURSOR].y + mCursor[PRIMARY_CURSOR].height );
+        // Sets the grab handle image according if it's pressed, flipped, etc.
+        SetHandleImage( GRAB_HANDLE );
+
+        newGrabHandlePosition = true;
+      }
+
+      if( grabHandle.actor )
+      {
+        grabHandle.actor.SetVisible( isVisible );
+      }
     }
-    else if( mGrabHandle )
+    else if( grabHandle.actor )
     {
-      UnparentAndReset( mGrabHandle );
+      grabHandle.actor.Unparent();
     }
 
     // Show or hide the selection handles/highlight
-    if( mActiveSelection )
+    HandleImpl& primary = mHandle[ LEFT_SELECTION_HANDLE ];
+    HandleImpl& secondary = mHandle[ RIGHT_SELECTION_HANDLE ];
+    bool newPrimaryHandlePosition = false;
+    bool newSecondaryHandlePosition = false;
+
+    primary.horizontallyVisible = ( ( mControlSize.width - primary.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+                                    ( primary.position.x > -Math::MACHINE_EPSILON_1000 ) );
+    primary.verticallyVisible = ( ( ( mControlSize.height - primary.lineHeight ) - primary.position.y > -Math::MACHINE_EPSILON_1000 ) &&
+                                  ( primary.position.y + ( primary.verticallyFlipped ? 0.f : primary.lineHeight ) > -Math::MACHINE_EPSILON_1000 ) );
+    secondary.horizontallyVisible = ( ( mControlSize.width - secondary.position.x > -Math::MACHINE_EPSILON_1000 ) &&
+                                      ( secondary.position.x > -Math::MACHINE_EPSILON_1000 ) );
+    secondary.verticallyVisible = ( ( ( mControlSize.height - secondary.lineHeight ) - secondary.position.y > -Math::MACHINE_EPSILON_1000 ) &&
+                                    ( secondary.position.y + ( secondary.verticallyFlipped ? 0.f : secondary.lineHeight ) > -Math::MACHINE_EPSILON_1000 ) );
+
+    const bool primaryVisible = primary.horizontallyVisible && primary.verticallyVisible;
+    const bool secondaryVisible = secondary.horizontallyVisible && secondary.verticallyVisible;
+
+    if( primary.active || secondary.active )
     {
-      SetupTouchEvents();
+      if( primaryVisible || secondaryVisible )
+      {
+        CreateSelectionHandles();
 
-      CreateSelectionHandles();
+        if( primaryVisible )
+        {
+          SetSelectionHandlePosition( LEFT_SELECTION_HANDLE );
 
-      SelectionHandleImpl& primary = mSelectionHandle[ PRIMARY_SELECTION_HANDLE ];
-      primary.actor.SetPosition( primary.x, primary.y + primary.cursorHeight );
+          // Sets the primary handle image according if it's pressed, flipped, etc.
+          SetHandleImage( LEFT_SELECTION_HANDLE );
 
-      SelectionHandleImpl& secondary = mSelectionHandle[ SECONDARY_SELECTION_HANDLE ];
-      secondary.actor.SetPosition( secondary.x, secondary.y + secondary.cursorHeight );
+          SetSelectionHandleMarkerSize( primary );
+
+          newPrimaryHandlePosition = true;
+        }
+
+        if( secondaryVisible )
+        {
+          SetSelectionHandlePosition( RIGHT_SELECTION_HANDLE );
+
+          // Sets the secondary handle image according if it's pressed, flipped, etc.
+          SetHandleImage( RIGHT_SELECTION_HANDLE );
+
+          SetSelectionHandleMarkerSize( secondary );
+
+          newSecondaryHandlePosition = true;
+        }
+      }
+
+      if( primary.actor )
+      {
+        primary.actor.SetVisible( primaryVisible );
+      }
+      if( secondary.actor )
+      {
+        secondary.actor.SetVisible( secondaryVisible );
+      }
 
-      //CreateHighlight(); TODO
     }
     else
     {
-      UnparentAndReset( mSelectionHandle[ PRIMARY_SELECTION_HANDLE ].actor );
-      UnparentAndReset( mSelectionHandle[ SECONDARY_SELECTION_HANDLE ].actor );
+      if( primary.actor )
+      {
+        primary.actor.Unparent();
+      }
+      if( secondary.actor )
+      {
+        secondary.actor.Unparent();
+      }
     }
 
-    if ( mActiveCopyPastePopup )
+    if( mIsHighlightBoxActive )
     {
-      CreatePopup();
-      mCopyPastePopup.mRoot.SetPosition( Vector3( 180.0f, -100.0f, 0.0f ) ); //todo grabhandle or selection handle postions to be used
+      CreateHighlight();
+      UpdateHighlight();
     }
     else
     {
-      DestroyPopup();
+      if( mHighlightActor )
+      {
+        mHighlightActor.Unparent();
+      }
+    }
+
+    if( newGrabHandlePosition    ||
+        newPrimaryHandlePosition ||
+        newSecondaryHandlePosition )
+    {
+      // Setup property notifications to find whether the handles leave the boundaries of the current display.
+      SetupActiveLayerPropertyNotifications();
+    }
+
+    if( mActiveCopyPastePopup &&
+        ( primaryVisible || secondaryVisible ) )
+    {
+      ShowPopup();
+      mPopupSetNewPosition = true;
+    }
+    else
+    {
+      if( mCopyPastePopup.actor )
+      {
+        mCopyPastePopup.actor.HidePopup();
+        mPopupSetNewPosition = true;
+      }
+    }
+  }
+
+  void UpdatePositions( const Vector2& scrollOffset )
+  {
+    mCursor[PRIMARY_CURSOR].position += scrollOffset;
+    mCursor[SECONDARY_CURSOR].position += scrollOffset;
+    mHandle[ GRAB_HANDLE ].position += scrollOffset;
+    mHandle[ LEFT_SELECTION_HANDLE ].position += scrollOffset;
+    mHandle[ RIGHT_SELECTION_HANDLE ].position += scrollOffset;
+    mHighlightPosition += scrollOffset;
+  }
+
+  void ShowPopup()
+  {
+    if( !mCopyPastePopup.actor )
+    {
+      return;
+    }
+
+    if( !mCopyPastePopup.actor.GetParent() )
+    {
+      mActiveLayer.Add( mCopyPastePopup.actor );
     }
+
+    mCopyPastePopup.actor.RaiseAbove( mActiveLayer );
+    mCopyPastePopup.actor.ShowPopup();
   }
 
-  void CreateCursor( ImageActor& cursor )
+  float CalculateVerticalPopUpPosition( float halfHeight, bool preferBelow )
   {
-    if ( !mCursorImage )
+    float yPosition = 0.f;
+
+    const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
+    const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
+    const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+
+    if( primaryHandle.active || secondaryHandle.active )
+    {
+      // The origin of the decorator's coordinate system in world coords.
+      const Vector3 originWorldCoords = mActiveLayer.GetCurrentWorldPosition() - mActiveLayer.GetCurrentSize() * ACTIVE_LAYER_ANCHOR_POINT;
+
+      if( preferBelow )
+      {
+        // Find out if there is enough space for the popup at the bottom.
+        const float primaryBelowY = primaryHandle.position.y + primaryHandle.lineHeight + primaryHandle.size.height;
+        const float secondaryBelowY = secondaryHandle.position.y + secondaryHandle.lineHeight + secondaryHandle.size.height;
+
+        float maxY = std::max( primaryBelowY, secondaryBelowY );
+
+        yPosition = halfHeight + maxY;
+
+        if( originWorldCoords.y + yPosition + halfHeight > mBoundingBox.w )
+        {
+          // Does not fit below.
+
+          // Try to fit first below the non active handle. Otherwise above the active handle.
+          if( RIGHT_SELECTION_HANDLE == mHandleReleased )
+          {
+            if( primaryBelowY < secondaryBelowY )
+            {
+              yPosition = halfHeight + primaryBelowY;
+            }
+            else
+            {
+              yPosition = primaryHandle.position.y - primaryHandle.size.height - halfHeight;
+            }
+          }
+          else if( LEFT_SELECTION_HANDLE == mHandleReleased )
+          {
+            if( secondaryBelowY < primaryBelowY )
+            {
+              yPosition = halfHeight + secondaryBelowY;
+            }
+            else
+            {
+              yPosition = secondaryHandle.position.y - secondaryHandle.size.height - halfHeight;
+            }
+          }
+
+          // Check the handle is whithin the decoration box.
+          if( originWorldCoords.y + yPosition < mBoundingBox.y )
+          {
+            yPosition = mBoundingBox.y - originWorldCoords.y + halfHeight;
+          }
+
+          if( originWorldCoords.y + yPosition > mBoundingBox.w )
+          {
+            yPosition = mBoundingBox.w - originWorldCoords.y - halfHeight;
+          }
+        }
+      } // preferBelow
+      else
+      {
+        // Find out if there is enough space for the popup at the top.
+        const float primaryTopY = primaryHandle.position.y - primaryHandle.size.height;
+        const float secondaryTopY = secondaryHandle.position.y - secondaryHandle.size.height;
+
+        float minY = std::min( primaryTopY, secondaryTopY );
+
+        yPosition = -halfHeight + minY;
+      } // !preferBelow
+    } // ( primaryHandle.active || secondaryHandle.active )
+    else if( grabHandle.active )
     {
-      mCursorImage = ResourceImage::New( DEFAULT_CURSOR_IMAGE );
+      if( preferBelow )
+      {
+        yPosition = halfHeight + grabHandle.lineHeight + grabHandle.size.height + grabHandle.position.y;
+      }
+      else
+      {
+        yPosition = -halfHeight + grabHandle.position.y - POPUP_PADDING;
+      }
     }
-    cursor = ImageActor::New( mCursorImage );
-    cursor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+
+    return yPosition;
+  }
+
+  void ConstrainPopupPosition( const Vector3& popupHalfSize )
+  {
+    // Check if the popup is within the boundaries of the decoration box.
+
+    // Check first the horizontal dimension. If is not within the boundaries, it calculates the offset.
+
+    // The origin of the decorator's coordinate system in world coords.
+    const Vector3 originWorldCoords = mActiveLayer.GetCurrentWorldPosition() - mActiveLayer.GetCurrentSize() * ACTIVE_LAYER_ANCHOR_POINT;
+
+    // The popup's position in world coords.
+    Vector3 popupPositionWorldCoords = originWorldCoords + mCopyPastePopup.position;
+
+    if( popupPositionWorldCoords.x - popupHalfSize.width < mBoundingBox.x )
+    {
+       mCopyPastePopup.position.x += mBoundingBox.x - ( popupPositionWorldCoords.x - popupHalfSize.width );
+    }
+    else if( popupPositionWorldCoords.x + popupHalfSize.width > mBoundingBox.z )
+    {
+       mCopyPastePopup.position.x += mBoundingBox.z - ( popupPositionWorldCoords.x + popupHalfSize.width );
+    }
+
+    // Check the vertical dimension. If the popup doesn't fit above the handles, it looks for a valid position below.
+    if( popupPositionWorldCoords.y - popupHalfSize.height < mBoundingBox.y )
+    {
+      mCopyPastePopup.position.y = CalculateVerticalPopUpPosition( popupHalfSize.height, true ); // true -> prefer to set the popup's position below.
+    }
+  }
+
+  void SetPopupPosition( Actor actor )
+  {
+    if( !mActiveCopyPastePopup )
+    {
+      return;
+    }
+
+    // Retrieves the popup's size after relayout.
+    const Vector3 popupSize( mCopyPastePopup.actor.GetRelayoutSize( Dimension::WIDTH ), mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT ), 0.0f );
+    const Vector3 popupHalfSize = popupSize * 0.5f;
+
+    if( mPopupSetNewPosition )
+    {
+      const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
+      const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
+      const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+
+      if( primaryHandle.active || secondaryHandle.active )
+      {
+        const float minHandleXPosition = std::min( primaryHandle.position.x, secondaryHandle.position.x );
+        const float maxHandleXPosition = std::max( primaryHandle.position.x, secondaryHandle.position.x );
+
+        mCopyPastePopup.position.x = minHandleXPosition + ( ( maxHandleXPosition - minHandleXPosition ) * 0.5f );
+
+        const float primaryY = -popupHalfSize.height + primaryHandle.position.y - ( primaryHandle.verticallyFlipped ? primaryHandle.size.height : POPUP_PADDING );
+        const float secondaryY = -popupHalfSize.height + secondaryHandle.position.y - ( secondaryHandle.verticallyFlipped ? secondaryHandle.size.height : POPUP_PADDING );
+
+        mCopyPastePopup.position.y = std::min( primaryY, secondaryY );
+      }
+      else if( grabHandle.active )
+      {
+        mCopyPastePopup.position.x = grabHandle.position.x;
+
+        mCopyPastePopup.position.y = -popupHalfSize.height + grabHandle.position.y - ( grabHandle.verticallyFlipped ? grabHandle.size.height : POPUP_PADDING );
+      }
+    } // mPopupSetNewPosition
+
+    // It may change the popup's position to fit within the decoration box.
+    ConstrainPopupPosition( popupHalfSize );
+
+    SetUpPopupPositionNotifications( popupHalfSize );
+
+    // Prevent pixel mis-alignment by rounding down.
+    mCopyPastePopup.position.x = floorf( mCopyPastePopup.position.x );
+    mCopyPastePopup.position.y = floorf( mCopyPastePopup.position.y );
+
+    mCopyPastePopup.actor.SetPosition( mCopyPastePopup.position );
+    mPopupSetNewPosition = false;
+  }
+
+  void CreateCursor( Control& cursor, const Vector4& color )
+  {
+    cursor = Control::New();
+    cursor.SetBackgroundColor( color );
+    cursor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+    cursor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   }
 
   // Add or Remove cursor(s) from parent
@@ -364,22 +692,32 @@ struct Decorator::Impl : public ConnectionTracker
   {
     if( mActiveCursor == ACTIVE_CURSOR_NONE )
     {
-      UnparentAndReset( mPrimaryCursor );
-      UnparentAndReset( mSecondaryCursor );
+      if( mPrimaryCursor )
+      {
+        mPrimaryCursor.Unparent();
+      }
+      if( mSecondaryCursor )
+      {
+        mSecondaryCursor.Unparent();
+      }
     }
     else
     {
-      /* Create Primary and or Secondary Cursor(s) if active and add to parent */
+      // Create Primary and or Secondary Cursor(s) if active and add to parent
       if ( mActiveCursor == ACTIVE_CURSOR_PRIMARY ||
            mActiveCursor == ACTIVE_CURSOR_BOTH )
       {
         if ( !mPrimaryCursor )
         {
-          CreateCursor( mPrimaryCursor );
+          CreateCursor( mPrimaryCursor, mCursor[PRIMARY_CURSOR].color );
 #ifdef DECORATOR_DEBUG
           mPrimaryCursor.SetName( "PrimaryCursorActor" );
 #endif
-          mActiveLayer.Add( mPrimaryCursor);
+        }
+
+        if( !mPrimaryCursor.GetParent() )
+        {
+          mActiveLayer.Add( mPrimaryCursor );
         }
       }
 
@@ -387,11 +725,22 @@ struct Decorator::Impl : public ConnectionTracker
       {
         if ( !mSecondaryCursor )
         {
-          CreateCursor( mSecondaryCursor );
+          CreateCursor( mSecondaryCursor, mCursor[SECONDARY_CURSOR].color );
 #ifdef DECORATOR_DEBUG
           mSecondaryCursor.SetName( "SecondaryCursorActor" );
 #endif
-          mActiveLayer.Add( mSecondaryCursor);
+        }
+
+        if( !mSecondaryCursor.GetParent() )
+        {
+          mActiveLayer.Add( mSecondaryCursor );
+        }
+      }
+      else
+      {
+        if( mSecondaryCursor )
+        {
+          mSecondaryCursor.Unparent();
         }
       }
     }
@@ -399,546 +748,1244 @@ struct Decorator::Impl : public ConnectionTracker
 
   bool OnCursorBlinkTimerTick()
   {
-    // Cursor blinking
-    if ( mPrimaryCursor )
+    if( !mDelayCursorBlink )
     {
-      mPrimaryCursor.SetVisible( mCursorBlinkStatus );
+      // Cursor blinking
+      if ( mPrimaryCursor )
+      {
+        mPrimaryCursor.SetVisible( mPrimaryCursorVisible && mCursorBlinkStatus );
+      }
+      if ( mSecondaryCursor )
+      {
+        mSecondaryCursor.SetVisible( mSecondaryCursorVisible && mCursorBlinkStatus );
+      }
+
+      mCursorBlinkStatus = !mCursorBlinkStatus;
     }
-    if ( mSecondaryCursor )
+    else
     {
-      mSecondaryCursor.SetVisible( mCursorBlinkStatus );
+      // Resume blinking
+      mDelayCursorBlink = false;
     }
 
-    mCursorBlinkStatus = !mCursorBlinkStatus;
-
     return true;
   }
 
-  void SetupTouchEvents()
+  void SetupGestures()
   {
-    if ( !mTapDetector )
-    {
-      mTapDetector = TapGestureDetector::New();
-      mTapDetector.DetectedSignal().Connect( this, &Decorator::Impl::OnTap );
-    }
+    // Will consume tap gestures on handles.
+    mTapDetector = TapGestureDetector::New();
 
-    if ( !mPanGestureDetector )
-    {
-      mPanGestureDetector = PanGestureDetector::New();
-      mPanGestureDetector.DetectedSignal().Connect( this, &Decorator::Impl::OnPan );
-    }
+    // Will consume double tap gestures on handles.
+    mTapDetector.SetMaximumTapsRequired( 2u );
+
+    // Will consume long press gestures on handles.
+    mLongPressDetector = LongPressGestureDetector::New();
+
+    // Detects pan gestures on handles.
+    mPanDetector = PanGestureDetector::New();
+    mPanDetector.DetectedSignal().Connect( this, &Decorator::Impl::OnPan );
   }
 
   void CreateActiveLayer()
   {
     if( !mActiveLayer )
     {
-      Actor parent = mTextControlParent.Self();
-
       mActiveLayer = Layer::New();
 #ifdef DECORATOR_DEBUG
       mActiveLayer.SetName ( "ActiveLayerActor" );
 #endif
 
-      mActiveLayer.SetAnchorPoint( AnchorPoint::CENTER);
-      mActiveLayer.SetParentOrigin( ParentOrigin::CENTER);
-      mActiveLayer.SetSizeMode( SIZE_EQUAL_TO_PARENT );
-      mActiveLayer.SetPositionInheritanceMode( USE_PARENT_POSITION );
+      mActiveLayer.SetParentOrigin( ParentOrigin::CENTER );
+      mActiveLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
-      parent.Add( mActiveLayer );
+      // Add the active layer telling the controller it doesn't need clipping.
+      mController.AddDecoration( mActiveLayer, false );
     }
 
     mActiveLayer.RaiseToTop();
   }
 
+  void SetSelectionHandleMarkerSize( HandleImpl& handle )
+  {
+    if( handle.markerActor )
+    {
+      handle.markerActor.SetSize( 0, handle.lineHeight );
+    }
+  }
+
   void CreateGrabHandle()
   {
-    if( !mGrabHandle )
+    HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+    if( !grabHandle.actor )
+    {
+      if( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] )
+      {
+        grabHandle.actor = ImageView::New( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] );
+        GetImpl( grabHandle.actor).SetDepthIndex( DepthIndex::DECORATION );
+        grabHandle.actor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+
+        // Area that Grab handle responds to, larger than actual handle so easier to move
+#ifdef DECORATOR_DEBUG
+        grabHandle.actor.SetName( "GrabHandleActor" );
+        if ( Dali::Internal::gLogFilter->IsEnabledFor( Debug::Verbose ) )
+        {
+          grabHandle.grabArea = Control::New();
+          Toolkit::Control control = Toolkit::Control::DownCast( grabHandle.grabArea );
+          control.SetBackgroundColor( Vector4( 1.0f, 1.0f, 1.0f, 0.5f ) );
+          grabHandle.grabArea.SetName( "GrabArea" );
+        }
+        else
+        {
+          grabHandle.grabArea = Actor::New();
+          grabHandle.grabArea.SetName( "GrabArea" );
+        }
+#else
+        grabHandle.grabArea = Actor::New();
+#endif
+
+        grabHandle.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
+        grabHandle.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+        grabHandle.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
+        grabHandle.grabArea.SetSizeModeFactor( DEFAULT_GRAB_HANDLE_RELATIVE_SIZE );
+        grabHandle.actor.Add( grabHandle.grabArea );
+        grabHandle.actor.SetColor( mHandleColor );
+
+        grabHandle.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnGrabHandleTouched );
+
+        // The grab handle's actor is attached to the tap and long press detectors in order to consume these events.
+        // Note that no callbacks are connected to any signal emitted by the tap and long press detectors.
+        mTapDetector.Attach( grabHandle.actor );
+        mLongPressDetector.Attach( grabHandle.actor );
+
+        // The grab handle's area is attached to the pan detector.
+        // The OnPan() method is connected to the signals emitted by the pan detector.
+        mPanDetector.Attach( grabHandle.grabArea );
+
+        mActiveLayer.Add( grabHandle.actor );
+      }
+    }
+
+    if( grabHandle.actor && !grabHandle.actor.GetParent() )
+    {
+      mActiveLayer.Add( grabHandle.actor );
+    }
+  }
+
+  void CreateHandleMarker( HandleImpl& handle, Image& image, HandleType handleType )
+  {
+    if( image )
+    {
+      handle.markerActor = ImageView::New( image );
+      handle.markerActor.SetColor( mHandleColor );
+      handle.actor.Add( handle.markerActor );
+
+      handle.markerActor.SetResizePolicy ( ResizePolicy::FIXED, Dimension::HEIGHT );
+
+      if( LEFT_SELECTION_HANDLE == handleType )
+      {
+        handle.markerActor.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );
+        handle.markerActor.SetParentOrigin( ParentOrigin::TOP_RIGHT );
+      }
+      else if( RIGHT_SELECTION_HANDLE == handleType )
+      {
+        handle.markerActor.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT );
+        handle.markerActor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+      }
+    }
+  }
+
+  void CreateSelectionHandles()
+  {
+    HandleImpl& primary = mHandle[ LEFT_SELECTION_HANDLE ];
+    if( !primary.actor )
+    {
+      if( mHandleImages[LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] )
+      {
+        primary.actor = ImageView::New( mHandleImages[LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] );
+#ifdef DECORATOR_DEBUG
+        primary.actor.SetName("SelectionHandleOne");
+#endif
+        primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
+        GetImpl( primary.actor ).SetDepthIndex( DepthIndex::DECORATION );
+        primary.actor.SetColor( mHandleColor );
+
+        primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
+#ifdef DECORATOR_DEBUG
+        primary.grabArea.SetName("SelectionHandleOneGrabArea");
+#endif
+        primary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
+        primary.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
+        primary.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+        primary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
+
+        primary.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnHandleOneTouched );
+
+        // The handle's actor is attached to the tap and long press detectors in order to consume these events.
+        // Note that no callbacks are connected to any signal emitted by the tap and long press detectors.
+        mTapDetector.Attach( primary.actor );
+        mLongPressDetector.Attach( primary.actor );
+
+        // The handle's area is attached to the pan detector.
+        // The OnPan() method is connected to the signals emitted by the pan detector.
+        mPanDetector.Attach( primary.grabArea );
+
+        primary.actor.Add( primary.grabArea );
+
+        CreateHandleMarker( primary, mHandleImages[LEFT_SELECTION_HANDLE_MARKER][HANDLE_IMAGE_RELEASED], LEFT_SELECTION_HANDLE );
+      }
+    }
+
+    if( primary.actor && !primary.actor.GetParent() )
+    {
+      mActiveLayer.Add( primary.actor );
+    }
+
+    HandleImpl& secondary = mHandle[ RIGHT_SELECTION_HANDLE ];
+    if( !secondary.actor )
+    {
+      if( mHandleImages[RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] )
+      {
+        secondary.actor = ImageView::New( mHandleImages[RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED] );
+#ifdef DECORATOR_DEBUG
+        secondary.actor.SetName("SelectionHandleTwo");
+#endif
+        secondary.actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text.
+        GetImpl( secondary.actor ).SetDepthIndex( DepthIndex::DECORATION );
+        secondary.actor.SetColor( mHandleColor );
+
+        secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
+#ifdef DECORATOR_DEBUG
+        secondary.grabArea.SetName("SelectionHandleTwoGrabArea");
+#endif
+        secondary.grabArea.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
+        secondary.grabArea.SetParentOrigin( ParentOrigin::TOP_CENTER );
+        secondary.grabArea.SetAnchorPoint( AnchorPoint::TOP_CENTER );
+        secondary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
+
+        secondary.grabArea.TouchSignal().Connect( this, &Decorator::Impl::OnHandleTwoTouched );
+
+        // The handle's actor is attached to the tap and long press detectors in order to consume these events.
+        // Note that no callbacks are connected to any signal emitted by the tap and long press detectors.
+        mTapDetector.Attach( secondary.actor );
+        mLongPressDetector.Attach( secondary.actor );
+
+        // The handle's area is attached to the pan detector.
+        // The OnPan() method is connected to the signals emitted by the pan detector.
+        mPanDetector.Attach( secondary.grabArea );
+
+        secondary.actor.Add( secondary.grabArea );
+
+        CreateHandleMarker( secondary, mHandleImages[RIGHT_SELECTION_HANDLE_MARKER][HANDLE_IMAGE_RELEASED], RIGHT_SELECTION_HANDLE  );
+      }
+    }
+
+    if( secondary.actor && !secondary.actor.GetParent() )
+    {
+      mActiveLayer.Add( secondary.actor );
+    }
+  }
+
+  void CalculateHandleWorldCoordinates( HandleImpl& handle, Vector2& position )
+  {
+    // Gets the world position of the active layer. The active layer is where the handles are added.
+    const Vector3 parentWorldPosition = mActiveLayer.GetCurrentWorldPosition();
+
+    // The grab handle position in world coords.
+    // The active layer's world position is the center of the active layer. The origin of the
+    // coord system of the handles is the top left of the active layer.
+    position.x = parentWorldPosition.x - 0.5f * mControlSize.width + handle.position.x + ( mSmoothHandlePanEnabled ? handle.grabDisplacementX : 0.f );
+    position.y = parentWorldPosition.y - 0.5f * mControlSize.height + handle.position.y + ( mSmoothHandlePanEnabled ? handle.grabDisplacementY : 0.f );
+  }
+
+  void SetGrabHandlePosition()
+  {
+    // Reference to the grab handle.
+    HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+
+    // Transforms the handle position into world coordinates.
+    // @note This is not the same value as grabHandle.actor.GetCurrentWorldPosition()
+    // as it's transforming the handle's position set by the text-controller and not
+    // the final position set to the actor. Another difference is the GetCurrentWorldPosition()
+    // retrieves the position of the center of the actor but the handle's position set
+    // by the text controller is not the center of the actor.
+    Vector2 grabHandleWorldPosition;
+    CalculateHandleWorldCoordinates( grabHandle, grabHandleWorldPosition );
+
+    // Check if the grab handle exceeds the boundaries of the decoration box.
+    // At the moment only the height is checked for the grab handle.
+
+    grabHandle.verticallyFlipped = ( grabHandle.verticallyFlippedPreferred &&
+                                     ( ( grabHandleWorldPosition.y - grabHandle.size.height ) > mBoundingBox.y ) ) ||
+                                   ( grabHandleWorldPosition.y + grabHandle.lineHeight + grabHandle.size.height > mBoundingBox.w );
+
+    // The grab handle 'y' position in local coords.
+    // If the grab handle exceeds the bottom of the decoration box,
+    // set the 'y' position to the top of the line.
+    // The SetGrabHandleImage() method will change the orientation.
+    const float yLocalPosition = grabHandle.verticallyFlipped ? grabHandle.position.y : grabHandle.position.y + grabHandle.lineHeight;
+
+    if( grabHandle.actor )
+    {
+      grabHandle.actor.SetPosition( grabHandle.position.x + floor( 0.5f * mCursorWidth ) + ( mSmoothHandlePanEnabled ? grabHandle.grabDisplacementX : 0.f ),
+                                    yLocalPosition + ( mSmoothHandlePanEnabled ? grabHandle.grabDisplacementY : 0.f ) );
+    }
+  }
+
+  void SetSelectionHandlePosition( HandleType type )
+  {
+    const bool isPrimaryHandle = LEFT_SELECTION_HANDLE == type;
+
+    // Reference to the selection handle.
+    HandleImpl& handle = mHandle[type];
+
+    // Transforms the handle position into world coordinates.
+    // @note This is not the same value as handle.actor.GetCurrentWorldPosition()
+    // as it's transforming the handle's position set by the text-controller and not
+    // the final position set to the actor. Another difference is the GetCurrentWorldPosition()
+    // retrieves the position of the center of the actor but the handle's position set
+    // by the text controller is not the center of the actor.
+    Vector2 handleWorldPosition;
+    CalculateHandleWorldCoordinates( handle, handleWorldPosition );
+
+    // Whether to flip the handle (horizontally).
+    bool flipHandle = isPrimaryHandle ? mFlipLeftSelectionHandleDirection : mFlipRightSelectionHandleDirection;
+
+    // Whether to flip the handles if they are crossed.
+    bool crossFlip = false;
+    if( mFlipSelectionHandlesOnCross || !mIsHandlePanning )
+    {
+      crossFlip = mIsHandleCurrentlyCrossed;
+    }
+
+    // Whether the handle was crossed before start the panning.
+    const bool isHandlePreviouslyCrossed = mFlipSelectionHandlesOnCross ? false : mIsHandlePreviouslyCrossed;
+
+    // Does not flip if both conditions are true (double flip)
+    flipHandle = flipHandle != ( crossFlip || isHandlePreviouslyCrossed );
+
+    // Will flip the handles vertically if the user prefers it.
+    bool verticallyFlippedPreferred = handle.verticallyFlippedPreferred;
+
+    if( crossFlip || isHandlePreviouslyCrossed )
+    {
+      if( isPrimaryHandle )
+      {
+        verticallyFlippedPreferred = mHandle[RIGHT_SELECTION_HANDLE].verticallyFlippedPreferred;
+      }
+      else
+      {
+        verticallyFlippedPreferred = mHandle[LEFT_SELECTION_HANDLE].verticallyFlippedPreferred;
+      }
+    }
+
+    // Check if the selection handle exceeds the boundaries of the decoration box.
+    const bool exceedsLeftEdge = ( isPrimaryHandle ? !flipHandle : flipHandle ) && ( handleWorldPosition.x - handle.size.width < mBoundingBox.x );
+    const bool exceedsRightEdge = ( isPrimaryHandle ? flipHandle : !flipHandle ) && ( handleWorldPosition.x + handle.size.width > mBoundingBox.z );
+
+    // Does not flip if both conditions are true (double flip)
+    flipHandle = flipHandle != ( exceedsLeftEdge || exceedsRightEdge );
+
+    if( flipHandle )
+    {
+      if( handle.actor && !handle.horizontallyFlipped )
+      {
+        // Change the anchor point to flip the image.
+        handle.actor.SetAnchorPoint( isPrimaryHandle ? AnchorPoint::TOP_LEFT : AnchorPoint::TOP_RIGHT );
+
+        handle.horizontallyFlipped = true;
+      }
+    }
+    else
+    {
+      if( handle.actor && handle.horizontallyFlipped )
+      {
+        // Reset the anchor point.
+        handle.actor.SetAnchorPoint( isPrimaryHandle ? AnchorPoint::TOP_RIGHT : AnchorPoint::TOP_LEFT );
+
+        handle.horizontallyFlipped = false;
+      }
+    }
+
+    // Whether to flip the handle vertically.
+    handle.verticallyFlipped = ( verticallyFlippedPreferred &&
+                                 ( ( handleWorldPosition.y - handle.size.height ) > mBoundingBox.y ) ) ||
+                               ( handleWorldPosition.y + handle.lineHeight + handle.size.height > mBoundingBox.w );
+
+    // The primary selection handle 'y' position in local coords.
+    // If the handle exceeds the bottom of the decoration box,
+    // set the 'y' position to the top of the line.
+    // The SetHandleImage() method will change the orientation.
+    const float yLocalPosition = handle.verticallyFlipped ? handle.position.y : handle.position.y + handle.lineHeight;
+
+    if( handle.actor )
+    {
+      handle.actor.SetPosition( handle.position.x + ( mSmoothHandlePanEnabled ? handle.grabDisplacementX : 0.f ),
+                                yLocalPosition + ( mSmoothHandlePanEnabled ? handle.grabDisplacementY : 0.f ) );
+    }
+  }
+
+  void SetHandleImage( HandleType type )
+  {
+    HandleImpl& handle = mHandle[type];
+
+    HandleType markerType = HANDLE_TYPE_COUNT;
+    // If the selection handle is flipped it chooses the image of the other selection handle. Does nothing for the grab handle.
+    if( LEFT_SELECTION_HANDLE == type )
+    {
+      type = handle.horizontallyFlipped ? RIGHT_SELECTION_HANDLE : LEFT_SELECTION_HANDLE;
+      markerType = handle.horizontallyFlipped ? RIGHT_SELECTION_HANDLE_MARKER : LEFT_SELECTION_HANDLE_MARKER;
+    }
+    else if( RIGHT_SELECTION_HANDLE == type )
+    {
+      type = handle.horizontallyFlipped ? LEFT_SELECTION_HANDLE : RIGHT_SELECTION_HANDLE;
+      markerType = handle.horizontallyFlipped ? LEFT_SELECTION_HANDLE_MARKER : RIGHT_SELECTION_HANDLE_MARKER;
+    }
+
+    // Chooses between the released or pressed image. It checks whether the pressed image exists.
+    if( handle.actor )
+    {
+      const HandleImageType imageType = ( handle.pressed ? ( mHandleImages[type][HANDLE_IMAGE_PRESSED] ? HANDLE_IMAGE_PRESSED : HANDLE_IMAGE_RELEASED ) : HANDLE_IMAGE_RELEASED );
+
+      handle.actor.SetImage( mHandleImages[type][imageType] );
+    }
+
+    if( HANDLE_TYPE_COUNT != markerType )
+    {
+      if( handle.markerActor )
+      {
+        const HandleImageType markerImageType = ( handle.pressed ? ( mHandleImages[markerType][HANDLE_IMAGE_PRESSED] ? HANDLE_IMAGE_PRESSED : HANDLE_IMAGE_RELEASED ) : HANDLE_IMAGE_RELEASED );
+        handle.markerActor.SetImage( mHandleImages[markerType][markerImageType] );
+      }
+    }
+
+    // Whether to flip the handle vertically.
+    if( handle.actor )
+    {
+      handle.actor.SetOrientation( handle.verticallyFlipped ? ANGLE_180 : ANGLE_0, Vector3::XAXIS );
+    }
+  }
+
+  void CreateHighlight()
+  {
+    if( !mHighlightActor )
+    {
+      mHighlightActor = Actor::New();
+
+#ifdef DECORATOR_DEBUG
+      mHighlightActor.SetName( "HighlightActor" );
+#endif
+      mHighlightActor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+      mHighlightActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+      mHighlightActor.SetColor( mHighlightColor );
+      mHighlightActor.SetColorMode( USE_OWN_COLOR );
+    }
+
+    // Add the highlight box telling the controller it needs clipping.
+    mController.AddDecoration( mHighlightActor, true );
+  }
+
+  void UpdateHighlight()
+  {
+    if ( mHighlightActor )
+    {
+      // Sets the position of the highlight actor inside the decorator.
+      mHighlightActor.SetPosition( mHighlightPosition.x,
+                                   mHighlightPosition.y );
+
+      const unsigned int numberOfQuads = mHighlightQuadList.size();
+      if( 0u != numberOfQuads )
+      {
+        // Set the size of the highlighted text to the actor.
+        mHighlightActor.SetSize( mHighlightSize );
+
+        // Used to translate the vertices given in decorator's coords to the mHighlightActor's local coords.
+        const float offsetX = mHighlightPosition.x + 0.5f * mHighlightSize.width;
+        const float offsetY = mHighlightPosition.y + 0.5f * mHighlightSize.height;
+
+        Vector<Vector2> vertices;
+        Vector<unsigned short> indices;
+
+        vertices.Reserve( 4u * numberOfQuads );
+        indices.Reserve( 6u * numberOfQuads );
+
+        // Index to the vertex.
+        unsigned int v = 0u;
+
+        // Traverse all quads.
+        for( std::vector<QuadCoordinates>::iterator it = mHighlightQuadList.begin(),
+               endIt = mHighlightQuadList.end();
+             it != endIt;
+             ++it, v += 4u )
+        {
+          QuadCoordinates& quad = *it;
+
+          Vector2 vertex;
+
+          // top-left (v+0)
+          vertex.x = quad.min.x - offsetX;
+          vertex.y = quad.min.y - offsetY;
+          vertices.PushBack( vertex );
+
+          // top-right (v+1)
+          vertex.x = quad.max.x - offsetX;
+          vertex.y = quad.min.y - offsetY;
+          vertices.PushBack( vertex );
+
+          // bottom-left (v+2)
+          vertex.x = quad.min.x - offsetX;
+          vertex.y = quad.max.y - offsetY;
+          vertices.PushBack( vertex );
+
+          // bottom-right (v+3)
+          vertex.x = quad.max.x - offsetX;
+          vertex.y = quad.max.y - offsetY;
+          vertices.PushBack( vertex );
+
+          // triangle A (3, 1, 0)
+          indices.PushBack( v + 3 );
+          indices.PushBack( v + 1 );
+          indices.PushBack( v );
+
+          // triangle B (0, 2, 3)
+          indices.PushBack( v );
+          indices.PushBack( v + 2 );
+          indices.PushBack( v + 3 );
+        }
+
+        if( ! mQuadVertices )
+        {
+          mQuadVertices = PropertyBuffer::New( mQuadVertexFormat );
+        }
+
+        mQuadVertices.SetData( &vertices[ 0 ], vertices.Size() );
+
+        if( !mQuadGeometry )
+        {
+          mQuadGeometry = Geometry::New();
+          mQuadGeometry.AddVertexBuffer( mQuadVertices );
+        }
+        mQuadGeometry.SetIndexBuffer( &indices[ 0 ], indices.Size() );
+
+        if( !mHighlightRenderer )
+        {
+          mHighlightRenderer = Dali::Renderer::New( mQuadGeometry, mHighlightShader );
+          mHighlightActor.AddRenderer( mHighlightRenderer );
+        }
+      }
+
+      mHighlightQuadList.clear();
+
+      if( mHighlightRenderer )
+      {
+        mHighlightRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mTextDepth - 2 ); // text is rendered at mTextDepth and text's shadow at mTextDepth -1u.
+      }
+    }
+  }
+
+  void DoPan( HandleImpl& handle, HandleType type, const PanGesture& gesture )
+  {
+    if( Gesture::Started == gesture.state )
+    {
+      handle.grabDisplacementX = handle.grabDisplacementY = 0.f;
+
+      handle.globalPosition.x = handle.position.x;
+      handle.globalPosition.y = handle.position.y;
+    }
+
+    handle.grabDisplacementX += gesture.displacement.x;
+    handle.grabDisplacementY += ( handle.verticallyFlipped ? -gesture.displacement.y : gesture.displacement.y );
+
+    const float x = handle.globalPosition.x + handle.grabDisplacementX;
+    const float y = handle.globalPosition.y + handle.grabDisplacementY + 0.5f * handle.lineHeight;
+    const float yVerticallyFlippedCorrected = y - ( handle.verticallyFlippedOnTouch ? handle.lineHeight : 0.f );
+
+    if( ( Gesture::Started    == gesture.state ) ||
+        ( Gesture::Continuing == gesture.state ) )
+    {
+      Vector2 targetSize;
+      mController.GetTargetSize( targetSize );
+
+      if( mHorizontalScrollingEnabled &&
+          ( x < mScrollThreshold ) )
+      {
+        mScrollDirection = SCROLL_RIGHT;
+        mHandleScrolling = type;
+        StartScrollTimer();
+      }
+      else if( mHorizontalScrollingEnabled &&
+               ( x > targetSize.width - mScrollThreshold ) )
+      {
+        mScrollDirection = SCROLL_LEFT;
+        mHandleScrolling = type;
+        StartScrollTimer();
+      }
+      else if( mVerticalScrollingEnabled &&
+               ( yVerticallyFlippedCorrected < mScrollThreshold ) )
+      {
+        mScrollDirection = SCROLL_TOP;
+        mHandleScrolling = type;
+        StartScrollTimer();
+      }
+      else if( mVerticalScrollingEnabled &&
+               ( yVerticallyFlippedCorrected + handle.lineHeight > targetSize.height - mScrollThreshold ) )
+      {
+        mScrollDirection = SCROLL_BOTTOM;
+        mHandleScrolling = type;
+        StartScrollTimer();
+      }
+      else
+      {
+        mHandleScrolling = HANDLE_TYPE_COUNT;
+        StopScrollTimer();
+        mController.DecorationEvent( type, HANDLE_PRESSED, x, y );
+      }
+
+      mIsHandlePanning = true;
+    }
+    else if( ( Gesture::Finished  == gesture.state ) ||
+             ( Gesture::Cancelled == gesture.state ) )
+    {
+      if( mScrollTimer &&
+          ( mScrollTimer.IsRunning() || mNotifyEndOfScroll ) )
+      {
+        mNotifyEndOfScroll = false;
+        mHandleScrolling = HANDLE_TYPE_COUNT;
+        StopScrollTimer();
+        mController.DecorationEvent( type, HANDLE_STOP_SCROLLING, x, y );
+      }
+      else
+      {
+        mController.DecorationEvent( type, HANDLE_RELEASED, x, y );
+      }
+
+      if( handle.actor )
+      {
+        handle.actor.SetImage( mHandleImages[type][HANDLE_IMAGE_RELEASED] );
+      }
+      handle.pressed = false;
+
+      mIsHandlePanning = false;
+    }
+  }
+
+  void OnPan( Actor actor, const PanGesture& gesture )
+  {
+    HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+    HandleImpl& primarySelectionHandle = mHandle[LEFT_SELECTION_HANDLE];
+    HandleImpl& secondarySelectionHandle = mHandle[RIGHT_SELECTION_HANDLE];
+
+    if( actor == grabHandle.grabArea )
+    {
+      DoPan( grabHandle, GRAB_HANDLE, gesture );
+    }
+    else if( actor == primarySelectionHandle.grabArea )
+    {
+      DoPan( primarySelectionHandle, LEFT_SELECTION_HANDLE, gesture );
+    }
+    else if( actor == secondarySelectionHandle.grabArea )
+    {
+      DoPan( secondarySelectionHandle, RIGHT_SELECTION_HANDLE, gesture );
+    }
+  }
+
+  bool OnGrabHandleTouched( Actor actor, const TouchData& touch )
+  {
+    HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+
+    // Switch between pressed/release grab-handle images
+    if( touch.GetPointCount() > 0 &&
+        grabHandle.actor )
     {
-      if ( !mGrabHandleImage )
+      const PointState::Type state = touch.GetState( 0 );
+
+      if( PointState::DOWN == state )
+      {
+        grabHandle.pressed = true;
+      }
+      else if( ( PointState::UP == state ) ||
+               ( PointState::INTERRUPTED == state ) )
       {
-        mGrabHandleImage = ResourceImage::New( DEFAULT_GRAB_HANDLE_IMAGE );
+        grabHandle.pressed = false;
       }
 
-      mGrabHandle = ImageActor::New( mGrabHandleImage );
-#ifdef DECORATOR_DEBUG
-      mGrabHandle.SetName( "GrabHandleActor" );
-#endif
-      mGrabHandle.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      mGrabHandle.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-      mGrabHandle.SetDrawMode( DrawMode::OVERLAY );
+      SetHandleImage( GRAB_HANDLE );
+    }
+
+    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
+    return true;
+  }
+
+  bool OnHandleOneTouched( Actor actor, const TouchData& touch )
+  {
+    HandleImpl& primarySelectionHandle = mHandle[LEFT_SELECTION_HANDLE];
+
+    // Switch between pressed/release selection handle images
+    if( touch.GetPointCount() > 0 &&
+        primarySelectionHandle.actor )
+    {
+      const PointState::Type state = touch.GetState( 0 );
+
+      if( PointState::DOWN == state )
+      {
+        primarySelectionHandle.pressed = true;
+        primarySelectionHandle.verticallyFlippedOnTouch = primarySelectionHandle.verticallyFlipped;
+      }
+      else if( ( PointState::UP == state ) ||
+               ( PointState::INTERRUPTED == state ) )
+      {
+        primarySelectionHandle.pressed = false;
+        mIsHandlePreviouslyCrossed = mIsHandleCurrentlyCrossed;
+        mIsHandlePanning = false;
+        mHandleReleased = LEFT_SELECTION_HANDLE;
+      }
+
+      SetHandleImage( LEFT_SELECTION_HANDLE );
+    }
+
+    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
+    return true;
+  }
+
+  bool OnHandleTwoTouched( Actor actor, const TouchData& touch )
+  {
+    HandleImpl& secondarySelectionHandle = mHandle[RIGHT_SELECTION_HANDLE];
+
+    // Switch between pressed/release selection handle images
+    if( touch.GetPointCount() > 0 &&
+        secondarySelectionHandle.actor )
+    {
+      const PointState::Type state = touch.GetState( 0 );
+
+      if( PointState::DOWN == state )
+      {
+        secondarySelectionHandle.pressed = true;
+        secondarySelectionHandle.verticallyFlippedOnTouch = secondarySelectionHandle.verticallyFlipped;
+      }
+      else if( ( PointState::UP == state ) ||
+               ( PointState::INTERRUPTED == state ) )
+      {
+        secondarySelectionHandle.pressed = false;
+        mIsHandlePreviouslyCrossed = mIsHandleCurrentlyCrossed;
+        mIsHandlePanning = false;
+        mHandleReleased = RIGHT_SELECTION_HANDLE;
+      }
+
+      SetHandleImage( RIGHT_SELECTION_HANDLE );
+    }
+
+    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
+    return true;
+  }
+
+  void HandleResetPosition( PropertyNotification& source )
+  {
+    const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+
+    if( grabHandle.active )
+    {
+      // Sets the grab handle position and calculates if it needs to be vertically flipped if it exceeds the boundary box.
+      SetGrabHandlePosition();
+
+      // Sets the grab handle image according if it's pressed, flipped, etc.
+      SetHandleImage( GRAB_HANDLE );
+    }
+    else
+    {
+      // Sets the primary selection handle position and calculates if it needs to be vertically flipped if it exceeds the boundary box.
+      SetSelectionHandlePosition( LEFT_SELECTION_HANDLE );
 
-      mGrabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
-#ifdef DECORATOR_DEBUG
-      mGrabArea.SetName( "GrabArea" );
-#endif
-      mGrabArea.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
-      mGrabArea.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
-      mGrabArea.SetSizeModeFactor( DEFAULT_GRAB_HANDLE_RELATIVE_SIZE );
-      mGrabHandle.Add(mGrabArea);
+      // Sets the primary handle image according if it's pressed, flipped, etc.
+      SetHandleImage( LEFT_SELECTION_HANDLE );
 
-      mTapDetector.Attach( mGrabArea );
-      mPanGestureDetector.Attach( mGrabArea );
+      // Sets the secondary selection handle position and calculates if it needs to be vertically flipped if it exceeds the boundary box.
+      SetSelectionHandlePosition( RIGHT_SELECTION_HANDLE );
 
-      mActiveLayer.Add(mGrabHandle);
+      // Sets the secondary handle image according if it's pressed, flipped, etc.
+      SetHandleImage( RIGHT_SELECTION_HANDLE );
     }
   }
 
-  void CreateSelectionHandles()
+  void SetupActiveLayerPropertyNotifications()
   {
-    SelectionHandleImpl& primary = mSelectionHandle[ PRIMARY_SELECTION_HANDLE ];
-    if ( !primary.actor )
+    if( !mActiveLayer )
     {
-      if ( !primary.releasedImage )
-      {
-        primary.releasedImage = ResourceImage::New( DEFAULT_SELECTION_HANDLE_ONE );
-      }
-
-      primary.actor = ImageActor::New( primary.releasedImage );
-#ifdef DECORATOR_DEBUG
-      primary.actor.SetName("SelectionHandleOne");
-#endif
-      primary.actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
-      primary.actor.SetDrawMode( DrawMode::OVERLAY ); // ensure grab handle above text
-      primary.flipped = false;
+      return;
+    }
 
-      primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
-#ifdef DECORATOR_DEBUG
-      primary.grabArea.SetName("SelectionHandleOneGrabArea");
-#endif
-      primary.grabArea.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
-      primary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
-      primary.grabArea.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
+    // Vertical notifications.
 
-      mTapDetector.Attach( primary.grabArea );
-      mPanGestureDetector.Attach( primary.grabArea );
-      primary.grabArea.TouchedSignal().Connect( this, &Decorator::Impl::OnHandleOneTouched );
+    // Disconnect any previous connected callback.
+    if( mHandleVerticalLessThanNotification )
+    {
+      mHandleVerticalLessThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+      mActiveLayer.RemovePropertyNotification( mHandleVerticalLessThanNotification );
+    }
 
-      primary.actor.Add( primary.grabArea );
-      mActiveLayer.Add( primary.actor );
+    if( mHandleVerticalGreaterThanNotification )
+    {
+      mHandleVerticalGreaterThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+      mActiveLayer.RemovePropertyNotification( mHandleVerticalGreaterThanNotification );
     }
 
-    SelectionHandleImpl& secondary = mSelectionHandle[ SECONDARY_SELECTION_HANDLE ];
-    if ( !secondary.actor )
+    const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+    const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
+    const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
+
+    if( grabHandle.active )
     {
-      if ( !secondary.releasedImage )
+      if( grabHandle.verticallyFlipped )
       {
-        secondary.releasedImage = ResourceImage::New( DEFAULT_SELECTION_HANDLE_TWO );
-      }
+        // The grab handle is vertically flipped. Never is going to exceed the bottom edje of the display.
+        mHandleVerticalGreaterThanNotification.Reset();
 
-      secondary.actor = ImageActor::New( secondary.releasedImage );
-#ifdef DECORATOR_DEBUG
-      secondary.actor.SetName("SelectionHandleTwo");
-#endif
-      secondary.actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      secondary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text.
-      secondary.actor.SetDrawMode( DrawMode::OVERLAY ); // ensure grab handle above text
-      secondary.flipped = false;
+        // The vertical distance from the center of the active layer to the top edje of the display.
+        const float topHeight = 0.5f * mControlSize.height - grabHandle.position.y + grabHandle.size.height;
 
-      secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move
-#ifdef DECORATOR_DEBUG
-      secondary.grabArea.SetName("SelectionHandleTwoGrabArea");
-#endif
-      secondary.grabArea.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
-      secondary.grabArea.SetSizeModeFactor( DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE );
-      secondary.grabArea.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
+        mHandleVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                    LessThanCondition( mBoundingBox.y + topHeight ) );
 
-      mTapDetector.Attach( secondary.grabArea );
-      mPanGestureDetector.Attach( secondary.grabArea );
-      secondary.grabArea.TouchedSignal().Connect( this, &Decorator::Impl::OnHandleTwoTouched );
+        // Notifies the change from false to true and from true to false.
+        mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
 
-      secondary.actor.Add( secondary.grabArea );
-      mActiveLayer.Add( secondary.actor );
-    }
+        // Connects the signals with the callbacks.
+        mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+      }
+      else
+      {
+        // The grab handle is not vertically flipped. Never is going to exceed the top edje of the display.
+        mHandleVerticalLessThanNotification.Reset();
 
-    //SetUpHandlePropertyNotifications(); TODO
-  }
+        // The vertical distance from the center of the active layer to the bottom edje of the display.
+        const float bottomHeight = -0.5f * mControlSize.height + grabHandle.position.y + grabHandle.lineHeight + grabHandle.size.height;
 
-  void OnTap( Actor actor, const TapGesture& tap )
-  {
-    if( actor == mGrabHandle )
-    {
-      // TODO
-    }
-  }
+        mHandleVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                       GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
 
-  void OnPan( Actor actor, const PanGesture& gesture )
-  {
-    if( actor == mGrabArea )
+        // Notifies the change from false to true and from true to false.
+        mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+
+        // Connects the signals with the callbacks.
+        mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+      }
+    }
+    else // The selection handles are active
     {
-      if( Gesture::Started == gesture.state )
+      if( primaryHandle.verticallyFlipped && secondaryHandle.verticallyFlipped )
       {
-        mGrabDisplacementX = mGrabDisplacementY = 0;
-      }
+        // Both selection handles are vertically flipped. Never are going to exceed the bottom edje of the display.
+        mHandleVerticalGreaterThanNotification.Reset();
 
-      mGrabDisplacementX += gesture.displacement.x;
-      mGrabDisplacementY += gesture.displacement.y;
+        // The vertical distance from the center of the active layer to the top edje of the display.
+        const float topHeight = 0.5f * mControlSize.height + std::max( -primaryHandle.position.y + primaryHandle.size.height, -secondaryHandle.position.y + secondaryHandle.size.height );
 
-      float x = mCursor[PRIMARY_CURSOR].x + mGrabDisplacementX;
-      float y = mCursor[PRIMARY_CURSOR].y + mCursor[PRIMARY_CURSOR].height*0.5f + mGrabDisplacementY;
+        mHandleVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                    LessThanCondition( mBoundingBox.y + topHeight ) );
 
-      if( Gesture::Started    == gesture.state ||
-          Gesture::Continuing == gesture.state )
-      {
-        mObserver.GrabHandleEvent( GRAB_HANDLE_PRESSED, x, y );
+        // Notifies the change from false to true and from true to false.
+        mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+
+        // Connects the signals with the callbacks.
+        mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
       }
-      else if( Gesture::Finished  == gesture.state ||
-               Gesture::Cancelled == gesture.state )
+      else if( !primaryHandle.verticallyFlipped && !secondaryHandle.verticallyFlipped )
       {
-        mObserver.GrabHandleEvent( GRAB_HANDLE_RELEASED, x, y );
+        // Both selection handles aren't vertically flipped. Never are going to exceed the top edje of the display.
+        mHandleVerticalLessThanNotification.Reset();
+
+        // The vertical distance from the center of the active layer to the bottom edje of the display.
+        const float bottomHeight = -0.5f * mControlSize.height + std::max( primaryHandle.position.y + primaryHandle.lineHeight + primaryHandle.size.height,
+                                                                           secondaryHandle.position.y + secondaryHandle.lineHeight + secondaryHandle.size.height );
+
+        mHandleVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                       GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
+
+        // Notifies the change from false to true and from true to false.
+        mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+
+        // Connects the signals with the callbacks.
+        mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
       }
-    }
-  }
+      else
+      {
+        // Only one of the selection handles is vertically flipped. Both vertical notifications are needed.
 
-  bool OnHandleOneTouched( Actor actor, const TouchEvent& touch )
-  {
-    // TODO
-    return false;
-  }
+        // The vertical distance from the center of the active layer to the top edje of the display.
+        const float topHeight = 0.5f * mControlSize.height + ( primaryHandle.verticallyFlipped                              ?
+                                                               -primaryHandle.position.y + primaryHandle.size.height        :
+                                                               -secondaryHandle.position.y + secondaryHandle.size.height );
 
-  bool OnHandleTwoTouched( Actor actor, const TouchEvent& touch )
-  {
-    // TODO
-    return false;
-  }
+        mHandleVerticalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                    LessThanCondition( mBoundingBox.y + topHeight ) );
 
-  /**
-   * Popup
-   */
+        // Notifies the change from false to true and from true to false.
+        mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
 
-  void CreateOrderedListOfPopupOptions()
-  {
-    mCopyPastePopup.mOrderListOfButtons.clear();
+        // Connects the signals with the callbacks.
+        mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
 
-    // Create button for each possible option using Option priority
-    ResourceImage cutIcon = ResourceImage::New( OPTION_ICON_CUT );
-    mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsCut, mCopyPastePopup.mCutOptionPriority, OPTION_CUT, GET_LOCALE_TEXT("IDS_COM_BODY_CUT"), cutIcon, true ) );
+        // The vertical distance from the center of the active layer to the bottom edje of the display.
+        const float bottomHeight = -0.5f * mControlSize.height + ( primaryHandle.verticallyFlipped                                                       ?
+                                                                   secondaryHandle.position.y + secondaryHandle.lineHeight + secondaryHandle.size.height :
+                                                                   primaryHandle.position.y + primaryHandle.lineHeight + primaryHandle.size.height );
 
-    ResourceImage copyIcon = ResourceImage::New( OPTION_ICON_COPY );
-    mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsCopy, mCopyPastePopup.mCopyOptionPriority, OPTION_COPY, GET_LOCALE_TEXT("IDS_COM_BODY_COPY"), copyIcon, true ) );
+        mHandleVerticalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                       GreaterThanCondition( mBoundingBox.w - bottomHeight ) );
 
-    ResourceImage pasteIcon = ResourceImage::New( OPTION_ICON_PASTE );
-    mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsPaste, mCopyPastePopup.mPasteOptionPriority, OPTION_PASTE, GET_LOCALE_TEXT("IDS_COM_BODY_PASTE"), pasteIcon, true ) );
+        // Notifies the change from false to true and from true to false.
+        mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
 
-    ResourceImage selectIcon = ResourceImage::New( OPTION_ICON_SELECT );
-    mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsSelect, mCopyPastePopup.mSelectOptionPriority, OPTION_SELECT_WORD, GET_LOCALE_TEXT("IDS_COM_SK_SELECT"), selectIcon, true ) );
+        // Connects the signals with the callbacks.
+        mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+      }
+    }
 
-    ResourceImage selectAllIcon = ResourceImage::New( OPTION_ICON_SELECT_ALL );
-    mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsSelectAll, mCopyPastePopup.mSelectAllOptionPriority, OPTION_SELECT_ALL, GET_LOCALE_TEXT("IDS_COM_BODY_SELECT_ALL"), selectAllIcon, true ) );
+    // Horizontal notifications.
 
-    ResourceImage clipboardIcon = ResourceImage::New( OPTION_ICON_CLIPBOARD );
-    mCopyPastePopup.mOrderListOfButtons.push_back( ButtonRequirement( ButtonsClipboard, mCopyPastePopup.mClipboardOptionPriority, OPTION_CLIPBOARD, GET_LOCALE_TEXT("IDS_COM_BODY_CLIPBOARD"), clipboardIcon, true ) );
+    // Disconnect any previous connected callback.
+    if( mHandleHorizontalLessThanNotification )
+    {
+      mHandleHorizontalLessThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+      mActiveLayer.RemovePropertyNotification( mHandleHorizontalLessThanNotification );
+    }
 
-    // Sort the buttons according their priorities.
-    std::sort( mCopyPastePopup.mOrderListOfButtons.begin(), mCopyPastePopup.mOrderListOfButtons.end(), PriorityCompare );
-  }
+    if( mHandleHorizontalGreaterThanNotification )
+    {
+      mHandleHorizontalGreaterThanNotification.NotifySignal().Disconnect( this, &Decorator::Impl::HandleResetPosition );
+      mActiveLayer.RemovePropertyNotification( mHandleHorizontalGreaterThanNotification );
+    }
 
-  void CreateBackground( PopupImpl& popup )
-  {
-    // Create background-panel if not already created (required if we have at least one option)
-    if ( !popup.mBackground )
+    if( primaryHandle.active || secondaryHandle.active )
     {
-      ResourceImage bgImg = ResourceImage::New( POPUP_BACKGROUND );
-      popup.mBackground = ImageActor::New( bgImg );
-      popup.mBackground.SetColor( popup.mBackgroundColor );
-      popup.mBackground.SetParentOrigin( ParentOrigin::CENTER );
+      // The horizontal distance from the center of the active layer to the left edje of the display.
+      const float leftWidth = 0.5f * mControlSize.width + std::max( -primaryHandle.position.x + primaryHandle.size.width,
+                                                                    -secondaryHandle.position.x + secondaryHandle.size.width );
 
-      NinePatchImage backgroundImageNinePatch = NinePatchImage::DownCast( bgImg );
-      if( backgroundImageNinePatch )
-      {
-        const Size ninePatchImageSize = Size( static_cast<float>( bgImg.GetWidth() ), static_cast<float>( bgImg.GetHeight() ) );
-        Rect<int> childRect = backgroundImageNinePatch.GetChildRectangle();
-
-        // -1u because of the cropping.
-        popup.mNinePatchMargins.x = childRect.x - 1u;
-        popup.mNinePatchMargins.y = ninePatchImageSize.width - ( childRect.x + childRect.width ) - 1u;
-        popup.mNinePatchMargins.z = childRect.y - 1u;
-        popup.mNinePatchMargins.w = ninePatchImageSize.height - ( childRect.y + childRect.height ) - 1u;
-      }
+      mHandleHorizontalLessThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_X,
+                                                                                    LessThanCondition( mBoundingBox.x + leftWidth ) );
 
-      ResourceImage::Image bgEffectImg = ResourceImage::New( POPUP_BACKGROUND_EFFECT );
-      ImageActor backgroundEffect = ImageActor::New( bgEffectImg );
-      backgroundEffect.SetParentOrigin( ParentOrigin::CENTER );
+      // Notifies the change from false to true and from true to false.
+      mHandleHorizontalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
 
-      ResourceImage::Image bgLine = ResourceImage::New( POPUP_BACKGROUND_LINE );
-      ImageActor backgroundLine = ImageActor::New( bgLine );
-      backgroundLine.SetParentOrigin( ParentOrigin::CENTER );
-      backgroundLine.SetColor( popup.mLineColor );
+      // Connects the signals with the callbacks.
+      mHandleHorizontalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
 
-      popup.mBackground.Add( backgroundEffect );
-      popup.mBackground.Add( backgroundLine );
-    }
-  }
+      // The horizontal distance from the center of the active layer to the right edje of the display.
+      const float rightWidth = -0.5f * mControlSize.width + std::max( primaryHandle.position.x + primaryHandle.size.width,
+                                                                      secondaryHandle.position.x + secondaryHandle.size.width );
 
-  void AddOption( Actor& parent, const std::string& name, const std::string& caption, const Image iconImage, bool finalOption, bool showIcons )
-  {
-    // 1. Create the backgrounds for the popup option both normal and pressed.
-    // Both containers will be added to a button.
-    Actor optionContainer = Actor::New();
-    optionContainer.SetDrawMode( DrawMode::OVERLAY );
-    //optionContainer.SetParentOrigin( ParentOrigin::CENTER );
-    optionContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+      mHandleHorizontalGreaterThanNotification = mActiveLayer.AddPropertyNotification( Actor::Property::WORLD_POSITION_X,
+                                                                                       GreaterThanCondition( mBoundingBox.z - rightWidth ) );
 
-    ImageActor optionPressedContainer = Toolkit::CreateSolidColorActor( mCopyPastePopup.mBackgroundPressedColor );
-    optionPressedContainer.SetDrawMode( DrawMode::OVERLAY );
-    //optionPressedContainer.SetParentOrigin( ParentOrigin::CENTER );
-    optionPressedContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+      // Notifies the change from false to true and from true to false.
+      mHandleHorizontalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
 
-    // 2. Add text.
-    Toolkit::TextLabel captionTextLabel = Toolkit::TextLabel::New();
-    captionTextLabel.SetProperty( TextLabel::Property::TEXT, caption );
-    optionContainer.Add( captionTextLabel );
+      // Connects the signals with the callbacks.
+      mHandleHorizontalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition );
+    }
+  }
 
-    Toolkit::TextLabel pressedCaptionTextLabel = Toolkit::TextLabel::New();
-    pressedCaptionTextLabel.SetProperty( TextLabel::Property::TEXT, caption );
-    optionPressedContainer.Add( pressedCaptionTextLabel );
+  // Popup
 
-    // Calculates the icon/text position.
-    float iconTextOffsetY = 0.0f;
+  float AlternatePopUpPositionRelativeToCursor( bool topBottom )
+  {
+    float alternativePosition = 0.0f;
 
-    if ( showIcons )
-    {
-      // 3. Create the icons
-      ImageActor pressedIcon = ImageActor::New(  iconImage );
-      ImageActor icon = ImageActor::New(  iconImage );
+    const float halfPopupHeight = 0.5f * mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
 
-      optionContainer.Add( icon );
-      optionPressedContainer.Add( pressedIcon );
+    const HandleImpl& primaryHandle = mHandle[LEFT_SELECTION_HANDLE];
+    const HandleImpl& secondaryHandle = mHandle[RIGHT_SELECTION_HANDLE];
+    const HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
+    const CursorImpl& cursor = mCursor[PRIMARY_CURSOR];
 
-      iconTextOffsetY = 0.5f * ( ( DEFAULT_POPUP_MAX_SIZE.height - mCopyPastePopup.mNinePatchMargins.z - mCopyPastePopup.mNinePatchMargins.w ) - ( OPTION_ICON_SIZE.height + OPTION_GAP_ICON_TEXT + OPTION_TEXT_LINE_HEIGHT ) );
+    if( primaryHandle.active || secondaryHandle.active )
+    {
+      float handleY = 0.f;
+      float maxHandleHeight = 0.f;
 
-      icon.SetParentOrigin( ParentOrigin::TOP_CENTER );
-      icon.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-      icon.SetY( iconTextOffsetY );
+      const bool primaryVisible = primaryHandle.horizontallyVisible && primaryHandle.verticallyVisible;
+      const bool secondaryVisible = secondaryHandle.horizontallyVisible && secondaryHandle.verticallyVisible;
 
-      pressedIcon.SetParentOrigin( ParentOrigin::TOP_CENTER );
-      pressedIcon.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-      pressedIcon.SetY( iconTextOffsetY );
+      if( primaryVisible && secondaryVisible )
+      {
+        handleY = std::max( primaryHandle.position.y, secondaryHandle.position.y );
+        maxHandleHeight = std::max( primaryHandle.size.height, secondaryHandle.size.height );
+      }
+      else if( primaryVisible && !secondaryVisible )
+      {
+        handleY = primaryHandle.position.y;
+        maxHandleHeight = primaryHandle.size.height;
+      }
+      else if( !primaryVisible && secondaryVisible )
+      {
+        handleY = secondaryHandle.position.y;
+        maxHandleHeight = secondaryHandle.size.height;
+      }
 
-      // Layout icon + gap + text
-      captionTextLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
-      pressedCaptionTextLabel.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
-      pressedCaptionTextLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-      captionTextLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-      pressedCaptionTextLabel.SetY( -iconTextOffsetY );
-      captionTextLabel.SetY( -iconTextOffsetY );
+      alternativePosition = handleY + ( topBottom ? halfPopupHeight + maxHandleHeight + cursor.lineHeight : -halfPopupHeight - maxHandleHeight );
     }
     else
     {
-      // Centre option text
-      captionTextLabel.SetAnchorPoint( AnchorPoint::CENTER );
-      captionTextLabel.SetParentOrigin( ParentOrigin::CENTER );
-      pressedCaptionTextLabel.SetAnchorPoint( AnchorPoint::CENTER );
-      pressedCaptionTextLabel.SetParentOrigin( ParentOrigin::CENTER );
+      alternativePosition = cursor.position.y + ( topBottom ? halfPopupHeight + grabHandle.size.height + cursor.lineHeight : -halfPopupHeight - grabHandle.size.height );
     }
 
-    // Calculate the size of the text.
-    Vector3 textSize = captionTextLabel.GetNaturalSize();
-    textSize.width = std::min( textSize.width, OPTION_MAX_WIDTH - 2.f * OPTION_MARGIN_WIDTH );
+    return alternativePosition;
+  }
+
+  void PopUpLeavesTopBoundary( PropertyNotification& source )
+  {
+    const float popupHeight = mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
 
-    // Set the size to the text. Text will be ellipsized if exceeds the max width.
-    captionTextLabel.SetSize( textSize );
-    pressedCaptionTextLabel.SetSize( textSize );
+    // Sets the position of the popup below.
+    mCopyPastePopup.actor.SetY( floorf( CalculateVerticalPopUpPosition( 0.5f * popupHeight, true ) ) );
+  }
 
-    // 4. Calculate the size of option.
+  void PopUpLeavesBottomBoundary( PropertyNotification& source )
+  {
+    const float popupHeight = mCopyPastePopup.actor.GetRelayoutSize( Dimension::HEIGHT );
 
-    // The width is the max size of the text or the icon plus the margins clamped between the option min and max size.
-    // The height is the whole popup height minus the ninepatch margins.
-    const Vector2 optionSize( std::min( OPTION_MAX_WIDTH, std::max( OPTION_MIN_WIDTH, std::max( textSize.width, OPTION_ICON_SIZE.width ) + 2.f * OPTION_MARGIN_WIDTH ) ),
-                              DEFAULT_POPUP_MAX_SIZE.height - mCopyPastePopup.mNinePatchMargins.z - mCopyPastePopup.mNinePatchMargins.w );
+    // Sets the position of the popup above.
+    mCopyPastePopup.actor.SetY( floorf( CalculateVerticalPopUpPosition( 0.5f * popupHeight, false ) ) );
+  }
 
-    optionContainer.SetSize( optionSize );
-    optionPressedContainer.SetSize( optionSize );
+  void SetUpPopupPositionNotifications( const Vector3& popupHalfSize )
+  {
+    // Disconnect any previous connected callback.
+    if( mPopupTopExceedNotification )
+    {
+      mPopupTopExceedNotification.NotifySignal().Disconnect( this, &Decorator::Impl::PopUpLeavesTopBoundary );
+      mCopyPastePopup.actor.RemovePropertyNotification( mPopupTopExceedNotification );
+    }
 
-    // 5. Create a option.
-    Toolkit::PushButton option = Toolkit::PushButton::New();
-    option.SetSizePolicy( Toolkit::Control::Fixed, Toolkit::Control::Fixed );
-    option.SetSize( optionSize );
-    option.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    option.SetX( mCopyPastePopup.mContentSize.width );
-    option.SetName( name );
-    option.SetAnimationTime( 0.0f );
-    //option.ClickedSignal().Connect( this, &TextInputPopup::OnButtonPressed );
+    if( mPopupBottomExceedNotification )
+    {
+      mPopupBottomExceedNotification.NotifySignal().Disconnect( this, &Decorator::Impl::PopUpLeavesBottomBoundary );
+      mCopyPastePopup.actor.RemovePropertyNotification( mPopupBottomExceedNotification );
+    }
 
-    parent.Add( option );
+    // Note Property notifications ignore any set anchor point so conditions must allow for this.  Default is Top Left.
 
-    // 6. Set the normal option image.
-    option.SetButtonImage( optionContainer );
+    // Exceeding vertical boundary
 
-    // 7. Set the pressed option image
-    option.SetSelectedImage( optionPressedContainer );
+    mPopupTopExceedNotification = mCopyPastePopup.actor.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                 LessThanCondition( mBoundingBox.y + popupHalfSize.height ) );
 
-    // 8. Update the content size.
-    mCopyPastePopup.mContentSize.width += optionSize.width;
-    mCopyPastePopup.mContentSize.height = std::max ( optionSize.height, mCopyPastePopup.mContentSize.height );
+    mPopupBottomExceedNotification = mCopyPastePopup.actor.AddPropertyNotification( Actor::Property::WORLD_POSITION_Y,
+                                                                                    GreaterThanCondition( mBoundingBox.w - popupHalfSize.height ) );
 
-    // 9. Add the divider
-    if( !finalOption )
-    {
-      const Size size( POPUP_DIVIDER_WIDTH, mCopyPastePopup.mContentSize.height );
+    // Notifies the change from false to true and from true to false.
+    mPopupTopExceedNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+    mPopupBottomExceedNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
 
-      ImageActor divider =  Toolkit::CreateSolidColorActor( Color::WHITE );
-      divider.SetSize (size);
-      divider.SetParentOrigin( ParentOrigin::TOP_LEFT );
-      divider.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-      divider.SetPosition( mCopyPastePopup.mContentSize.width - POPUP_DIVIDER_WIDTH, 0.0f );
-      parent.Add( divider );
-    }
+    mPopupTopExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesTopBoundary );
+    mPopupBottomExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesBottomBoundary );
+  }
+
+  void SetHandleImage( HandleType handleType, HandleImageType handleImageType, Dali::Image image )
+  {
+    HandleImpl& handle = mHandle[handleType];
+    handle.size = Size( image.GetWidth(), image.GetHeight() );
+
+    mHandleImages[handleType][handleImageType] = image;
   }
 
-  void SetUpPopup( Actor& popupRootActor, Size& size )
+  void SetScrollThreshold( float threshold )
   {
-    // Create Layer and Stencil.
-    popupRootActor = Actor::New();
-    mCopyPastePopup.mStencilLayer = Layer::New();
-    ImageActor stencil = CreateSolidColorActor( Color::RED );
-    stencil.SetDrawMode( DrawMode::STENCIL );
-    stencil.SetVisible( true );
-    Actor scrollview = Actor::New();
-
-    //todo Use Size negotiation
-    mCopyPastePopup.mStencilLayer.SetSize( size ); // matches stencil size
-    popupRootActor.SetSize( size ); // matches stencil size
-    stencil.SetSize( size );
-    scrollview.SetSize( size );
-    mCopyPastePopup.mButtons.SetSize( size );
-
-    mCopyPastePopup.mStencilLayer.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-    scrollview.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-    mCopyPastePopup.mButtons.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-
-    mActiveLayer.Add( mCopyPastePopup.mRoot );
-    popupRootActor.Add( mCopyPastePopup.mBackground );
-    popupRootActor.Add( mCopyPastePopup.mStencilLayer );
-    mCopyPastePopup.mStencilLayer.Add( stencil );
-    mCopyPastePopup.mStencilLayer.Add( scrollview );
-    scrollview.Add( mCopyPastePopup.mButtons );
+    mScrollThreshold = threshold;
   }
 
-  void AddPopupOptions( bool createTail, bool showIcons )
+  float GetScrollThreshold() const
   {
-    mCopyPastePopup.mShowIcons = showIcons;
+    return mScrollThreshold;
+  }
 
-    mCopyPastePopup.mContentSize = Vector2::ZERO;
+  void SetScrollSpeed( float speed )
+  {
+    mScrollSpeed = speed;
+    mScrollDistance = speed * SCROLL_TICK_INTERVAL * TO_SECONDS;
+  }
 
-    mCopyPastePopup.mButtons = Actor::New();
+  float GetScrollSpeed() const
+  {
+    return mScrollSpeed;
+  }
 
-    // Add the options into the buttons container.
+  void NotifyEndOfScroll()
+  {
+    StopScrollTimer();
 
-    // 1. Determine how many buttons are active and should be added to container.
-    std::size_t numberOfOptions = 0u;
-    for( std::vector<ButtonRequirement>::const_iterator it = mCopyPastePopup.mOrderListOfButtons.begin(), endIt = mCopyPastePopup.mOrderListOfButtons.end(); ( it != endIt ); ++it )
+    if( mScrollTimer )
     {
-      const ButtonRequirement& button( *it );
-      if( button.enabled )
-      {
-        ++numberOfOptions;
-      }
+      mNotifyEndOfScroll = true;
     }
+  }
 
-    // 2. Iterate list of buttons and add active ones.
-    std::size_t optionsAdded = 0u;
-    for( std::vector<ButtonRequirement>::const_iterator it = mCopyPastePopup.mOrderListOfButtons.begin(), endIt = mCopyPastePopup.mOrderListOfButtons.end(); ( it != endIt ); ++it )
+  /**
+   * Creates and starts a timer to scroll the text when handles are close to the edges of the text.
+   *
+   * It only starts the timer if it's already created.
+   */
+  void StartScrollTimer()
+  {
+    if( !mScrollTimer )
     {
-      const ButtonRequirement& button( *it );
-      if ( button.enabled )
-      {
-        ++optionsAdded;
-        AddOption( mCopyPastePopup.mButtons, button.name, button.caption, button.icon, optionsAdded == numberOfOptions, mCopyPastePopup.mShowIcons );
-      }
+      mScrollTimer = Timer::New( SCROLL_TICK_INTERVAL );
+      mScrollTimer.TickSignal().Connect( this, &Decorator::Impl::OnScrollTimerTick );
     }
 
-    // Calculate the size of the whole popup which may not be all visible.
-    mCopyPastePopup.mRequiredPopUpSize = Size( std::min( mCopyPastePopup.mMaxWidth, mCopyPastePopup.mContentSize.width + mCopyPastePopup.mNinePatchMargins.x + mCopyPastePopup.mNinePatchMargins.y ), DEFAULT_POPUP_MAX_SIZE. height );
-
-    // Set the size of the background, background line and background effect.
-    mCopyPastePopup.mBackground.SetSize( mCopyPastePopup.mRequiredPopUpSize);
-    for( std::size_t index = 0u, childCount = mCopyPastePopup.mBackground.GetChildCount(); index < childCount; ++index )
+    if( !mScrollTimer.IsRunning() )
     {
-      mCopyPastePopup.mBackground.GetChildAt( index ).SetSize( mCopyPastePopup.mRequiredPopUpSize );
+      mScrollTimer.Start();
     }
-
-    // Size of the contents within the popup
-    mCopyPastePopup.mVisiblePopUpSize = Size( mCopyPastePopup.mRequiredPopUpSize.width - mCopyPastePopup.mNinePatchMargins.x - mCopyPastePopup.mNinePatchMargins.y, mCopyPastePopup.mRequiredPopUpSize.height - mCopyPastePopup.mNinePatchMargins.z - mCopyPastePopup.mNinePatchMargins.w );
-
   }
 
-  void CreatePopup()
+  /**
+   * Stops the timer used to scroll the text.
+   */
+  void StopScrollTimer()
   {
-    if ( !mCopyPastePopup.mRoot )
+    if( mScrollTimer )
     {
-      mActiveCopyPastePopup = true;
-      CreateOrderedListOfPopupOptions();  //todo Currently causes all options to be shown
-      CreateBackground( mCopyPastePopup );
-      AddPopupOptions( true, true );
-      SetUpPopup( mCopyPastePopup.mRoot, mCopyPastePopup.mVisiblePopUpSize );
+      mScrollTimer.Stop();
     }
-
-    mCopyPastePopup.mStencilLayer.RaiseToTop();
   }
 
-  void DestroyPopup()
+  /**
+   * Callback called by the timer used to scroll the text.
+   *
+   * It calculates and sets a new scroll position.
+   */
+  bool OnScrollTimerTick()
   {
-    if ( mCopyPastePopup.mRoot )
+    if( HANDLE_TYPE_COUNT != mHandleScrolling )
     {
-      mActiveCopyPastePopup = false;
-      UnparentAndReset( mCopyPastePopup.mButtons );
-      UnparentAndReset( mCopyPastePopup.mRoot );
-    }
-  }
-
-  Internal::Control& mTextControlParent;
-  Observer& mObserver;
-
-  Layer mActiveLayer; // Layer for active handles and alike that ensures they are above all else.
-
-  unsigned int mActiveCursor;
-  bool         mActiveGrabHandle;
-  bool         mActiveSelection;
-  bool         mActiveCopyPastePopup;
-
-  CursorImpl mCursor[CURSOR_COUNT];
-
-  Timer mCursorBlinkTimer; // Timer to signal cursor to blink
-  unsigned int mCursorBlinkInterval;
-  float mCursorBlinkDuration;
-  bool mCursorBlinkStatus; // Flag to switch between blink on and blink off
+      float x = 0.f;
+      float y = 0.f;
 
-  ImageActor mPrimaryCursor;
-  ImageActor mSecondaryCursor;
-
-  ImageActor mGrabHandle;
-  Actor mGrabArea;
-  float mGrabDisplacementX;
-  float mGrabDisplacementY;
-
-  SelectionHandleImpl mSelectionHandle[SELECTION_HANDLE_COUNT];
-
-  PopupImpl mCopyPastePopup;
+      switch( mScrollDirection )
+      {
+        case SCROLL_RIGHT:
+        {
+          x = mScrollDistance;
+          break;
+        }
+        case SCROLL_LEFT:
+        {
+          x = -mScrollDistance;
+          break;
+        }
+        case SCROLL_TOP:
+        {
+          y = mScrollDistance;
+          break;
+        }
+        case SCROLL_BOTTOM:
+        {
+          y = -mScrollDistance;
+          break;
+        }
+        default:
+          break;
+      }
 
-  Image mCursorImage;
-  Image mGrabHandleImage;
+      mController.DecorationEvent( mHandleScrolling,
+                                   HANDLE_SCROLLING,
+                                   x,
+                                   y );
+    }
 
-  TapGestureDetector mTapDetector;
-  PanGestureDetector mPanGestureDetector;
+    return true;
+  }
 
-  Rect<int> mBoundingBox;
+  ControllerInterface& mController;
+
+  TapGestureDetector       mTapDetector;
+  PanGestureDetector       mPanDetector;
+  LongPressGestureDetector mLongPressDetector;
+
+  Timer               mCursorBlinkTimer;          ///< Timer to signal cursor to blink
+  Timer               mScrollTimer;               ///< Timer used to scroll the text when the grab handle is moved close to the edges.
+
+  Layer                mActiveLayer;                             ///< Layer for active handles and alike that ensures they are above all else.
+  PropertyNotification mHandleVerticalLessThanNotification;      ///< Notifies when the 'y' coord of the active layer is less than a given value.
+  PropertyNotification mHandleVerticalGreaterThanNotification;   ///< Notifies when the 'y' coord of the active layer is grater than a given value.
+  PropertyNotification mHandleHorizontalLessThanNotification;    ///< Notifies when the 'x' coord of the active layer is less than a given value.
+  PropertyNotification mHandleHorizontalGreaterThanNotification; ///< Notifies when the 'x' coord of the active layer is grater than a given value.
+  PropertyNotification mPopupTopExceedNotification;              ///< Notifies when the popup leaves the bounding box through the top.
+  PropertyNotification mPopupBottomExceedNotification;           ///< Notifies when the popup leaves the bounding box through the bottom.
+  Control              mPrimaryCursor;
+  Control              mSecondaryCursor;
+
+  Actor               mHighlightActor;            ///< Actor to display highlight
+  Renderer            mHighlightRenderer;
+  Shader              mHighlightShader;           ///< Shader used for highlight
+  Property::Map       mQuadVertexFormat;
+  PopupImpl           mCopyPastePopup;
+  TextSelectionPopup::Buttons mEnabledPopupButtons; /// Bit mask of currently enabled Popup buttons
+  TextSelectionPopupCallbackInterface& mTextSelectionPopupCallbackInterface;
+
+  Image               mHandleImages[HANDLE_TYPE_COUNT][HANDLE_IMAGE_TYPE_COUNT];
+  Vector4             mHandleColor;
+
+  CursorImpl          mCursor[CURSOR_COUNT];
+  HandleImpl          mHandle[HANDLE_TYPE_COUNT];
+
+  PropertyBuffer      mQuadVertices;
+  Geometry            mQuadGeometry;
+  QuadContainer       mHighlightQuadList;         ///< Sub-selections that combine to create the complete selection highlight
+
+  Vector4             mBoundingBox;               ///< The bounding box in world coords.
+  Vector4             mHighlightColor;            ///< Color of the highlight
+  Vector2             mHighlightPosition;         ///< The position of the highlight actor.
+  Size                mHighlightSize;             ///< The size of the highlighted text.
+  Size                mControlSize;               ///< The control's size. Set by the Relayout.
+
+  unsigned int        mActiveCursor;
+  unsigned int        mCursorBlinkInterval;
+  float               mCursorBlinkDuration;
+  float               mCursorWidth;             ///< The width of the cursors in pixels.
+  HandleType          mHandleScrolling;         ///< The handle which is scrolling.
+  HandleType          mHandleReleased;          ///< The last handle released.
+  ScrollDirection     mScrollDirection;         ///< The direction of the scroll.
+  float               mScrollThreshold;         ///< Defines a square area inside the control, close to the edge. A cursor entering this area will trigger scroll events.
+  float               mScrollSpeed;             ///< The scroll speed in pixels per second.
+  float               mScrollDistance;          ///< Distance the text scrolls during a scroll interval.
+  int                 mTextDepth;               ///< The depth used to render the text.
+
+  bool                mActiveCopyPastePopup              : 1;
+  bool                mPopupSetNewPosition               : 1;
+  bool                mCursorBlinkStatus                 : 1; ///< Flag to switch between blink on and blink off.
+  bool                mDelayCursorBlink                  : 1; ///< Used to avoid cursor blinking when entering text.
+  bool                mPrimaryCursorVisible              : 1; ///< Whether the primary cursor is visible.
+  bool                mSecondaryCursorVisible            : 1; ///< Whether the secondary cursor is visible.
+  bool                mFlipSelectionHandlesOnCross       : 1; ///< Whether to flip the selection handles as soon as they cross.
+  bool                mFlipLeftSelectionHandleDirection  : 1; ///< Whether to flip the left selection handle image because of the character's direction.
+  bool                mFlipRightSelectionHandleDirection : 1; ///< Whether to flip the right selection handle image because of the character's direction.
+  bool                mIsHandlePanning                   : 1; ///< Whether any of the handles is moving.
+  bool                mIsHandleCurrentlyCrossed          : 1; ///< Whether the handles are crossed.
+  bool                mIsHandlePreviouslyCrossed         : 1; ///< Whether the handles where crossed at the last handle touch up.
+  bool                mNotifyEndOfScroll                 : 1; ///< Whether to notify the end of the scroll.
+  bool                mHorizontalScrollingEnabled        : 1; ///< Whether the horizontal scrolling is enabled.
+  bool                mVerticalScrollingEnabled          : 1; ///< Whether the vertical scrolling is enabled.
+  bool                mSmoothHandlePanEnabled            : 1; ///< Whether to pan smoothly the handles.
+  bool                mIsHighlightBoxActive              : 1; ///< Whether the highlight box is active.
 };
 
-DecoratorPtr Decorator::New( Internal::Control& parent, Observer& observer )
+DecoratorPtr Decorator::New( ControllerInterface& controller,
+                             TextSelectionPopupCallbackInterface& callbackInterface )
 {
-  return DecoratorPtr( new Decorator(parent, observer) );
+  return DecoratorPtr( new Decorator( controller,
+                                      callbackInterface ) );
 }
 
 void Decorator::SetBoundingBox( const Rect<int>& boundingBox )
 {
-  mImpl->mBoundingBox = boundingBox;
+  LocalToWorldCoordinatesBoundingBox( boundingBox, mImpl->mBoundingBox );
 }
 
-const Rect<int>& Decorator::GetBoundingBox() const
+void Decorator::GetBoundingBox( Rect<int>& boundingBox ) const
 {
-  return mImpl->mBoundingBox;
+  WorldToLocalCoordinatesBoundingBox( mImpl->mBoundingBox, boundingBox );
 }
 
 void Decorator::Relayout( const Vector2& size )
@@ -946,6 +1993,11 @@ void Decorator::Relayout( const Vector2& size )
   mImpl->Relayout( size );
 }
 
+void Decorator::UpdatePositions( const Vector2& scrollOffset )
+{
+  mImpl->UpdatePositions( scrollOffset );
+}
+
 /** Cursor **/
 
 void Decorator::SetActiveCursor( ActiveCursor activeCursor )
@@ -958,35 +2010,32 @@ unsigned int Decorator::GetActiveCursor() const
   return mImpl->mActiveCursor;
 }
 
-void Decorator::SetPosition( Cursor cursor, float x, float y, float height )
+void Decorator::SetPosition( Cursor cursor, float x, float y, float cursorHeight, float lineHeight )
 {
-  // Adjust grab handle displacement
-  mImpl->mGrabDisplacementX -= x - mImpl->mCursor[cursor].x;
-  mImpl->mGrabDisplacementY -= y - mImpl->mCursor[cursor].y;
+  Impl::CursorImpl& cursorImpl = mImpl->mCursor[cursor];
 
-  mImpl->mCursor[cursor].x = x;
-  mImpl->mCursor[cursor].y = y;
-  mImpl->mCursor[cursor].height = height;
+  cursorImpl.position.x = x;
+  cursorImpl.position.y = y;
+  cursorImpl.cursorHeight = cursorHeight;
+  cursorImpl.lineHeight = lineHeight;
 }
 
-void Decorator::GetPosition( Cursor cursor, float& x, float& y, float& height ) const
+void Decorator::GetPosition( Cursor cursor, float& x, float& y, float& cursorHeight, float& lineHeight ) const
 {
-  x = mImpl->mCursor[cursor].x;
-  y = mImpl->mCursor[cursor].y;
-  height = mImpl->mCursor[cursor].height;
-}
+  const Impl::CursorImpl& cursorImpl = mImpl->mCursor[cursor];
 
-void Decorator::SetCursorImage( Dali::Image image )
-{
-  mImpl->mCursorImage = image;
+  x = cursorImpl.position.x;
+  y = cursorImpl.position.y;
+  cursorHeight = cursorImpl.cursorHeight;
+  lineHeight = cursorImpl.lineHeight;
 }
 
-Dali::Image Decorator::GetCursorImage() const
+const Vector2& Decorator::GetPosition( Cursor cursor ) const
 {
-  return mImpl->mCursorImage;
+  return mImpl->mCursor[cursor].position;
 }
 
-void Decorator::SetColor( Cursor cursor, const Dali::Vector4& color )
+void Decorator::SetCursorColor( Cursor cursor, const Dali::Vector4& color )
 {
   mImpl->mCursor[cursor].color = color;
 }
@@ -1016,16 +2065,24 @@ void Decorator::StopCursorBlink()
   {
     mImpl->mCursorBlinkTimer.Stop();
   }
+
+  mImpl->mCursorBlinkStatus = true; // Keep cursor permanently shown
+}
+
+void Decorator::DelayCursorBlink()
+{
+  mImpl->mCursorBlinkStatus = true; // Show cursor for a bit longer
+  mImpl->mDelayCursorBlink = true;
 }
 
 void Decorator::SetCursorBlinkInterval( float seconds )
 {
-  mImpl->mCursorBlinkInterval = seconds*MILLISECONDS; // Convert to milliseconds
+  mImpl->mCursorBlinkInterval = static_cast<unsigned int>( seconds * TO_MILLISECONDS ); // Convert to milliseconds
 }
 
 float Decorator::GetCursorBlinkInterval() const
 {
-  return mImpl->mCursorBlinkInterval;
+  return static_cast<float>( mImpl->mCursorBlinkInterval ) * TO_SECONDS;
 }
 
 void Decorator::SetCursorBlinkDuration( float seconds )
@@ -1038,90 +2095,249 @@ float Decorator::GetCursorBlinkDuration() const
   return mImpl->mCursorBlinkDuration;
 }
 
-/** GrabHandle **/
-
-void Decorator::SetGrabHandleActive( bool active )
+void Decorator::SetCursorWidth( int width )
 {
-  mImpl->mActiveGrabHandle = active;
+  mImpl->mCursorWidth = static_cast<float>( width );
 }
 
-bool Decorator::IsGrabHandleActive() const
+int Decorator::GetCursorWidth() const
 {
-  return mImpl->mActiveGrabHandle;
+  return static_cast<int>( mImpl->mCursorWidth );
 }
 
-void Decorator::SetGrabHandleImage( Dali::Image image )
+/** Handles **/
+
+void Decorator::SetHandleActive( HandleType handleType, bool active )
 {
-  mImpl->mGrabHandleImage = image;
+  mImpl->mHandle[handleType].active = active;
+
+  if( !active )
+  {
+    if( ( LEFT_SELECTION_HANDLE == handleType ) || ( RIGHT_SELECTION_HANDLE == handleType ) )
+    {
+      mImpl->mIsHandlePreviouslyCrossed = false;
+    }
+
+    // TODO: this is a work-around.
+    // The problem is the handle actor does not receive the touch event with the Interrupt
+    // state when the power button is pressed and the application goes to background.
+    mImpl->mHandle[handleType].pressed = false;
+    Image imageReleased = mImpl->mHandleImages[handleType][HANDLE_IMAGE_RELEASED];
+    ImageView imageView = mImpl->mHandle[handleType].actor;
+    if( imageReleased && imageView )
+    {
+      imageView.SetImage( imageReleased );
+    }
+  }
+
 }
 
-Dali::Image Decorator::GetGrabHandleImage() const
+bool Decorator::IsHandleActive( HandleType handleType ) const
 {
-  return mImpl->mGrabHandleImage;
+  return mImpl->mHandle[handleType].active ;
 }
 
-/** Selection **/
-
-void Decorator::SetSelectionActive( bool active )
+void Decorator::SetHandleImage( HandleType handleType, HandleImageType handleImageType, Dali::Image image )
 {
-  mImpl->mActiveSelection = active;
+  mImpl->SetHandleImage( handleType, handleImageType, image );
 }
 
-bool Decorator::IsSelectionActive() const
+Dali::Image Decorator::GetHandleImage( HandleType handleType, HandleImageType handleImageType ) const
 {
-  return mImpl->mActiveSelection;
+  return mImpl->mHandleImages[handleType][handleImageType];
 }
 
-void Decorator::SetPosition( SelectionHandle handle, float x, float y, float height )
+void Decorator::SetHandleColor( const Vector4& color )
 {
-  mImpl->mSelectionHandle[handle].x = x;
-  mImpl->mSelectionHandle[handle].y = y;
-  mImpl->mSelectionHandle[handle].cursorHeight = height;
+  mImpl->mHandleColor = color;
 }
 
-void Decorator::GetPosition( SelectionHandle handle, float& x, float& y, float& height ) const
+const Vector4& Decorator::GetHandleColor() const
 {
-  x = mImpl->mSelectionHandle[handle].x;
-  y = mImpl->mSelectionHandle[handle].y;
-  height = mImpl->mSelectionHandle[handle].cursorHeight;
+  return mImpl->mHandleColor;
 }
 
-void Decorator::SetImage( SelectionHandle handle, SelectionHandleState state, Dali::Image image )
+void Decorator::SetPosition( HandleType handleType, float x, float y, float height )
 {
-  if( SELECTION_HANDLE_PRESSED == state )
-  {
-    mImpl->mSelectionHandle[handle].pressedImage = image;
-  }
-  else
+  // Adjust handle's displacement
+  Impl::HandleImpl& handle = mImpl->mHandle[handleType];
+
+  handle.position.x = x;
+  handle.position.y = y;
+  handle.lineHeight = height;
+
+  if( mImpl->mSmoothHandlePanEnabled )
   {
-    mImpl->mSelectionHandle[handle].releasedImage = image;
+    handle.grabDisplacementX = 0.f;
+    handle.grabDisplacementY = 0.f;
   }
 }
 
-Dali::Image Decorator::GetImage( SelectionHandle handle, SelectionHandleState state ) const
+void Decorator::GetPosition( HandleType handleType, float& x, float& y, float& height ) const
 {
-  if( SELECTION_HANDLE_PRESSED == state )
-  {
-    return mImpl->mSelectionHandle[handle].pressedImage;
-  }
+  Impl::HandleImpl& handle = mImpl->mHandle[handleType];
 
-  return mImpl->mSelectionHandle[handle].releasedImage;
+  x = handle.position.x;
+  y = handle.position.y;
+  height = handle.lineHeight;
 }
 
-void Decorator::ShowPopup()
+const Vector2& Decorator::GetPosition( HandleType handleType ) const
 {
-  if ( !mImpl->mCopyPastePopup.mRoot )
-  {
-    mImpl->CreatePopup();
-  }
+  return mImpl->mHandle[handleType].position;
+}
+
+void Decorator::FlipHandleVertically( HandleType handleType, bool flip )
+{
+  mImpl->mHandle[handleType].verticallyFlippedPreferred = flip;
+}
+
+bool Decorator::IsHandleVerticallyFlipped( HandleType handleType ) const
+{
+  return mImpl->mHandle[handleType].verticallyFlippedPreferred;
+}
+
+void Decorator::FlipSelectionHandlesOnCrossEnabled( bool enable )
+{
+  mImpl->mFlipSelectionHandlesOnCross = enable;
+}
+
+void Decorator::SetSelectionHandleFlipState( bool indicesSwapped, bool left, bool right )
+{
+  mImpl->mIsHandleCurrentlyCrossed = indicesSwapped;
+  mImpl->mFlipLeftSelectionHandleDirection = left;
+  mImpl->mFlipRightSelectionHandleDirection = right;
+}
+
+void Decorator::AddHighlight( float x1, float y1, float x2, float y2 )
+{
+  mImpl->mHighlightQuadList.push_back( QuadCoordinates(x1, y1, x2, y2) );
+}
+
+void Decorator::SetHighLightBox( const Vector2& position, const Size& size )
+{
+  mImpl->mHighlightPosition = position;
+  mImpl->mHighlightSize = size;
+}
+
+void Decorator::ClearHighlights()
+{
+  mImpl->mHighlightQuadList.clear();
+  mImpl->mHighlightPosition = Vector2::ZERO;
+}
+
+void Decorator::SetHighlightColor( const Vector4& color )
+{
+  mImpl->mHighlightColor = color;
+}
+
+const Vector4& Decorator::GetHighlightColor() const
+{
+  return mImpl->mHighlightColor;
+}
+
+void Decorator::SetHighlightActive( bool active )
+{
+  mImpl->mIsHighlightBoxActive = active;
+}
+
+bool Decorator::IsHighlightActive() const
+{
+  return mImpl->mIsHighlightBoxActive;
+}
+
+void Decorator::SetTextDepth( int textDepth )
+{
+  mImpl->mTextDepth = textDepth;
+}
+
+void Decorator::SetPopupActive( bool active )
+{
+  mImpl->mActiveCopyPastePopup = active;
 }
 
-void Decorator::HidePopup()
+bool Decorator::IsPopupActive() const
 {
-  if ( mImpl->mCopyPastePopup.mRoot )
+  return mImpl->mActiveCopyPastePopup;
+}
+
+void Decorator::SetEnabledPopupButtons( TextSelectionPopup::Buttons& enabledButtonsBitMask )
+{
+  mImpl->mEnabledPopupButtons = enabledButtonsBitMask;
+
+  if ( !mImpl->mCopyPastePopup.actor )
   {
-    mImpl->DestroyPopup();
+    mImpl->mCopyPastePopup.actor = TextSelectionPopup::New( &mImpl->mTextSelectionPopupCallbackInterface );
+#ifdef DECORATOR_DEBUG
+    mImpl->mCopyPastePopup.actor.SetName("mCopyPastePopup");
+#endif
+    mImpl->mCopyPastePopup.actor.SetAnchorPoint( AnchorPoint::CENTER );
+    mImpl->mCopyPastePopup.actor.OnRelayoutSignal().Connect( mImpl, &Decorator::Impl::SetPopupPosition ); // Position popup after size negotiation
   }
+
+  mImpl->mCopyPastePopup.actor.EnableButtons( mImpl->mEnabledPopupButtons );
+}
+
+TextSelectionPopup::Buttons& Decorator::GetEnabledPopupButtons()
+{
+  return mImpl->mEnabledPopupButtons;
+}
+
+/** Scroll **/
+
+void Decorator::SetScrollThreshold( float threshold )
+{
+  mImpl->SetScrollThreshold( threshold );
+}
+
+float Decorator::GetScrollThreshold() const
+{
+  return mImpl->GetScrollThreshold();
+}
+
+void Decorator::SetScrollSpeed( float speed )
+{
+  mImpl->SetScrollSpeed( speed );
+}
+
+float Decorator::GetScrollSpeed() const
+{
+  return mImpl->GetScrollSpeed();
+}
+
+void Decorator::NotifyEndOfScroll()
+{
+  mImpl->NotifyEndOfScroll();
+}
+
+void Decorator::SetHorizontalScrollEnabled( bool enable )
+{
+  mImpl->mHorizontalScrollingEnabled = enable;
+}
+
+bool Decorator::IsHorizontalScrollEnabled() const
+{
+  return mImpl->mHorizontalScrollingEnabled;
+}
+
+void Decorator::SetVerticalScrollEnabled( bool enable )
+{
+  mImpl->mVerticalScrollingEnabled = enable;
+}
+
+bool Decorator::IsVerticalScrollEnabled() const
+{
+  return mImpl->mVerticalScrollingEnabled;
+}
+
+void Decorator::SetSmoothHandlePanEnabled( bool enable )
+{
+  mImpl->mSmoothHandlePanEnabled = enable;
+}
+
+bool Decorator::IsSmoothHandlePanEnabled() const
+{
+  return mImpl->mSmoothHandlePanEnabled;
 }
 
 Decorator::~Decorator()
@@ -1129,10 +2345,11 @@ Decorator::~Decorator()
   delete mImpl;
 }
 
-Decorator::Decorator( Dali::Toolkit::Internal::Control& parent, Observer& observer )
+Decorator::Decorator( ControllerInterface& controller,
+                      TextSelectionPopupCallbackInterface& callbackInterface )
 : mImpl( NULL )
 {
-  mImpl = new Decorator::Impl( parent, observer );
+  mImpl = new Decorator::Impl( controller, callbackInterface );
 }
 
 } // namespace Text