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=10e7f78603069843bc83877f6dc497d3ca930b5c;hp=459e53461e2f235fbb71164355e4d17668c546b6;hb=c0d8c3caf853d94266c589b425cadc26333f716a;hpb=1e7f2e72fcc37576c754ca2ed563ece458942960 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..10e7f78 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) 2019 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,7 +19,10 @@ #include // EXTERNAL INCLUDES +#if defined(__GLIBC__) #include +#endif +#include #include #include #include @@ -33,9 +36,13 @@ // INTERNAL INCLUDES #include #include +#include #include -#include -#include +#include +#include +#include +#include +#include namespace Dali { @@ -48,8 +55,9 @@ 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 ) ); @@ -85,6 +93,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 ); @@ -111,6 +122,7 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popupPressedColor", VE DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popupPressedImage", STRING, POPUP_PRESSED_IMAGE ) DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popupFadeInDuration", FLOAT, POPUP_FADE_IN_DURATION ) DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popupFadeOutDuration", FLOAT, POPUP_FADE_OUT_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "backgroundBorder", MAP, BACKGROUND_BORDER ) DALI_TYPE_REGISTRATION_END() @@ -230,6 +242,12 @@ void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index, impl.mFadeOutDuration = value.Get < float >(); break; } + case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER: + { + Property::Map map = value.Get(); + impl.CreateBackgroundBorder( map ); + break; + } } // switch } // TextSelectionPopup } @@ -335,6 +353,17 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I value = impl.mFadeOutDuration; break; } + case Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER: + { + Property::Map map; + Toolkit::Visual::Base visual = DevelControl::GetVisual( impl, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER ); + if( visual ) + { + visual.CreatePropertyMap( map ); + } + value = map; + break; + } } // switch } return value; @@ -388,10 +417,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 ) @@ -652,7 +677,6 @@ std::string TextSelectionPopup::GetPressedImage() const 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 ) @@ -716,12 +740,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 @@ -782,6 +811,21 @@ std::string TextSelectionPopup::GetPressedImage() const 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; @@ -794,8 +838,29 @@ std::string TextSelectionPopup::GetPressedImage() const AddOption( button, ( numberOfOptionsAdded < numberOfOptionsRequired ) , showIcons, showCaptions ); } } + + if( mirror ) + { + mToolbar.ScrollTo( Vector2( mPopupMaxSize.x, 0.f ) ); + } } +void TextSelectionPopup::CreateBackgroundBorder( Property::Map& propertyMap ) +{ + // Removes previous image if necessary + DevelControl::UnregisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER ); + + if( ! propertyMap.Empty() ) + { + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( propertyMap ); + + if( visual ) + { + DevelControl::RegisterVisual( *this, Toolkit::TextSelectionPopup::Property::BACKGROUND_BORDER, visual, DepthIndex::CONTENT ); + } + } +} + TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* callbackInterface ) : Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mToolbar(),