Change cursor parent from Layer to Actor
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-selection-popup-impl.cpp
index 1633dc9..6631898 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 #include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
 
 // EXTERNAL INCLUDES
+#if defined(__GLIBC__)
 #include <libintl.h>
+#endif
+#include <string.h>
 #include <cfloat>
 #include <dali/public-api/animation/animation.h>
-#include <dali/public-api/images/nine-patch-image.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/object/property-map.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-controls/text-label.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/buttons/button-devel.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.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>
+#include <dali-toolkit/internal/helpers/color-conversion.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 namespace Dali
 {
@@ -46,10 +54,11 @@ namespace Internal
 
 namespace
 {
-// todo Move this to adaptor??
+#if defined(__GLIBC__)
 #define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
+#endif
 
-const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "textselectionpopupbutton" );
+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)
@@ -83,6 +92,9 @@ const char* const OPTION_COPY("optionCopy");
 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 );
@@ -109,6 +121,7 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popupPressedColor", VE
 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()
 
@@ -164,38 +177,32 @@ void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index,
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-        impl.SetButtonImage( Toolkit::TextSelectionPopup::CLIPBOARD, 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.SetButtonImage( Toolkit::TextSelectionPopup::CUT, 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.SetButtonImage( Toolkit::TextSelectionPopup::COPY, 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.SetButtonImage( Toolkit::TextSelectionPopup::PASTE, 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.SetButtonImage( Toolkit::TextSelectionPopup::SELECT, 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.SetButtonImage( Toolkit::TextSelectionPopup::SELECT_ALL, image );
+        impl.SetButtonImage( Toolkit::TextSelectionPopup::SELECT_ALL, value.Get< std::string >() );
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR:
@@ -228,6 +235,12 @@ void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index,
         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
 }
@@ -266,56 +279,32 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
       {
-        ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::CLIPBOARD ) );
-        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.GetButtonImage( Toolkit::TextSelectionPopup::CUT ) );
-        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.GetButtonImage( Toolkit::TextSelectionPopup::COPY ) );
-        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.GetButtonImage( Toolkit::TextSelectionPopup::PASTE ) );
-        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.GetButtonImage( Toolkit::TextSelectionPopup::SELECT ) );
-        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.GetButtonImage( Toolkit::TextSelectionPopup::SELECT_ALL ) );
-        if( image )
-        {
-          value = image.GetUrl();
-        }
+        value = impl.GetButtonImage( Toolkit::TextSelectionPopup::SELECT_ALL );
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE:
@@ -333,6 +322,17 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I
         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 )
+        {
+          visual.CreatePropertyMap( map );
+        }
+        value = map;
+        break;
+      }
     } // switch
   }
   return value;
@@ -344,7 +344,7 @@ void TextSelectionPopup::EnableButtons( Toolkit::TextSelectionPopup::Buttons but
   mButtonsChanged = true;
 }
 
-void TextSelectionPopup::RaiseAbove( Layer target )
+void TextSelectionPopup::RaiseAbove( Actor target )
 {
   if( mToolbar )
   {
@@ -388,15 +388,6 @@ void TextSelectionPopup::OnInitialize()
   self.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
 }
 
-void TextSelectionPopup::OnStageConnection( int depth )
-{
-  DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::OnStageConnection\n" );
-  // Call the Control::OnStageConnection() to set the depth of the background.
-  Control::OnStageConnection( depth );
-
-  // TextSelectionToolbar::OnStageConnection() will set the depths of all the popup's components.
-}
-
 void TextSelectionPopup::HideAnimationFinished( Animation& animation )
 {
   Actor self = Self();
@@ -504,7 +495,7 @@ void TextSelectionPopup::SetDimensionToCustomise( const PopupCustomisations& set
   } // switch
 }
 
-Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise )
+Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise ) const
 {
   switch( settingToCustomise )
   {
@@ -536,89 +527,90 @@ Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& set
   return Size::ZERO;
 }
 
-void TextSelectionPopup::SetButtonImage( Toolkit::TextSelectionPopup::Buttons button, Dali::Image image )
+void TextSelectionPopup::SetButtonImage( Toolkit::TextSelectionPopup::Buttons button, const std::string& image )
 {
    switch ( button )
    {
-   break;
-   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" );
-   }
+     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
 }
 
-Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::Buttons button )
+const std::string& TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::Buttons button ) const
 {
   switch ( button )
   {
-  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;
-  default :
-  {
-    DALI_ASSERT_DEBUG( "TextSelectionPopup GetPopupImage Unknown Button" );
-  }
+    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
 
-  return Dali::Image();
+  DALI_ASSERT_DEBUG( "TextSelectionPopup GetPopupImage Unknown Button" );
+  static std::string empty;
+  return empty;
 }
 
 void TextSelectionPopup::SetPressedImage( const std::string& filename )
@@ -637,12 +629,12 @@ std::string TextSelectionPopup::GetPressedImage() const
    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 , mCutIconImage, 0 != ( mEnabledButtons & Toolkit::TextSelectionPopup::CUT)  ) );
-   mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::COPY, mCopyOptionPriority, OPTION_COPY, POPUP_COPY_STRING, mCopyIconImage, 0 != ( mEnabledButtons & Toolkit::TextSelectionPopup::COPY)  ) );
-   mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::PASTE, mPasteOptionPriority, OPTION_PASTE, POPUP_PASTE_STRING, mPasteIconImage, 0 != ( mEnabledButtons & Toolkit::TextSelectionPopup::PASTE)  ) );
-   mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::SELECT, mSelectOptionPriority, OPTION_SELECT_WORD, POPUP_SELECT_STRING, mSelectIconImage, 0 != ( mEnabledButtons & Toolkit::TextSelectionPopup::SELECT)  ) );
-   mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::SELECT_ALL, mSelectAllOptionPriority, OPTION_SELECT_ALL, POPUP_SELECT_ALL_STRING, mSelectAllIconImage, 0 != ( mEnabledButtons & Toolkit::TextSelectionPopup::SELECT_ALL)  ) );
-   mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::CLIPBOARD, mClipboardOptionPriority, OPTION_CLIPBOARD, POPUP_CLIPBOARD_STRING, mClipboardIconImage, 0 != ( mEnabledButtons & Toolkit::TextSelectionPopup::CLIPBOARD)  ) );
+   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() );
@@ -654,8 +646,7 @@ std::string TextSelectionPopup::GetPressedImage() const
    DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::AddOption\n" );
 
    Toolkit::PushButton option = Toolkit::PushButton::New();
-   option.SetName( button.name );
-   option.SetAnimationTime( 0.0f );
+   option.SetProperty( Dali::Actor::Property::NAME, button.name );
    option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
 
    switch( button.id )
@@ -705,26 +696,31 @@ std::string TextSelectionPopup::GetPressedImage() const
 
      // Label properties.
      Property::Map buttonLabelProperties;
-     buttonLabelProperties.Insert( "text", button.caption );
+     buttonLabelProperties.Insert( Toolkit::TextVisual::Property::TEXT, button.caption );
      option.SetProperty( Toolkit::Button::Property::LABEL, buttonLabelProperties );
    }
    if( showIcons )
    {
      option.SetProperty( Toolkit::PushButton::Property::ICON_PADDING, Vector4( 10.0f, 10.0f, 10.0f, 10.0f ) );
-     option.SetProperty( Toolkit::PushButton::Property::ICON_ALIGNMENT, "TOP" );
+     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::PushButton::Property::SELECTED_ICON, button.icon );
-     //option.SetProperty( Toolkit::PushButton::Property::UNSELECTED_ICON, button.icon );
+     //option.SetProperty(  Toolkit::Button::Property::SELECTED_VISUAL, button.icon );
+     //option.SetProperty(  Toolkit::Button::Property::UNSELECTED_VISUAL, button.icon );
    }
 
    // 3. Set the normal option image (blank / Transparent).
-   option.SetUnselectedImage( "" );
+   option.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, "" );
 
    // 4. Set the pressed option image.
-   // The image can be blank, the color can be used regardless.
-   option.SetSelectedImage( mPressedImage );
-   option.SetProperty( Toolkit::Button::Property::SELECTED_COLOR, mPressedColor );
+   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
@@ -737,16 +733,16 @@ std::string TextSelectionPopup::GetPressedImage() const
 
      Toolkit::Control divider = Toolkit::Control::New();
 #ifdef DECORATOR_DEBUG
-     divider.SetName("Text's popup divider");
+     divider.SetProperty( Dali::Actor::Property::NAME,"Text's popup divider");
 #endif
-     divider.SetSize( size );
+     divider.SetProperty( Actor::Property::SIZE, size );
      divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
      divider.SetBackgroundColor( mDividerColor  );
      mToolbar.AddDivider( divider );
    }
  }
 
- std::size_t TextSelectionPopup::GetNumberOfEnabledOptions()
+ 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 )
@@ -778,13 +774,28 @@ std::string TextSelectionPopup::GetPressedImage() const
      {
        mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mPopupMaxSize );
      }
-     mToolbar.SetParentOrigin( ParentOrigin::CENTER );
+     mToolbar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
 #ifdef DECORATOR_DEBUG
-     mToolbar.SetName("TextSelectionToolbar");
+     mToolbar.SetProperty( Dali::Actor::Property::NAME,"TextSelectionToolbar");
 #endif
      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;
@@ -797,10 +808,31 @@ std::string TextSelectionPopup::GetPressedImage() const
        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( TextSelectionPopupCallbackInterface* callbackInterface )
-: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
   mToolbar(),
   mPopupMaxSize(),
   mOptionMaxSize(),
@@ -836,5 +868,3 @@ TextSelectionPopup::~TextSelectionPopup()
 } // namespace Toolkit
 
 } // namespace Dali
-
-