Merge "Add APIs of webview settings." into devel/master
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-selection-popup-impl.cpp
index d66a70a..bccfe84 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
 
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/buttons/push-button.h>
-#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-
 // EXTERNAL INCLUDES
-#include <dali/public-api/images/nine-patch-image.h>
-#include <dali/public-api/images/resource-image.h>
+#if defined(__GLIBC__)
+#include <libintl.h>
+#endif
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/animation/animation.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/math/vector4.h>
-#include <libintl.h>
+#include <dali/public-api/object/property-map.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <string.h>
 #include <cfloat>
 
-// todo Move this to adaptor??
-#define GET_LOCALE_TEXT(string) dgettext("elementary", string)
+// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/internal/helpers/color-conversion.h>
+#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace
 {
-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( 0.5f, 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 DEFAULT_POPUP_BACKGROUND_IMAGE( DALI_IMAGE_DIR "popup_bubble_bg.#.png" );
-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( 450.0f, 100.0f ); ///< The maximum size of the popup.
-
-const Dali::Vector2 OPTION_ICON_SIZE( 65.0f, 65.0f );       ///< The size of the icon.
-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( 110.0f );          ///< The maximum width of the option   //todo Make Property
-const float OPTION_MIN_WIDTH( 86.0f );           ///< The minimum width of the option. //todo Make Property
-const float POPUP_DIVIDER_WIDTH( 3.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.
+#if defined(__GLIBC__)
+#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
+#endif
 
-} // namespace
+const std::string   TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME("TextSelectionPopupButton");
+const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR(Dali::Vector4(0.24f, 0.72f, 0.8f, 1.0f));
+
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS");
+#endif
+
+#ifdef DGETTEXT_ENABLED
 
-//// Comparison function for ButtonRequirement Priority
-//bool TextSelectionPopup::PriorityCompare( ButtonRequirement const& a, ButtonRequirement const& b )
-//{
-//  return a.priority < b.priority;
-//}
+#define POPUP_CUT_STRING GET_LOCALE_TEXT("IDS_COM_BODY_CUT")
+#define POPUP_COPY_STRING GET_LOCALE_TEXT("IDS_COM_BODY_COPY")
+#define POPUP_PASTE_STRING GET_LOCALE_TEXT("IDS_COM_BODY_PASTE")
+#define POPUP_SELECT_STRING GET_LOCALE_TEXT("IDS_COM_SK_SELECT")
+#define POPUP_SELECT_ALL_STRING GET_LOCALE_TEXT("IDS_COM_BODY_SELECT_ALL")
+#define POPUP_CLIPBOARD_STRING GET_LOCALE_TEXT("IDS_COM_BODY_CLIPBOARD")
 
+#else
 
-Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New()
+#define POPUP_CUT_STRING "Cut"
+#define POPUP_COPY_STRING "Copy"
+#define POPUP_PASTE_STRING "Paste"
+#define POPUP_SELECT_STRING "Select"
+#define POPUP_SELECT_ALL_STRING "Select All"
+#define POPUP_CLIPBOARD_STRING "Clipboard"
+
+#endif
+
+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("optionCut");                   // "Cut" popup option.
+const char* const OPTION_COPY("optionCopy");                 // "Copy" popup option.
+const char* const OPTION_PASTE("optionPaste");               // "Paste" popup option.
+const char* const OPTION_CLIPBOARD("optionClipboard");       // "Clipboard" popup option.
+
+const std::string IDS_LTR("IDS_LTR");
+const std::string RTL_DIRECTION("RTL");
+
+BaseHandle Create()
 {
+  return Toolkit::TextSelectionPopup::New(NULL);
+}
+
+// Setup properties, signals and actions using the type-registry.
+
+DALI_TYPE_REGISTRATION_BEGIN(Toolkit::TextSelectionPopup, Toolkit::Control, Create);
+
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupMaxSize", VECTOR2, POPUP_MAX_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupMinSize", VECTOR2, POPUP_MIN_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionMaxSize", VECTOR2, OPTION_MAX_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionMinSize", VECTOR2, OPTION_MIN_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "optionDividerSize", VECTOR2, OPTION_DIVIDER_SIZE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupClipboardButtonImage", STRING, POPUP_CLIPBOARD_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupCutButtonImage", STRING, POPUP_CUT_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupCopyButtonImage", STRING, POPUP_COPY_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPasteButtonImage", STRING, POPUP_PASTE_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupSelectButtonImage", STRING, POPUP_SELECT_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupSelectAllButtonImage", STRING, POPUP_SELECT_ALL_BUTTON_ICON_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupDividerColor", VECTOR4, POPUP_DIVIDER_COLOR)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupIconColor", VECTOR4, POPUP_ICON_COLOR)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedColor", VECTOR4, POPUP_PRESSED_COLOR)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupPressedImage", STRING, POPUP_PRESSED_IMAGE)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupFadeInDuration", FLOAT, POPUP_FADE_IN_DURATION)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "popupFadeOutDuration", FLOAT, POPUP_FADE_OUT_DURATION)
+DALI_PROPERTY_REGISTRATION(Toolkit, TextSelectionPopup, "backgroundBorder", MAP, BACKGROUND_BORDER)
+
+DALI_TYPE_REGISTRATION_END()
+
+} // namespace
+
+Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New(TextSelectionPopupCallbackInterface* callbackInterface)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextSelectionPopup::New\n");
+
   // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< TextSelectionPopup > impl = new TextSelectionPopup();
+  IntrusivePtr<TextSelectionPopup> impl = new TextSelectionPopup(callbackInterface);
 
   // Pass ownership to CustomActor handle
-  Dali::Toolkit::TextSelectionPopup handle( *impl );
+  Dali::Toolkit::TextSelectionPopup handle(*impl);
 
   // Second-phase init of the implementation
   // This can only be done after the CustomActor connection has been made...
@@ -107,145 +142,192 @@ Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New()
   return handle;
 }
 
-void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
+void TextSelectionPopup::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
 {
-  Toolkit::TextSelectionPopup selectionPopup = Toolkit::TextSelectionPopup::DownCast( Dali::BaseHandle( object ) );
+  Toolkit::TextSelectionPopup selectionPopup = Toolkit::TextSelectionPopup::DownCast(Dali::BaseHandle(object));
 
-  if( selectionPopup )
+  if(selectionPopup)
   {
-    TextSelectionPopup& impl( GetImpl( selectionPopup ) );
+    TextSelectionPopup& impl(GetImpl(selectionPopup));
 
-    switch( index )
+    switch(index)
     {
       case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE:
       {
-       impl.SetPopupMaxSize( value.Get< Vector2 >() );
-       break;
+        impl.SetDimensionToCustomise(POPUP_MAXIMUM_SIZE, value.Get<Vector2>());
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE:
+      {
+        impl.SetDimensionToCustomise(OPTION_MAXIMUM_SIZE, value.Get<Vector2>());
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE:
+      {
+        impl.SetDimensionToCustomise(OPTION_MINIMUM_SIZE, value.Get<Vector2>());
+        break;
       }
-      case Toolkit::TextSelectionPopup::Property::POPUP_BACKGROUND_IMAGE:
+      case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_BACKGROUND, image );
+        impl.SetDimensionToCustomise(OPTION_DIVIDER_SIZE, value.Get<Vector2>());
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_CLIPBOARD_BUTTON, image );
+        impl.SetButtonImage(Toolkit::TextSelectionPopup::CLIPBOARD, value.Get<std::string>());
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_CUT_BUTTON_ICON, image );
+        impl.SetButtonImage(Toolkit::TextSelectionPopup::CUT, value.Get<std::string>());
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_COPY_BUTTON_ICON, image );
+        impl.SetButtonImage(Toolkit::TextSelectionPopup::COPY, value.Get<std::string>());
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_PASTE_BUTTON_ICON, image );
+        impl.SetButtonImage(Toolkit::TextSelectionPopup::PASTE, value.Get<std::string>());
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_SELECT_BUTTON_ICON, image );
+        impl.SetButtonImage(Toolkit::TextSelectionPopup::SELECT, value.Get<std::string>());
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetPopupImage( POPUP_SELECT_ALL_BUTTON_ICON, image );
+        impl.SetButtonImage(Toolkit::TextSelectionPopup::SELECT_ALL, value.Get<std::string>());
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR:
+      {
+        impl.mDividerColor = value.Get<Vector4>();
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_ICON_COLOR:
+      {
+        impl.mIconColor = value.Get<Vector4>();
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_COLOR:
+      {
+        impl.mPressedColor = value.Get<Vector4>();
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
+      {
+        impl.SetPressedImage(value.Get<std::string>());
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION:
+      {
+        impl.mFadeInDuration = value.Get<float>();
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION:
+      {
+        impl.mFadeOutDuration = value.Get<float>();
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
+      {
+        Property::Map map = value.Get<Property::Map>();
+        impl.CreateBackgroundBorder(map);
         break;
       }
     } // switch
-  } // TextSelectionPopup
+  }   // TextSelectionPopup
 }
 
-Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::Index index )
+Property::Value TextSelectionPopup::GetProperty(BaseObject* object, Property::Index index)
 {
   Property::Value value;
 
-  Toolkit::TextSelectionPopup selectionPopup = Toolkit::TextSelectionPopup::DownCast( Dali::BaseHandle( object ) );
+  Toolkit::TextSelectionPopup selectionPopup = Toolkit::TextSelectionPopup::DownCast(Dali::BaseHandle(object));
 
-  if( selectionPopup )
+  if(selectionPopup)
   {
-    TextSelectionPopup& impl( GetImpl( selectionPopup ) );
+    TextSelectionPopup& impl(GetImpl(selectionPopup));
 
-    switch( index )
+    switch(index)
     {
       case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE:
       {
-        value = impl.GetPopupMaxSize();
+        value = impl.GetDimensionToCustomise(POPUP_MAXIMUM_SIZE);
         break;
       }
-      case Toolkit::TextSelectionPopup::Property::POPUP_BACKGROUND_IMAGE:
+      case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_BACKGROUND ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetDimensionToCustomise(OPTION_MAXIMUM_SIZE);
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE:
+      {
+        value = impl.GetDimensionToCustomise(OPTION_MINIMUM_SIZE);
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE:
+      {
+        value = impl.GetDimensionToCustomise(OPTION_DIVIDER_SIZE);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_CLIPBOARD_BUTTON ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::CLIPBOARD);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_CUT_BUTTON_ICON ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::CUT);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_COPY_BUTTON_ICON ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::COPY);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_PASTE_BUTTON_ICON ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::PASTE);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_SELECT_BUTTON_ICON ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::SELECT);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_SELECT_ALL_BUTTON_ICON ) );
-        if( image )
+        value = impl.GetButtonImage(Toolkit::TextSelectionPopup::SELECT_ALL);
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
+      {
+        value = impl.GetPressedImage();
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION:
+      {
+        value = impl.mFadeInDuration;
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION:
+      {
+        value = impl.mFadeOutDuration;
+        break;
+      }
+      case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER:
+      {
+        Property::Map         map;
+        Toolkit::Visual::Base visual = DevelControl::GetVisual(impl, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER);
+        if(visual)
         {
-          value = image.GetUrl();
+          visual.CreatePropertyMap(map);
         }
+        value = map;
         break;
       }
     } // switch
@@ -253,367 +335,537 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I
   return value;
 }
 
-void TextSelectionPopup::OnInitialize()
+void TextSelectionPopup::EnableButtons(Toolkit::TextSelectionPopup::Buttons buttonsToEnable)
 {
-  CreatePopup();
+  mEnabledButtons = buttonsToEnable;
+  mButtonsChanged = true;
 }
 
-void TextSelectionPopup::OnRelayout( const Vector2& size, RelayoutContainer& container )
+void TextSelectionPopup::RaiseAbove(Actor target)
 {
+  if(mToolbar)
+  {
+    mToolbar.RaiseAbove(target);
+  }
+}
+
+void TextSelectionPopup::ShowPopup()
+{
+  if((!mPopupShowing || mButtonsChanged) &&
+     (Toolkit::TextSelectionPopup::NONE != mEnabledButtons))
+  {
+    Actor self = Self();
+    AddPopupOptionsToToolbar(mShowIcons, mShowCaptions);
 
+    Animation animation = Animation::New(mFadeInDuration);
+    animation.AnimateTo(Property(self, Actor::Property::COLOR_ALPHA), 1.0f);
+    animation.Play();
+    mPopupShowing = true;
+  }
 }
 
-void TextSelectionPopup::SetPopupMaxSize( const Size& maxSize )
+void TextSelectionPopup::HidePopup()
 {
-  mMaxSize = maxSize;
+  if(mPopupShowing)
+  {
+    mPopupShowing       = false;
+    Actor     self      = Self();
+    Animation animation = Animation::New(mFadeOutDuration);
+    animation.AnimateTo(Property(self, Actor::Property::COLOR_ALPHA), 0.0f);
+    animation.FinishedSignal().Connect(this, &TextSelectionPopup::HideAnimationFinished);
+    animation.Play();
+  }
 }
 
-const Dali::Vector2& TextSelectionPopup::GetPopupMaxSize() const
+void TextSelectionPopup::OnInitialize()
 {
-  return mMaxSize;
+  DALI_LOG_INFO(gLogFilter, Debug::General, "TextSelectionPopup::OnInitialize\n");
+  Actor self = Self();
+  self.SetResizePolicy(ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS);
+  self.SetProperty(Actor::Property::COLOR_ALPHA, 0.0f);
+
+  DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
+    return std::unique_ptr<Dali::Accessibility::Accessible>(
+      new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true));
+  });
+
+  //Enable highightability
+  self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
 }
 
-void TextSelectionPopup::SetPopupImage( PopupParts part, Dali::Image image )
-{
-   switch ( part )
-   {
-   case POPUP_BACKGROUND :
-   {
-     mBackgroundImage = image;
-   }
-   break;
-   case POPUP_CLIPBOARD_BUTTON :
-   {
-     mClipboardIconImage  = image;
-   }
-   break;
-   case POPUP_CUT_BUTTON_ICON :
-   {
-     mCutIconImage = image;
-   }
-   break;
-   case POPUP_COPY_BUTTON_ICON :
-   {
-     mCopyIconImage = image;
-   }
-   break;
-   case POPUP_PASTE_BUTTON_ICON :
-   {
-     mPasteIconImage = image;
-   }
-   break;
-   case POPUP_SELECT_BUTTON_ICON :
-   {
-     mSelectIconImage = image;
-   }
-   break;
-   case POPUP_SELECT_ALL_BUTTON_ICON :
-   {
-     mSelectAllIconImage = image;
-   }
-   break;
-
-   } // switch
+void TextSelectionPopup::HideAnimationFinished(Animation& animation)
+{
+  Actor self = Self();
+  if(!mPopupShowing) // During the Hide/Fade animation there could be a call to Show the Popup again, mPopupShowing will be true in this case.
+  {
+    DALI_LOG_INFO(gLogFilter, Debug::General, "TextSelectionPopup::HideAnimationFinished\n");
+    UnparentAndReset(mToolbar);
+  }
 }
 
-Dali::Image TextSelectionPopup::GetPopupImage( PopupParts part )
+bool TextSelectionPopup::OnCutButtonPressed(Toolkit::Button button)
 {
-  switch ( part )
+  if(mCallbackInterface)
   {
-  case POPUP_BACKGROUND :
+    mCallbackInterface->TextPopupButtonTouched(Toolkit::TextSelectionPopup::CUT);
+  }
+
+  return true;
+}
+
+bool TextSelectionPopup::OnCopyButtonPressed(Toolkit::Button button)
+{
+  if(mCallbackInterface)
   {
-    return mBackgroundImage;
+    mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::COPY);
   }
-  break;
-  case POPUP_CLIPBOARD_BUTTON :
+
+  return true;
+}
+
+bool TextSelectionPopup::OnPasteButtonPressed(Toolkit::Button button)
+{
+  if(mCallbackInterface)
   {
-    return mClipboardIconImage;
+    mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::PASTE);
   }
-  break;
-  case POPUP_CUT_BUTTON_ICON :
+
+  return true;
+}
+
+bool TextSelectionPopup::OnSelectButtonPressed(Toolkit::Button button)
+{
+  if(mCallbackInterface)
   {
-    return mCutIconImage;
+    mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::SELECT);
   }
-  break;
-  case POPUP_COPY_BUTTON_ICON :
+
+  return true;
+}
+
+bool TextSelectionPopup::OnSelectAllButtonPressed(Toolkit::Button button)
+{
+  if(mCallbackInterface)
   {
-    return mCopyIconImage;
+    mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::SELECT_ALL);
   }
-  break;
-  case POPUP_PASTE_BUTTON_ICON :
+
+  return true;
+}
+
+bool TextSelectionPopup::OnClipboardButtonPressed(Toolkit::Button button)
+{
+  if(mCallbackInterface)
   {
-    return mPasteIconImage;
+    mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::CLIPBOARD);
   }
-  break;
-  case POPUP_SELECT_BUTTON_ICON :
+
+  return true;
+}
+
+void TextSelectionPopup::SetDimensionToCustomise(const PopupCustomisations& settingToCustomise, const Size& dimension)
+{
+  switch(settingToCustomise)
+  {
+    case POPUP_MAXIMUM_SIZE:
+    {
+      mPopupMaxSize = dimension;
+      if(mToolbar)
+      {
+        mToolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE, dimension);
+      }
+      break;
+    }
+    case OPTION_MAXIMUM_SIZE:
+    {
+      mOptionMaxSize = dimension;
+      // Option max size not currently currently supported
+      break;
+    }
+    case OPTION_MINIMUM_SIZE:
+    {
+      mOptionMinSize = dimension;
+      // Option min size not currently currently supported
+      break;
+    }
+    case OPTION_DIVIDER_SIZE:
+    {
+      mOptionDividerSize = dimension;
+      if(mToolbar)
+      {
+        // Resize Dividers not currently supported
+      }
+      break;
+    }
+  } // switch
+}
+
+Size TextSelectionPopup::GetDimensionToCustomise(const PopupCustomisations& settingToCustomise) const
+{
+  switch(settingToCustomise)
+  {
+    case POPUP_MAXIMUM_SIZE:
+    {
+      if(mToolbar)
+      {
+        return mToolbar.GetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE).Get<Vector2>();
+      }
+      else
+      {
+        return mPopupMaxSize;
+      }
+    }
+    case OPTION_MAXIMUM_SIZE:
+    {
+      return mOptionMaxSize;
+    }
+    case OPTION_MINIMUM_SIZE:
+    {
+      return mOptionMinSize;
+    }
+    case OPTION_DIVIDER_SIZE:
+    {
+      return mOptionDividerSize;
+    }
+  } // switch
+
+  return Size::ZERO;
+}
+
+void TextSelectionPopup::SetButtonImage(Toolkit::TextSelectionPopup::Buttons button, const std::string& image)
+{
+  switch(button)
+  {
+    case Toolkit::TextSelectionPopup::CLIPBOARD:
+    {
+      mClipboardIconImage = image;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::CUT:
+    {
+      mCutIconImage = image;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::COPY:
+    {
+      mCopyIconImage = image;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::PASTE:
+    {
+      mPasteIconImage = image;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT:
+    {
+      mSelectIconImage = image;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT_ALL:
+    {
+      mSelectAllIconImage = image;
+      break;
+    }
+    default:
+    {
+      DALI_ASSERT_DEBUG("TextSelectionPopup SetPopupImage Unknown Button");
+    }
+  } // switch
+}
+
+const std::string& TextSelectionPopup::GetButtonImage(Toolkit::TextSelectionPopup::Buttons button) const
+{
+  switch(button)
   {
-    return mSelectIconImage;
+    case Toolkit::TextSelectionPopup::CLIPBOARD:
+    {
+      return mClipboardIconImage;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::CUT:
+    {
+      return mCutIconImage;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::COPY:
+    {
+      return mCopyIconImage;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::PASTE:
+    {
+      return mPasteIconImage;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT:
+    {
+      return mSelectIconImage;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT_ALL:
+    {
+      return mSelectAllIconImage;
+      break;
+    }
+    case Toolkit::TextSelectionPopup::NONE:
+    {
+      break;
+    }
+  } // switch
+
+  DALI_ASSERT_DEBUG("TextSelectionPopup GetPopupImage Unknown Button");
+  static std::string empty;
+  return empty;
+}
+
+void TextSelectionPopup::SetPressedImage(const std::string& filename)
+{
+  mPressedImage = filename;
+}
+
+std::string TextSelectionPopup::GetPressedImage() const
+{
+  return mPressedImage;
+}
+
+void TextSelectionPopup::CreateOrderedListOfPopupOptions()
+{
+  mOrderListOfButtons.clear();
+  mOrderListOfButtons.reserve(8u);
+
+  // Create button for each possible option using Option priority
+  mOrderListOfButtons.push_back(ButtonRequirement(Toolkit::TextSelectionPopup::CUT, mCutOptionPriority, OPTION_CUT, POPUP_CUT_STRING, 0 != (mEnabledButtons & Toolkit::TextSelectionPopup::CUT)));
+  mOrderListOfButtons.push_back(ButtonRequirement(Toolkit::TextSelectionPopup::COPY, mCopyOptionPriority, OPTION_COPY, POPUP_COPY_STRING, 0 != (mEnabledButtons & Toolkit::TextSelectionPopup::COPY)));
+  mOrderListOfButtons.push_back(ButtonRequirement(Toolkit::TextSelectionPopup::PASTE, mPasteOptionPriority, OPTION_PASTE, POPUP_PASTE_STRING, 0 != (mEnabledButtons & Toolkit::TextSelectionPopup::PASTE)));
+  mOrderListOfButtons.push_back(ButtonRequirement(Toolkit::TextSelectionPopup::SELECT, mSelectOptionPriority, OPTION_SELECT_WORD, POPUP_SELECT_STRING, 0 != (mEnabledButtons & Toolkit::TextSelectionPopup::SELECT)));
+  mOrderListOfButtons.push_back(ButtonRequirement(Toolkit::TextSelectionPopup::SELECT_ALL, mSelectAllOptionPriority, OPTION_SELECT_ALL, POPUP_SELECT_ALL_STRING, 0 != (mEnabledButtons & Toolkit::TextSelectionPopup::SELECT_ALL)));
+  mOrderListOfButtons.push_back(ButtonRequirement(Toolkit::TextSelectionPopup::CLIPBOARD, mClipboardOptionPriority, OPTION_CLIPBOARD, POPUP_CLIPBOARD_STRING, 0 != (mEnabledButtons & Toolkit::TextSelectionPopup::CLIPBOARD)));
+
+  // Sort the buttons according their priorities.
+  std::sort(mOrderListOfButtons.begin(), mOrderListOfButtons.end(), TextSelectionPopup::ButtonPriorityCompare());
+}
+
+void TextSelectionPopup::AddOption(const ButtonRequirement& button, bool showDivider, bool showIcons, bool showCaption)
+{
+  // 1. Create a option.
+  DALI_LOG_INFO(gLogFilter, Debug::General, "TextSelectionPopup::AddOption\n");
+
+  Toolkit::PushButton option = Toolkit::PushButton::New();
+  option.SetProperty(Dali::Actor::Property::NAME, button.name);
+  option.SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS);
+
+  switch(button.id)
+  {
+    case Toolkit::TextSelectionPopup::CUT:
+    {
+      option.ClickedSignal().Connect(this, &TextSelectionPopup::OnCutButtonPressed);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::COPY:
+    {
+      option.ClickedSignal().Connect(this, &TextSelectionPopup::OnCopyButtonPressed);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::PASTE:
+    {
+      option.ClickedSignal().Connect(this, &TextSelectionPopup::OnPasteButtonPressed);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT:
+    {
+      option.ClickedSignal().Connect(this, &TextSelectionPopup::OnSelectButtonPressed);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::SELECT_ALL:
+    {
+      option.ClickedSignal().Connect(this, &TextSelectionPopup::OnSelectAllButtonPressed);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::CLIPBOARD:
+    {
+      option.ClickedSignal().Connect(this, &TextSelectionPopup::OnClipboardButtonPressed);
+      break;
+    }
+    case Toolkit::TextSelectionPopup::NONE:
+    {
+      // Nothing to do:
+      break;
+    }
   }
-  break;
-  case POPUP_SELECT_ALL_BUTTON_ICON :
+
+  // 2. Set the options contents.
+  if(showCaption)
   {
-    return mSelectAllIconImage;
+    // PushButton layout properties.
+    option.SetProperty(Toolkit::PushButton::Property::LABEL_PADDING, Vector4(24.0f, 24.0f, 14.0f, 14.0f));
+
+    // Label properties.
+    Property::Map buttonLabelProperties;
+    buttonLabelProperties.Insert(Toolkit::TextVisual::Property::TEXT, button.caption);
+    option.SetProperty(Toolkit::Button::Property::LABEL, buttonLabelProperties);
   }
-  break;
-  default :
+  if(showIcons)
   {
-    DALI_ASSERT_DEBUG( "Unknown Popup Part" );
+    option.SetProperty(Toolkit::PushButton::Property::ICON_PADDING, Vector4(10.0f, 10.0f, 10.0f, 10.0f));
+    option.SetProperty(Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "BOTTOM");
+
+    // TODO: This is temporarily disabled until the text-selection-popup image API is changed to strings.
+    //option.SetProperty(  Toolkit::Button::Property::SELECTED_VISUAL, button.icon );
+    //option.SetProperty(  Toolkit::Button::Property::UNSELECTED_VISUAL, button.icon );
   }
-  } // switch
 
-  return Dali::Image();
+  // 3. Set the normal option image (blank / Transparent).
+  option.SetProperty(Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, "");
+
+  // 4. Set the pressed option image.
+  Property::Value selectedBackgroundValue(mPressedImage);
+  if(mPressedImage.empty())
+  {
+    // The image can be blank, the color can be used in that case.
+    selectedBackgroundValue = Property::Value{{Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR},
+                                              {Toolkit::ColorVisual::Property::MIX_COLOR, mPressedColor}};
+  }
+  option.SetProperty(Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, selectedBackgroundValue);
+  option.SetProperty(Toolkit::Control::Property::STYLE_NAME, TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME);
+
+  // 5 Add option to tool bar
+  mToolbar.AddOption(option);
+
+  // 6. Add the divider
+  if(showDivider)
+  {
+    const Size size(mOptionDividerSize.width, 0.0f); // Height FILL_TO_PARENT
+
+    Toolkit::Control divider = Toolkit::Control::New();
+#ifdef DECORATOR_DEBUG
+    divider.SetProperty(Dali::Actor::Property::NAME, "Text's popup divider");
+#endif
+    divider.SetProperty(Actor::Property::SIZE, size);
+    divider.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT);
+    divider.SetBackgroundColor(mDividerColor);
+    mToolbar.AddDivider(divider);
+  }
 }
 
- void TextSelectionPopup::CreateOrderedListOfPopupOptions()
- {
-   mOrderListOfButtons.clear();
-
-   // Create button for each possible option using Option priority
-   if ( !mCutIconImage )
-   {
-     mCutIconImage = ResourceImage::New( OPTION_ICON_CUT );
-   }
-   mOrderListOfButtons.push_back( ButtonRequirement( ButtonsCut, mCutOptionPriority, OPTION_CUT, GET_LOCALE_TEXT("IDS_COM_BODY_CUT"), mCutIconImage, true ) );
-
-   if ( !mCopyIconImage )
-   {
-     mCopyIconImage = ResourceImage::New( OPTION_ICON_COPY );
-   }
-   mOrderListOfButtons.push_back( ButtonRequirement( ButtonsCopy, mCopyOptionPriority, OPTION_COPY, GET_LOCALE_TEXT("IDS_COM_BODY_COPY"), mCopyIconImage, true ) );
-
-   if ( !mPasteIconImage )
-   {
-     mPasteIconImage = ResourceImage::New( OPTION_ICON_PASTE );
-   }
-   mOrderListOfButtons.push_back( ButtonRequirement( ButtonsPaste, mPasteOptionPriority, OPTION_PASTE, GET_LOCALE_TEXT("IDS_COM_BODY_PASTE"), mPasteIconImage, true ) );
-
-   if ( !mSelectIconImage )
-   mSelectIconImage = ResourceImage::New( OPTION_ICON_SELECT );
-   mOrderListOfButtons.push_back( ButtonRequirement( ButtonsSelect, mSelectOptionPriority, OPTION_SELECT_WORD, GET_LOCALE_TEXT("IDS_COM_SK_SELECT"), mSelectIconImage, true ) );
-
-   if ( !mSelectAllIconImage )
-   {
-    mSelectAllIconImage = ResourceImage::New( OPTION_ICON_SELECT_ALL );
-   }
-   mOrderListOfButtons.push_back( ButtonRequirement( ButtonsSelectAll, mSelectAllOptionPriority, OPTION_SELECT_ALL, GET_LOCALE_TEXT("IDS_COM_BODY_SELECT_ALL"), mSelectAllIconImage, true ) );
-
-   if ( !mClipboardIconImage )
-   {
-     mClipboardIconImage = ResourceImage::New( OPTION_ICON_CLIPBOARD );
-   }
-   mOrderListOfButtons.push_back( ButtonRequirement( ButtonsClipboard, mClipboardOptionPriority, OPTION_CLIPBOARD, GET_LOCALE_TEXT("IDS_COM_BODY_CLIPBOARD"), mClipboardIconImage, true ) );
-
-   // Sort the buttons according their priorities.
-   std::sort( mOrderListOfButtons.begin(), mOrderListOfButtons.end(), TextSelectionPopup::ButtonPriorityCompare() );
- }
-
- void TextSelectionPopup::CreateBackground()
- {
-   if ( mBackgroundImage )
-   {
-     SetBackgroundImage (  mBackgroundImage );
-   }
-
-   SetBackgroundColor( mBackgroundColor );
- }
-
- void TextSelectionPopup::AddOption( Dali::Toolkit::TableView& parent, const std::string& name, const std::string& caption, const Image iconImage, bool finalOption, bool showIcons, bool showCaption, std::size_t& indexInTable )
- {
-   // 1. Create the backgrounds for the popup option both normal and pressed.
-   // Both containers will be added to a button.
-
-   Toolkit::TableView optionContainer = Toolkit::TableView::New( (showIcons)?2:1 , 1 );
-   optionContainer.SetDrawMode( DrawMode::OVERLAY );
-   optionContainer.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-   optionContainer.SetMinimumSize( Vector2( OPTION_MIN_WIDTH, 0 ) );
-   optionContainer.SetFitWidth( 0 );
-
-   Toolkit::TableView  optionPressedContainer = Toolkit::TableView::New( (showIcons)?2:1 , 1 );
-   optionPressedContainer.SetDrawMode( DrawMode::OVERLAY );
-   optionPressedContainer.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-   optionPressedContainer.SetMinimumSize( Vector2( OPTION_MIN_WIDTH, 0 ) );
-   optionPressedContainer.SetFitWidth( 0 );
+std::size_t TextSelectionPopup::GetNumberOfEnabledOptions() const
+{
+  std::size_t numberOfOptions = 0u;
+  for(std::vector<ButtonRequirement>::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); (it != endIt); ++it)
+  {
+    const ButtonRequirement& button(*it);
+    if(button.enabled)
+    {
+      ++numberOfOptions;
+    }
+  }
+
+  return numberOfOptions;
+}
+
+void TextSelectionPopup::AddPopupOptionsToToolbar(bool showIcons, bool showCaptions)
+{
+  DALI_LOG_INFO(gLogFilter, Debug::General, "TextSelectionPopup::AddPopupOptionsToToolbar\n");
+
+  CreateOrderedListOfPopupOptions();
+
+  mButtonsChanged = false;
+  UnparentAndReset(mToolbar);
+
+  if(!mToolbar)
+  {
+    Actor self = Self();
+    mToolbar   = Toolkit::TextSelectionToolbar::New();
+    if(mPopupMaxSize != Vector2::ZERO) // If PopupMaxSize property set then apply to Toolbar. Toolbar currently is not retriving this from json
+    {
+      mToolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mPopupMaxSize);
+    }
+    mToolbar.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
 #ifdef DECORATOR_DEBUG
-   optionContainer.SetName("optionContainer");
-   optionPressedContainer.SetName("optionPressedContainer");
+    mToolbar.SetProperty(Dali::Actor::Property::NAME, "TextSelectionToolbar");
 #endif
-   // 2. Add text.
-
-   if ( showCaption )
-   {
-   Toolkit::TextLabel captionTextLabel = Toolkit::TextLabel::New();
-   captionTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, caption );
-   optionContainer.SetFitHeight( 0 );
-
-   Toolkit::TextLabel pressedCaptionTextLabel = Toolkit::TextLabel::New();
-   pressedCaptionTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, caption );
-   optionPressedContainer.SetFitHeight( 0 );
-
-   captionTextLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
-   captionTextLabel.SetMaximumSize( Vector2( OPTION_MAX_WIDTH - 2.f * OPTION_MARGIN_WIDTH , FLT_MAX ) ); //todo FLT_MAX Size negotiation feature needed
-
-   pressedCaptionTextLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::WIDTH );
-   pressedCaptionTextLabel.SetMaximumSize( Vector2( OPTION_MAX_WIDTH - 2.f * OPTION_MARGIN_WIDTH , FLT_MAX) ); //todo FLT_MAX Size negotiation feature needed
-
-   optionContainer.AddChild( captionTextLabel, Toolkit::TableView::CellPosition( 1, 0 )  ); // todo Labels need ellipsis or similar
-   optionPressedContainer.AddChild( pressedCaptionTextLabel, Toolkit::TableView::CellPosition( 1, 0 )  ); // todo Labels need ellipsis or similar
-   }
-
-   if ( showIcons )
-   {
-     // 3. Create the icons
-     ImageActor pressedIcon = ImageActor::New(  iconImage );
-     ImageActor icon = ImageActor::New(  iconImage );
-     icon.SetName("image-icon-2014");
-     icon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-     pressedIcon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-     pressedIcon.SetColor( mIconPressedColor );
-     optionContainer.SetFitHeight( 0 );
-     optionPressedContainer.SetFitHeight( 0 );
-     optionContainer.AddChild( icon, Toolkit::TableView::CellPosition( 0, 0 )  );
-     optionPressedContainer.AddChild( pressedIcon, Toolkit::TableView::CellPosition( 0, 0 )  );
-     icon.SetPadding( Padding( 10.0f, 10.0f, 10.0f, 10.0f ) );
-     pressedIcon.SetPadding( Padding( 10.0f, 10.0f, 10.0f, 10.0f ) );
-   }
-
-   // 5. Create a option.
-   Toolkit::PushButton option = Toolkit::PushButton::New();
-   option.SetName( name );
-   option.SetAnimationTime( 0.0f );
-   option.SetSize( OPTION_ICON_SIZE );
-   //option.ClickedSignal().Connect( this, &TextInputPopup::OnButtonPressed );
-
-   // 6. Set the normal option image.
-   option.SetButtonImage( optionContainer );
-
-   // 7. Set the pressed option image
-   option.SetSelectedImage( optionPressedContainer );
-
-   // 9 Add option to table view
-   parent.SetFitWidth( indexInTable );
-   parent.AddChild( option, Toolkit::TableView::CellPosition( 0, indexInTable )  );
-   indexInTable++;
-
-   // 10. Add the divider
-   if( !finalOption )
-   {
-     const Size size( POPUP_DIVIDER_WIDTH, 0.0f ); // Height FILL_TO_PARENT
-
-     ImageActor divider = Toolkit::CreateSolidColorActor( Color::WHITE );
-
-     divider.SetSize( size );
-     divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
-     parent.SetFitWidth( indexInTable );
-     parent.AddChild( divider, Toolkit::TableView::CellPosition( 0, indexInTable )  );
-     indexInTable++;
-   }
- }
-
- void TextSelectionPopup::SetUpPopup()
- {
-   Actor self = Self();
-   self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-
-   // Create Layer and Stencil.
-   mStencilLayer = Layer::New();
-   mStencilLayer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-   mStencilLayer.SetParentOrigin( ParentOrigin::CENTER );
-
-   ImageActor stencil = CreateSolidColorActor( Color::RED );
-   stencil.SetDrawMode( DrawMode::STENCIL );
-   stencil.SetVisible( true );
-   stencil.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-   stencil.SetParentOrigin( ParentOrigin::CENTER );
-
-   Actor scrollview = Actor::New(); //todo make a scrollview
-   scrollview.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-   scrollview.SetParentOrigin( ParentOrigin::CENTER );
-
-   mTableOfButtons.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
-   mTableOfButtons.SetFitHeight( 0 );
-   mTableOfButtons.SetParentOrigin( ParentOrigin::CENTER );
-
-   mStencilLayer.Add( stencil );
-   mStencilLayer.Add( scrollview );
-   scrollview.Add( mTableOfButtons );
-   self.Add( mStencilLayer );
-   //self.Add ( mTableOfButtons );
- }
-
- void TextSelectionPopup::AddPopupOptions( bool createTail, bool showIcons, bool showCaptions )
- {
-   mContentSize = Vector2::ZERO;
-
-   // Add the options into the buttons container.
-
-   // 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 = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); ( it != endIt ); ++it )
-   {
-     const ButtonRequirement& button( *it );
-     if( button.enabled )
-     {
-       ++numberOfOptions;
-     }
-   }
-
-   // 2. Iterate list of buttons and add active ones.
-   std::size_t optionsAdded = 0u;
-
-   numberOfOptions = ( numberOfOptions*2 ) - 1 ; // Last Option does not get a divider so -1 or if only one option then also no divider
-
-   mTableOfButtons = Dali::Toolkit::TableView::New( 1, numberOfOptions );
-
-   for( std::vector<ButtonRequirement>::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); ( it != endIt ); ++it )
-   {
-     const ButtonRequirement& button( *it );
-     if ( button.enabled )
-     {
-       AddOption( mTableOfButtons, button.name, button.caption, button.icon, optionsAdded == numberOfOptions - 1, showIcons, showCaptions, optionsAdded ); // -1 to ignore the last divider
-     }
-   }
- }
-
- void TextSelectionPopup::CreatePopup()
- {
-   if ( !mStencilLayer )
-   {
-     CreateOrderedListOfPopupOptions();  //todo Currently causes all options to be shown
-     CreateBackground();
-     AddPopupOptions( true, true, false );  // todo false so not to show Labels until ellipses or similar possible.
-     SetUpPopup();
-   }
-
-   mStencilLayer.RaiseToTop();
- }
-
-TextSelectionPopup::TextSelectionPopup()
-: Control( ControlBehaviour( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) ),
-  mMaxSize ( DEFAULT_POPUP_MAX_SIZE ),
-  mVisiblePopUpSize( DEFAULT_POPUP_MAX_SIZE ),
-  mRequiredPopUpSize( DEFAULT_POPUP_MAX_SIZE ),
-  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 ),
-  mSelectOptionPriority( 1 ),
-  mSelectAllOptionPriority ( 2 ),
-  mCutOptionPriority ( 3 ),
-  mCopyOptionPriority ( 4 ),
-  mPasteOptionPriority ( 5 ),
-  mClipboardOptionPriority( 6 ),
-  mShowIcons( true ),
-  mShowCaptions( false )
+    self.Add(mToolbar);
+  }
+
+  // Whether to mirror the list of buttons (for right to left languages)
+  bool mirror = false;
+#if defined(__GLIBC__)
+  char* idsLtr = GET_LOCALE_TEXT(IDS_LTR.c_str());
+  if(NULL != idsLtr)
+  {
+    mirror = (0 == strcmp(idsLtr, RTL_DIRECTION.c_str()));
+
+    if(mirror)
+    {
+      std::reverse(mOrderListOfButtons.begin(), mOrderListOfButtons.end());
+    }
+  }
+#endif
+
+  // Iterate list of buttons and add active ones to Toolbar
+  std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions();
+  std::size_t numberOfOptionsAdded    = 0u;
+  for(std::vector<ButtonRequirement>::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); (it != endIt); ++it)
+  {
+    const ButtonRequirement& button(*it);
+    if(button.enabled)
+    {
+      numberOfOptionsAdded++;
+      AddOption(button, (numberOfOptionsAdded < numberOfOptionsRequired), showIcons, showCaptions);
+    }
+  }
+
+  if(mirror)
+  {
+    mToolbar.ScrollTo(Vector2(mPopupMaxSize.x, 0.f));
+  }
+}
+
+void TextSelectionPopup::CreateBackgroundBorder(Property::Map& propertyMap)
 {
+  // Removes previous image if necessary
+  DevelControl::UnregisterVisual(*this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER);
+
+  if(!propertyMap.Empty())
+  {
+    Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(propertyMap);
+
+    if(visual)
+    {
+      DevelControl::RegisterVisual(*this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual, DepthIndex::CONTENT);
+    }
+  }
 }
 
-TextSelectionPopup::~TextSelectionPopup()
+TextSelectionPopup::TextSelectionPopup(TextSelectionPopupCallbackInterface* callbackInterface)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+  mToolbar(),
+  mPopupMaxSize(),
+  mOptionMaxSize(),
+  mOptionMinSize(),
+  mOptionDividerSize(),
+  mEnabledButtons(Toolkit::TextSelectionPopup::NONE),
+  mCallbackInterface(callbackInterface),
+  mPressedColor(DEFAULT_OPTION_PRESSED_COLOR),
+  mDividerColor(Color::WHITE),
+  mIconColor(Color::WHITE),
+  mSelectOptionPriority(1),
+  mSelectAllOptionPriority(2),
+  mCutOptionPriority(4),
+  mCopyOptionPriority(3),
+  mPasteOptionPriority(5),
+  mClipboardOptionPriority(6),
+  mFadeInDuration(0.0f),
+  mFadeOutDuration(0.0f),
+  mShowIcons(false),
+  mShowCaptions(true),
+  mPopupShowing(false),
+  mButtonsChanged(false)
 {
 }
 
+TextSelectionPopup::~TextSelectionPopup()
+{
+}
 
 } // namespace Internal