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=3a42d6a904a1cc1c3d0f5018807765d379aff357;hp=d66a70a1586e489eeaf2427202746d89938a4537;hb=a97820c064ff542c5c5e5151e976c1495af1235e;hpb=a6f34ab2df1f2418c037366030a4dcfbcda29847 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 d66a70a..3a42d6a 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 @@ -19,21 +19,24 @@ #include // INTERNAL INCLUDES -#include +#include +#include #include #include // EXTERNAL INCLUDES +#include #include #include #include #include +#include +#include +#include + #include #include -// todo Move this to adaptor?? -#define GET_LOCALE_TEXT(string) dgettext("elementary", string) - namespace Dali { @@ -45,36 +48,35 @@ 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. +// todo Move this to adaptor?? +#define GET_LOCALE_TEXT(string) dgettext("sys_string", string) + +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 + +#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 + +#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. @@ -83,19 +85,44 @@ const char* const OPTION_COPY("option-copy"); const char* const OPTION_PASTE("option-paste"); // "Paste" popup option. const char* const OPTION_CLIPBOARD("option-clipboard"); // "Clipboard" popup option. -} // namespace +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, "popup-max-size", VECTOR2, POPUP_MAX_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-min-size", VECTOR2, POPUP_MIN_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "option-max-size", VECTOR2, OPTION_MAX_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "option-min-size", VECTOR2, OPTION_MIN_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "option-divider-size", VECTOR2, OPTION_DIVIDER_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-clipboard-button-image", STRING, POPUP_CLIPBOARD_BUTTON_ICON_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-cut-button-image", STRING, POPUP_CUT_BUTTON_ICON_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-copy-button-image", STRING, POPUP_COPY_BUTTON_ICON_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-paste-button-image", STRING, POPUP_PASTE_BUTTON_ICON_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-select-button-image", STRING, POPUP_SELECT_BUTTON_ICON_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-select-all-button-image", STRING, POPUP_SELECT_ALL_BUTTON_ICON_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-divider-color", VECTOR4, POPUP_DIVIDER_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-icon-color", VECTOR4, POPUP_ICON_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-pressed-color", VECTOR4, POPUP_PRESSED_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-pressed-image", STRING, POPUP_PRESSED_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-fade-in-duration", FLOAT, POPUP_FADE_IN_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-fade-out-duration", FLOAT, POPUP_FADE_OUT_DURATION ) + +DALI_TYPE_REGISTRATION_END() -//// Comparison function for ButtonRequirement Priority -//bool TextSelectionPopup::PriorityCompare( ButtonRequirement const& a, ButtonRequirement const& b ) -//{ -// return a.priority < b.priority; -//} +} // namespace -Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New() +Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New( TextSelectionPopupCallbackInterface* callbackInterface ) { - // Create the implementation, temporarily owned by this handle on stack - IntrusivePtr< TextSelectionPopup > impl = new TextSelectionPopup(); + 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 ); // Pass ownership to CustomActor handle Dali::Toolkit::TextSelectionPopup handle( *impl ); @@ -119,49 +146,88 @@ void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index, { case Toolkit::TextSelectionPopup::Property::POPUP_MAX_SIZE: { - impl.SetPopupMaxSize( value.Get< Vector2 >() ); + impl.SetDimensionToCustomise( POPUP_MAXIMUM_SIZE, value.Get< Vector2 >() ); break; } - case Toolkit::TextSelectionPopup::Property::POPUP_BACKGROUND_IMAGE: + case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE: { - ResourceImage image = ResourceImage::New( value.Get< std::string >() ); - impl.SetPopupImage( POPUP_BACKGROUND, image ); + 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::OPTION_DIVIDER_SIZE: + { + 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, image ); 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, image ); 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, image ); 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, image ); 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, image ); 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, image ); + 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; } } // switch @@ -182,21 +248,27 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I { 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 ) ); + ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::CLIPBOARD ) ); if( image ) { value = image.GetUrl(); @@ -205,7 +277,7 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I } case Toolkit::TextSelectionPopup::Property::POPUP_CUT_BUTTON_ICON_IMAGE: { - ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_CUT_BUTTON_ICON ) ); + ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::CUT ) ); if( image ) { value = image.GetUrl(); @@ -214,7 +286,7 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I } case Toolkit::TextSelectionPopup::Property::POPUP_COPY_BUTTON_ICON_IMAGE: { - ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_COPY_BUTTON_ICON ) ); + ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::COPY ) ); if( image ) { value = image.GetUrl(); @@ -223,7 +295,7 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I } case Toolkit::TextSelectionPopup::Property::POPUP_PASTE_BUTTON_ICON_IMAGE: { - ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_PASTE_BUTTON_ICON ) ); + ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::PASTE ) ); if( image ) { value = image.GetUrl(); @@ -232,7 +304,7 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I } case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_BUTTON_ICON_IMAGE: { - ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_SELECT_BUTTON_ICON ) ); + ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::SELECT ) ); if( image ) { value = image.GetUrl(); @@ -241,312 +313,443 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I } case Toolkit::TextSelectionPopup::Property::POPUP_SELECT_ALL_BUTTON_ICON_IMAGE: { - ResourceImage image = ResourceImage::DownCast( impl.GetPopupImage( POPUP_SELECT_ALL_BUTTON_ICON ) ); + ResourceImage image = ResourceImage::DownCast( impl.GetButtonImage( Toolkit::TextSelectionPopup::SELECT_ALL ) ); if( image ) { value = image.GetUrl(); } 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; + } } // switch } return value; } +void TextSelectionPopup::EnableButtons( Toolkit::TextSelectionPopup::Buttons buttonsToEnable ) +{ + mEnabledButtons = buttonsToEnable; + mButtonsChanged = true; +} + +void TextSelectionPopup::RaiseAbove( Layer target ) +{ + if( mToolbar ) + { + mToolbar.RaiseAbove( target ); + } +} + +void TextSelectionPopup::ShowPopup() +{ + if ( !mPopupShowing || mButtonsChanged ) + { + 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::HidePopup() +{ + 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(); + } +} + void TextSelectionPopup::OnInitialize() { - CreatePopup(); + 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 ); } -void TextSelectionPopup::OnRelayout( const Vector2& size, RelayoutContainer& container ) +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::SetPopupMaxSize( const Size& maxSize ) +void TextSelectionPopup::HideAnimationFinished( Animation& animation ) { - mMaxSize = maxSize; + 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 ); + } } -const Dali::Vector2& TextSelectionPopup::GetPopupMaxSize() const +bool TextSelectionPopup::OnCutButtonPressed( Toolkit::Button button ) { - return mMaxSize; + if( mCallbackInterface ) + { + mCallbackInterface->TextPopupButtonTouched( Toolkit::TextSelectionPopup::CUT ); + } + + return true; } -void TextSelectionPopup::SetPopupImage( PopupParts part, Dali::Image image ) +bool TextSelectionPopup::OnCopyButtonPressed( Toolkit::Button button ) { - switch ( part ) - { - case POPUP_BACKGROUND : + if( mCallbackInterface ) + { + mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::COPY ); + } + + return true; +} + +bool TextSelectionPopup::OnPasteButtonPressed( Toolkit::Button button ) +{ + if( mCallbackInterface ) + { + mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::PASTE ); + } + + return true; +} + +bool TextSelectionPopup::OnSelectButtonPressed( Toolkit::Button button ) +{ + if( mCallbackInterface ) + { + mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::SELECT ); + } + + return true; +} + +bool TextSelectionPopup::OnSelectAllButtonPressed( Toolkit::Button button ) +{ + if( mCallbackInterface ) + { + mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::SELECT_ALL ); + } + + return true; +} + +bool TextSelectionPopup::OnClipboardButtonPressed( Toolkit::Button button ) +{ + if( mCallbackInterface ) + { + mCallbackInterface->TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::CLIPBOARD ); + } + + 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 ) +{ + 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, Dali::Image image ) +{ + switch ( button ) { - mBackgroundImage = image; - } break; - case POPUP_CLIPBOARD_BUTTON : + case Toolkit::TextSelectionPopup::CLIPBOARD: { mClipboardIconImage = image; } break; - case POPUP_CUT_BUTTON_ICON : + case Toolkit::TextSelectionPopup::CUT : { mCutIconImage = image; } break; - case POPUP_COPY_BUTTON_ICON : + case Toolkit::TextSelectionPopup::COPY : { mCopyIconImage = image; } break; - case POPUP_PASTE_BUTTON_ICON : + case Toolkit::TextSelectionPopup::PASTE : { mPasteIconImage = image; } break; - case POPUP_SELECT_BUTTON_ICON : + case Toolkit::TextSelectionPopup::SELECT : { mSelectIconImage = image; } break; - case POPUP_SELECT_ALL_BUTTON_ICON : + case Toolkit::TextSelectionPopup::SELECT_ALL : { mSelectAllIconImage = image; } break; - + default : + { + DALI_ASSERT_DEBUG( "TextSelectionPopup SetPopupImage Unknown Button" ); + } } // switch } -Dali::Image TextSelectionPopup::GetPopupImage( PopupParts part ) +Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::Buttons button ) { - switch ( part ) + switch ( button ) { - case POPUP_BACKGROUND : - { - return mBackgroundImage; - } - break; - case POPUP_CLIPBOARD_BUTTON : + case Toolkit::TextSelectionPopup::CLIPBOARD : { return mClipboardIconImage; } break; - case POPUP_CUT_BUTTON_ICON : + case Toolkit::TextSelectionPopup::CUT : { return mCutIconImage; } break; - case POPUP_COPY_BUTTON_ICON : + case Toolkit::TextSelectionPopup::COPY : { return mCopyIconImage; } break; - case POPUP_PASTE_BUTTON_ICON : + case Toolkit::TextSelectionPopup::PASTE : { return mPasteIconImage; } break; - case POPUP_SELECT_BUTTON_ICON : + case Toolkit::TextSelectionPopup::SELECT : { return mSelectIconImage; } break; - case POPUP_SELECT_ALL_BUTTON_ICON : + case Toolkit::TextSelectionPopup::SELECT_ALL : { return mSelectAllIconImage; } break; default : { - DALI_ASSERT_DEBUG( "Unknown Popup Part" ); + DALI_ASSERT_DEBUG( "TextSelectionPopup GetPopupImage Unknown Button" ); } } // switch return Dali::Image(); } +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 - 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 ) ); + mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::CUT, mCutOptionPriority, OPTION_CUT, POPUP_CUT_STRING , mCutIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::CUT) ) ); + mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::COPY, mCopyOptionPriority, OPTION_COPY, POPUP_COPY_STRING, mCopyIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::COPY) ) ); + mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::PASTE, mPasteOptionPriority, OPTION_PASTE, POPUP_PASTE_STRING, mPasteIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::PASTE) ) ); + mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::SELECT, mSelectOptionPriority, OPTION_SELECT_WORD, POPUP_SELECT_STRING, mSelectIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::SELECT) ) ); + mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::SELECT_ALL, mSelectAllOptionPriority, OPTION_SELECT_ALL, POPUP_SELECT_ALL_STRING, mSelectAllIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::SELECT_ALL) ) ); + mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::CLIPBOARD, mClipboardOptionPriority, OPTION_CLIPBOARD, POPUP_CLIPBOARD_STRING, mClipboardIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::CLIPBOARD) ) ); // Sort the buttons according their priorities. std::sort( mOrderListOfButtons.begin(), mOrderListOfButtons.end(), TextSelectionPopup::ButtonPriorityCompare() ); } - void TextSelectionPopup::CreateBackground() + void TextSelectionPopup::AddOption( const ButtonRequirement& button, bool showDivider, bool showIcons, bool showCaption ) { - if ( mBackgroundImage ) - { - SetBackgroundImage ( mBackgroundImage ); - } + // 1. Create a option. + DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::AddOption\n" ); - 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 ); -#ifdef DECORATOR_DEBUG - optionContainer.SetName("optionContainer"); - optionPressedContainer.SetName("optionPressedContainer"); -#endif - // 2. Add text. + Toolkit::PushButton option = Toolkit::PushButton::New(); + option.SetName( button.name ); + option.SetAnimationTime( 0.0f ); + option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - if ( showCaption ) + switch( button.id ) { - 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 + 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; + } } - if ( showIcons ) + // 2. Set the options contents. + if( showCaption ) { - // 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 ) ); + // 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( "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" ); - // 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 ); + // 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 ); + } - // 6. Set the normal option image. - option.SetButtonImage( optionContainer ); + // 3. Set the normal option image (blank / Transparent). + option.SetUnselectedImage( "" ); - // 7. Set the pressed option image - option.SetSelectedImage( optionPressedContainer ); + // 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 ); - // 9 Add option to table view - parent.SetFitWidth( indexInTable ); - parent.AddChild( option, Toolkit::TableView::CellPosition( 0, indexInTable ) ); - indexInTable++; + // 5 Add option to tool bar + mToolbar.AddOption( option ); - // 10. Add the divider - if( !finalOption ) + // 6. Add the divider + if( showDivider ) { - const Size size( POPUP_DIVIDER_WIDTH, 0.0f ); // Height FILL_TO_PARENT + const Size size( mOptionDividerSize.width, 0.0f ); // Height FILL_TO_PARENT ImageActor divider = Toolkit::CreateSolidColorActor( Color::WHITE ); - +#ifdef DECORATOR_DEBUG + divider.SetName("Text's popup divider"); +#endif divider.SetSize( size ); divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); - parent.SetFitWidth( indexInTable ); - parent.AddChild( divider, Toolkit::TableView::CellPosition( 0, indexInTable ) ); - indexInTable++; + divider.SetColor( mDividerColor ); + divider.SetSortModifier( DECORATION_DEPTH_INDEX ); + mToolbar.AddDivider( divider ); } } - void TextSelectionPopup::SetUpPopup() + std::size_t TextSelectionPopup::GetNumberOfEnabledOptions() { - 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::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); ( it != endIt ); ++it ) { @@ -557,56 +760,71 @@ Dali::Image TextSelectionPopup::GetPopupImage( PopupParts part ) } } - // 2. Iterate list of buttons and add active ones. - std::size_t optionsAdded = 0u; + return numberOfOptions; + } - numberOfOptions = ( numberOfOptions*2 ) - 1 ; // Last Option does not get a divider so -1 or if only one option then also no divider + void TextSelectionPopup::AddPopupOptionsToToolbar( bool showIcons, bool showCaptions ) + { + DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::AddPopupOptionsToToolbar\n" ); - mTableOfButtons = Dali::Toolkit::TableView::New( 1, numberOfOptions ); + CreateOrderedListOfPopupOptions(); - for( std::vector::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); ( it != endIt ); ++it ) + mButtonsChanged = false; + UnparentAndReset( mToolbar); + + if( !mToolbar ) { - const ButtonRequirement& button( *it ); - if ( button.enabled ) + 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 { - AddOption( mTableOfButtons, button.name, button.caption, button.icon, optionsAdded == numberOfOptions - 1, showIcons, showCaptions, optionsAdded ); // -1 to ignore the last divider + mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mPopupMaxSize ); } + mToolbar.SetParentOrigin( ParentOrigin::CENTER ); +#ifdef DECORATOR_DEBUG + mToolbar.SetName("TextSelectionToolbar"); +#endif + self.Add( mToolbar ); } - } - void TextSelectionPopup::CreatePopup() - { - if ( !mStencilLayer ) + // 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 ) { - 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(); + const ButtonRequirement& button( *it ); + if ( button.enabled ) + { + numberOfOptionsAdded++; + AddOption( button, ( numberOfOptionsAdded < numberOfOptionsRequired ) , showIcons, showCaptions ); + } } - - 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 ), +TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* callbackInterface ) +: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), + 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 ( 3 ), - mCopyOptionPriority ( 4 ), + mCutOptionPriority ( 4 ), + mCopyOptionPriority ( 3 ), mPasteOptionPriority ( 5 ), mClipboardOptionPriority( 6 ), - mShowIcons( true ), - mShowCaptions( false ) + mFadeInDuration(0.0f), + mFadeOutDuration(0.0f), + mShowIcons( false ), + mShowCaptions( true ), + mPopupShowing( false ), + mButtonsChanged( false ) { } @@ -620,3 +838,5 @@ TextSelectionPopup::~TextSelectionPopup() } // namespace Toolkit } // namespace Dali + +