X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-popup-impl.cpp;h=2f0c6922bbfa66e553f4ae7c4c972b1588b615f2;hb=fca202af829a0657805e44461f08f284cdbf0bbb;hp=6d95ac21b52f954fd87994a9bc058c72b1476445;hpb=adfa885efa8f9fe1fe33936e5f7910b36b66bc2a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 6d95ac2..2f0c692 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,10 +19,12 @@ #include // EXTERNAL INCLUDES +#if defined(__GLIBC__) #include +#endif +#include #include #include -#include #include #include #include @@ -33,9 +35,11 @@ // INTERNAL INCLUDES #include #include +#include #include -#include -#include +#include +#include +#include #include #include @@ -50,8 +54,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 ) ); @@ -87,6 +92,9 @@ const char* const OPTION_COPY("optionCopy"); const char* const OPTION_PASTE("optionPaste"); // "Paste" popup option. const char* const OPTION_CLIPBOARD("optionClipboard"); // "Clipboard" popup option. +const std::string IDS_LTR( "IDS_LTR" ); +const std::string RTL_DIRECTION( "RTL" ); + BaseHandle Create() { return Toolkit::TextSelectionPopup::New( NULL ); @@ -347,7 +355,7 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER: { Property::Map map; - Toolkit::Visual::Base visual = impl.GetVisual( Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER ); + Toolkit::Visual::Base visual = DevelControl::GetVisual( impl, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER ); if( visual ) { visual.CreatePropertyMap( map ); @@ -408,10 +416,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 ) @@ -671,8 +675,7 @@ std::string TextSelectionPopup::GetPressedImage() const DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::AddOption\n" ); Toolkit::PushButton option = Toolkit::PushButton::New(); - option.SetName( button.name ); - option.SetAnimationTime( 0.0f ); + option.SetProperty( Dali::Actor::Property::NAME, button.name ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); switch( button.id ) @@ -736,12 +739,17 @@ std::string TextSelectionPopup::GetPressedImage() const } // 3. Set the normal option image (blank / Transparent). - option.SetUnselectedImage( "" ); + option.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, "" ); // 4. Set the pressed option image. - // The image can be blank, the color can be used regardless. - option.SetSelectedImage( mPressedImage ); - option.SetProperty( Toolkit::Button::Property::SELECTED_COLOR, mPressedColor ); + Property::Value selectedBackgroundValue( mPressedImage ); + if( mPressedImage.empty() ) + { + // The image can be blank, the color can be used in that case. + selectedBackgroundValue = Property::Value{ { Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR }, + { Toolkit::ColorVisual::Property::MIX_COLOR, mPressedColor } }; + } + option.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, selectedBackgroundValue ); option.SetProperty( Toolkit::Control::Property::STYLE_NAME, TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME ); // 5 Add option to tool bar @@ -754,9 +762,9 @@ 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 ); @@ -795,13 +803,28 @@ std::string TextSelectionPopup::GetPressedImage() const { mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mPopupMaxSize ); } - mToolbar.SetParentOrigin( ParentOrigin::CENTER ); + mToolbar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); #ifdef DECORATOR_DEBUG - mToolbar.SetName("TextSelectionToolbar"); + mToolbar.SetProperty( Dali::Actor::Property::NAME,"TextSelectionToolbar"); #endif self.Add( mToolbar ); } + // Whether to mirror the list of buttons (for right to left languages) + bool mirror = false; +#if defined(__GLIBC__) + char* idsLtr = GET_LOCALE_TEXT( IDS_LTR.c_str() ); + if( NULL != idsLtr ) + { + mirror = ( 0 == strcmp( idsLtr, RTL_DIRECTION.c_str() ) ); + + if( mirror ) + { + std::reverse( mOrderListOfButtons.begin(), mOrderListOfButtons.end() ); + } + } +#endif + // Iterate list of buttons and add active ones to Toolbar std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions(); std::size_t numberOfOptionsAdded = 0u; @@ -814,12 +837,17 @@ std::string TextSelectionPopup::GetPressedImage() const AddOption( button, ( numberOfOptionsAdded < numberOfOptionsRequired ) , showIcons, showCaptions ); } } + + if( mirror ) + { + mToolbar.ScrollTo( Vector2( mPopupMaxSize.x, 0.f ) ); + } } void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap ) { // Removes previous image if necessary - UnregisterVisual( Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER ); + DevelControl::UnregisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER ); if( ! propertyMap.Empty() ) { @@ -827,8 +855,7 @@ void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap ) if( visual ) { - RegisterVisual( Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual ); - visual.SetDepthIndex( DepthIndex::CONTENT ); + DevelControl::RegisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual, DepthIndex::CONTENT ); } } }