X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-popup-impl.cpp;h=bccfe84d3ead657d76244bd9fd913df960e2678b;hp=459e53461e2f235fbb71164355e4d17668c546b6;hb=b0115c8f21708cab60e853767d353e35c8b59ebd;hpb=cd2db445fc95fed65cb9d966e672cb6976a10d0d diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index 459e534..bccfe84 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -19,43 +19,48 @@ #include // EXTERNAL INCLUDES +#if defined(__GLIBC__) #include -#include +#endif +#include #include -#include -#include #include #include #include #include -#include +#include +#include // INTERNAL INCLUDES -#include +#include #include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace Dali { - namespace Toolkit { - 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 Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) ); +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"); +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS"); #endif #ifdef DGETTEXT_ENABLED @@ -69,63 +74,66 @@ const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0 #else -#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" +#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 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 ); + 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_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::Toolkit::TextSelectionPopup TextSelectionPopup::New(TextSelectionPopupCallbackInterface* callbackInterface) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextSelectionPopup::New\n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextSelectionPopup::New\n"); - // Create the implementation, temporarily owned by this handle on stack - IntrusivePtr< TextSelectionPopup > impl = new TextSelectionPopup( callbackInterface ); + // Create the implementation, temporarily owned by this handle on stack + IntrusivePtr 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... @@ -134,190 +142,166 @@ Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New( TextSelectionPopupCal 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.SetDimensionToCustomise( POPUP_MAXIMUM_SIZE, value.Get< Vector2 >() ); - break; + impl.SetDimensionToCustomise(POPUP_MAXIMUM_SIZE, value.Get()); + break; } case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE: { - impl.SetDimensionToCustomise( OPTION_MAXIMUM_SIZE, value.Get< Vector2 >() ); + impl.SetDimensionToCustomise(OPTION_MAXIMUM_SIZE, value.Get()); break; } case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE: { - impl.SetDimensionToCustomise( OPTION_MINIMUM_SIZE, value.Get< Vector2>() ); + impl.SetDimensionToCustomise(OPTION_MINIMUM_SIZE, value.Get()); break; } case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE: { - impl.SetDimensionToCustomise( OPTION_DIVIDER_SIZE, value.Get< Vector2>() ); + impl.SetDimensionToCustomise(OPTION_DIVIDER_SIZE, value.Get()); break; } 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()); 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()); 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()); 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()); 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()); 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()); break; } case Toolkit::TextSelectionPopup::Property::POPUP_DIVIDER_COLOR: { - impl.mDividerColor = value.Get< Vector4 >(); + impl.mDividerColor = value.Get(); break; } case Toolkit::TextSelectionPopup::Property::POPUP_ICON_COLOR: { - impl.mIconColor = value.Get< Vector4 >(); + impl.mIconColor = value.Get(); break; } case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_COLOR: { - impl.mPressedColor = value.Get< Vector4 >(); + impl.mPressedColor = value.Get(); break; } case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE: { - impl.SetPressedImage( value.Get< std::string >() ); + impl.SetPressedImage(value.Get()); break; } case Toolkit::TextSelectionPopup::Property::POPUP_FADE_IN_DURATION: { - impl.mFadeInDuration = value.Get < float >(); + impl.mFadeInDuration = value.Get(); break; } case Toolkit::TextSelectionPopup::Property::POPUP_FADE_OUT_DURATION: { - impl.mFadeOutDuration = value.Get < float >(); + impl.mFadeOutDuration = value.Get(); + break; + } + case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER: + { + Property::Map map = value.Get(); + 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.GetDimensionToCustomise( POPUP_MAXIMUM_SIZE ); + value = impl.GetDimensionToCustomise(POPUP_MAXIMUM_SIZE); break; } case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE: { - value = impl.GetDimensionToCustomise( OPTION_MAXIMUM_SIZE ); + value = impl.GetDimensionToCustomise(OPTION_MAXIMUM_SIZE); break; } case Toolkit::TextSelectionPopup::Property::OPTION_MIN_SIZE: { - value = impl.GetDimensionToCustomise( OPTION_MINIMUM_SIZE ); + value = impl.GetDimensionToCustomise(OPTION_MINIMUM_SIZE); break; } case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_SIZE: { - value = impl.GetDimensionToCustomise( OPTION_DIVIDER_SIZE ); + value = impl.GetDimensionToCustomise(OPTION_DIVIDER_SIZE); break; } 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: @@ -335,35 +319,46 @@ 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; } -void TextSelectionPopup::EnableButtons( Toolkit::TextSelectionPopup::Buttons buttonsToEnable ) +void TextSelectionPopup::EnableButtons(Toolkit::TextSelectionPopup::Buttons buttonsToEnable) { mEnabledButtons = buttonsToEnable; mButtonsChanged = true; } -void TextSelectionPopup::RaiseAbove( Layer target ) +void TextSelectionPopup::RaiseAbove(Actor target) { - if( mToolbar ) + if(mToolbar) { - mToolbar.RaiseAbove( target ); + mToolbar.RaiseAbove(target); } } void TextSelectionPopup::ShowPopup() { - if( ( !mPopupShowing || mButtonsChanged ) && - ( Toolkit::TextSelectionPopup::NONE != mEnabledButtons ) ) + if((!mPopupShowing || mButtonsChanged) && + (Toolkit::TextSelectionPopup::NONE != mEnabledButtons)) { Actor self = Self(); - AddPopupOptionsToToolbar( mShowIcons, mShowCaptions ); + AddPopupOptionsToToolbar(mShowIcons, mShowCaptions); - Animation animation = Animation::New( mFadeInDuration ); - animation.AnimateTo( Property(self, Actor::Property::COLOR_ALPHA), 1.0f ); + Animation animation = Animation::New(mFadeInDuration); + animation.AnimateTo(Property(self, Actor::Property::COLOR_ALPHA), 1.0f); animation.Play(); mPopupShowing = true; } @@ -371,128 +366,132 @@ void TextSelectionPopup::ShowPopup() void TextSelectionPopup::HidePopup() { - if ( mPopupShowing ) + 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 ); + 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(); } } void TextSelectionPopup::OnInitialize() { - DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::OnInitialize\n" ); + 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 ); + 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( + new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true)); + }); - // The Popup Control background is a nine-patch image. We clip against this so the - // contents are correctly clipped against the edges of the nine-patch. - self.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); + //Enable highightability + self.SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true); } -void TextSelectionPopup::HideAnimationFinished( Animation& animation ) +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. + 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_LOG_INFO(gLogFilter, Debug::General, "TextSelectionPopup::HideAnimationFinished\n"); + UnparentAndReset(mToolbar); } } -bool TextSelectionPopup::OnCutButtonPressed( Toolkit::Button button ) +bool TextSelectionPopup::OnCutButtonPressed(Toolkit::Button button) { - if( mCallbackInterface ) + if(mCallbackInterface) { - mCallbackInterface->TextPopupButtonTouched( Toolkit::TextSelectionPopup::CUT ); + mCallbackInterface->TextPopupButtonTouched(Toolkit::TextSelectionPopup::CUT); } return true; } -bool TextSelectionPopup::OnCopyButtonPressed( Toolkit::Button button ) +bool TextSelectionPopup::OnCopyButtonPressed(Toolkit::Button button) { - if( mCallbackInterface ) + if(mCallbackInterface) { - mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::COPY ); + mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::COPY); } return true; } -bool TextSelectionPopup::OnPasteButtonPressed( Toolkit::Button button ) +bool TextSelectionPopup::OnPasteButtonPressed(Toolkit::Button button) { - if( mCallbackInterface ) + if(mCallbackInterface) { - mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::PASTE ); + mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::PASTE); } return true; } -bool TextSelectionPopup::OnSelectButtonPressed( Toolkit::Button button ) +bool TextSelectionPopup::OnSelectButtonPressed(Toolkit::Button button) { - if( mCallbackInterface ) + if(mCallbackInterface) { - mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::SELECT ); + mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::SELECT); } return true; } -bool TextSelectionPopup::OnSelectAllButtonPressed( Toolkit::Button button ) +bool TextSelectionPopup::OnSelectAllButtonPressed(Toolkit::Button button) { - if( mCallbackInterface ) + if(mCallbackInterface) { - mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::SELECT_ALL ); + mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::SELECT_ALL); } return true; } -bool TextSelectionPopup::OnClipboardButtonPressed( Toolkit::Button button ) +bool TextSelectionPopup::OnClipboardButtonPressed(Toolkit::Button button) { - if( mCallbackInterface ) + if(mCallbackInterface) { - mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::CLIPBOARD ); + mCallbackInterface->TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::CLIPBOARD); } return true; } -void TextSelectionPopup::SetDimensionToCustomise( const PopupCustomisations& settingToCustomise, const Size& dimension ) +void TextSelectionPopup::SetDimensionToCustomise(const PopupCustomisations& settingToCustomise, const Size& dimension) { - switch( settingToCustomise ) + switch(settingToCustomise) { - case POPUP_MAXIMUM_SIZE : + case POPUP_MAXIMUM_SIZE: { mPopupMaxSize = dimension; - if ( mToolbar ) + if(mToolbar) { - mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, dimension ); + mToolbar.SetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE, dimension); } break; } - case OPTION_MAXIMUM_SIZE : + case OPTION_MAXIMUM_SIZE: { mOptionMaxSize = dimension; // Option max size not currently currently supported break; } - case OPTION_MINIMUM_SIZE : + case OPTION_MINIMUM_SIZE: { mOptionMinSize = dimension; // Option min size not currently currently supported break; } - case OPTION_DIVIDER_SIZE : + case OPTION_DIVIDER_SIZE: { mOptionDividerSize = dimension; - if ( mToolbar ) + if(mToolbar) { // Resize Dividers not currently supported } @@ -501,30 +500,30 @@ void TextSelectionPopup::SetDimensionToCustomise( const PopupCustomisations& set } // switch } -Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise ) +Size TextSelectionPopup::GetDimensionToCustomise(const PopupCustomisations& settingToCustomise) const { - switch( settingToCustomise ) + switch(settingToCustomise) { - case POPUP_MAXIMUM_SIZE : + case POPUP_MAXIMUM_SIZE: { - if ( mToolbar ) + if(mToolbar) { - return mToolbar.GetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE ).Get< Vector2 >(); + return mToolbar.GetProperty(Toolkit::TextSelectionToolbar::Property::MAX_SIZE).Get(); } else { return mPopupMaxSize; } } - case OPTION_MAXIMUM_SIZE : + case OPTION_MAXIMUM_SIZE: { return mOptionMaxSize; } - case OPTION_MINIMUM_SIZE : + case OPTION_MINIMUM_SIZE: { return mOptionMinSize; } - case OPTION_DIVIDER_SIZE : + case OPTION_DIVIDER_SIZE: { return mOptionDividerSize; } @@ -533,293 +532,334 @@ Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& set return Size::ZERO; } -void TextSelectionPopup::SetButtonImage( Toolkit::TextSelectionPopup::Buttons button, Dali::Image 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" ); - } - } // switch +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 } -Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::Buttons button ) +const std::string& TextSelectionPopup::GetButtonImage(Toolkit::TextSelectionPopup::Buttons button) const { - switch ( button ) + switch(button) { - case Toolkit::TextSelectionPopup::CLIPBOARD : - { - return mClipboardIconImage; - } - break; - case Toolkit::TextSelectionPopup::CUT : + 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) { - return mCutIconImage; + 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 Toolkit::TextSelectionPopup::COPY : + + // 2. Set the options contents. + if(showCaption) { - return mCopyIconImage; + // 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; - case Toolkit::TextSelectionPopup::PASTE : + if(showIcons) { - return mPasteIconImage; + 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 ); } - break; - case Toolkit::TextSelectionPopup::SELECT : + + // 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()) { - return mSelectIconImage; + // 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}}; } - break; - case Toolkit::TextSelectionPopup::SELECT_ALL : + 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) { - return mSelectAllIconImage; + 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); } - break; - default : +} + +std::size_t TextSelectionPopup::GetNumberOfEnabledOptions() const +{ + std::size_t numberOfOptions = 0u; + for(std::vector::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); (it != endIt); ++it) { - DALI_ASSERT_DEBUG( "TextSelectionPopup GetPopupImage Unknown Button" ); + const ButtonRequirement& button(*it); + if(button.enabled) + { + ++numberOfOptions; + } } - } // switch - return Dali::Image(); + return numberOfOptions; } -void TextSelectionPopup::SetPressedImage( const std::string& filename ) +void TextSelectionPopup::AddPopupOptionsToToolbar(bool showIcons, bool showCaptions) { - mPressedImage = filename; -} + DALI_LOG_INFO(gLogFilter, Debug::General, "TextSelectionPopup::AddPopupOptionsToToolbar\n"); -std::string TextSelectionPopup::GetPressedImage() const -{ - return mPressedImage; -} + CreateOrderedListOfPopupOptions(); - 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 , 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) ) ); - - // 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.SetName( button.name ); - option.SetAnimationTime( 0.0f ); - 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; - } - } - - // 2. Set the options contents. - if( showCaption ) - { - // 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 ); - } - 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" ); - - // 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 ); - } - - // 3. Set the normal option image (blank / Transparent). - option.SetUnselectedImage( "" ); - - // 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 ); - 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(); + 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 - divider.SetName("Text's popup divider"); + mToolbar.SetProperty(Dali::Actor::Property::NAME, "TextSelectionToolbar"); #endif - divider.SetSize( size ); - divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); - divider.SetBackgroundColor( mDividerColor ); - mToolbar.AddDivider( divider ); - } - } - - std::size_t TextSelectionPopup::GetNumberOfEnabledOptions() - { - std::size_t numberOfOptions = 0u; - for( std::vector::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.SetParentOrigin( ParentOrigin::CENTER ); -#ifdef DECORATOR_DEBUG - mToolbar.SetName("TextSelectionToolbar"); + 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 - self.Add( mToolbar ); - } - - // Iterate list of buttons and add active ones to Toolbar - std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions(); - std::size_t numberOfOptionsAdded = 0u; - for( std::vector::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 ); - } - } - } - -TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* callbackInterface ) -: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + + // Iterate list of buttons and add active ones to Toolbar + std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions(); + std::size_t numberOfOptionsAdded = 0u; + for(std::vector::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(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 ), + 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 ) + mShowIcons(false), + mShowCaptions(true), + mPopupShowing(false), + mButtonsChanged(false) { } @@ -827,7 +867,6 @@ TextSelectionPopup::~TextSelectionPopup() { } - } // namespace Internal } // namespace Toolkit