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=160ee4701843fe4acaaa96d545aadfe4b12ca71e;hp=3486aab899dcedf8acecb3370685c49f22714163;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=535870c8f9a4033ea411b89d30f2ddc1342ac7ee 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 3486aab..160ee47 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) 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. @@ -19,12 +19,12 @@ #include // EXTERNAL INCLUDES +#if defined(__GLIBC__) #include +#endif #include #include #include -#include -#include #include #include #include @@ -33,14 +33,16 @@ // INTERNAL INCLUDES #include -#include #include #include +#include #include -#include -#include +#include +#include +#include #include #include +#include namespace Dali { @@ -53,8 +55,9 @@ namespace Internal namespace { - +#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 ) ); @@ -175,38 +178,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: @@ -283,56 +280,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: @@ -372,7 +345,7 @@ void TextSelectionPopup::EnableButtons( Toolkit::TextSelectionPopup::Buttons but mButtonsChanged = true; } -void TextSelectionPopup::RaiseAbove( Layer target ) +void TextSelectionPopup::RaiseAbove( Actor target ) { if( mToolbar ) { @@ -414,10 +387,6 @@ void TextSelectionPopup::OnInitialize() Actor self = Self(); self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); self.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f ); - - // 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 ); } void TextSelectionPopup::HideAnimationFinished( Animation& animation ) @@ -527,7 +496,7 @@ void TextSelectionPopup::SetDimensionToCustomise( const PopupCustomisations& set } // switch } -Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise ) +Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise ) const { switch( settingToCustomise ) { @@ -559,89 +528,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 ) @@ -660,12 +630,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() ); @@ -677,7 +647,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.SetProperty( Dali::Actor::Property::NAME, button.name ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); switch( button.id ) @@ -733,20 +703,25 @@ std::string TextSelectionPopup::GetPressedImage() const 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.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, "" ); + 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.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, 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 @@ -759,16 +734,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::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); ( it != endIt ); ++it ) @@ -800,15 +775,16 @@ 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 ) { @@ -819,6 +795,7 @@ std::string TextSelectionPopup::GetPressedImage() const std::reverse( mOrderListOfButtons.begin(), mOrderListOfButtons.end() ); } } +#endif // Iterate list of buttons and add active ones to Toolbar std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions(); @@ -850,7 +827,7 @@ void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap ) if( visual ) { - DevelControl::RegisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual, float( DepthIndex::CONTENT ) ); + DevelControl::RegisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual, DepthIndex::CONTENT ); } } } @@ -880,6 +857,10 @@ TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* cal mPopupShowing( false ), mButtonsChanged( false ) { + DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::DIALOG, true ) ); + } ); } TextSelectionPopup::~TextSelectionPopup()