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=bc54dca83f37001b6a59d7f5fbc0643e55039929;hp=e0d64358e1563c71a4683d41de30c0083f334521;hb=8269fc656ce5c08314e340932c2af762e7234628;hpb=31df2b9472ccbe0ae460a958535be8ef790c96f2 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 e0d6435..bc54dca 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 @@ -47,19 +47,8 @@ namespace // todo Move this to adaptor?? #define GET_LOCALE_TEXT(string) dgettext("elementary", string) -const Dali::Vector4 DEFAULT_POPUP_LINE_COLOR( Dali::Vector4( 0.69f, 0.93f, 0.93f, 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.12f, 0.56f, 1.0f, 1.0f ) ); - -const std::string DEFAULT_POPUP_BACKGROUND_IMAGE( DALI_IMAGE_DIR "selection-popup-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 float OPTION_MARGIN_WIDTH( 10.f ); ///< The margin between the right or lefts edge and the text or icon. +const std::string TEXT_SELECTION_POPUP_LABEL( "textselectionpopuplabel" ); +const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) ); #ifdef DGETTEXT_ENABLED @@ -108,6 +97,10 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionPopup, "popup-copy-button-imag 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_TYPE_REGISTRATION_END() @@ -124,7 +117,6 @@ Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New( Toolkit::TextSelectio Dali::Toolkit::TextSelectionPopup handle( *impl ); impl->mEnabledButtons = buttonsToEnable; - // Second-phase init of the implementation // This can only be done after the CustomActor connection has been made... impl->Initialize(); @@ -147,11 +139,6 @@ void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index, impl.SetDimensionToCustomise( POPUP_MAXIMUM_SIZE, value.Get< Vector2 >() ); break; } - case Toolkit::TextSelectionPopup::Property::POPUP_MIN_SIZE: - { - impl.SetDimensionToCustomise( POPUP_MINIMUM_SIZE, value.Get< Vector2 >() ); - break; - } case Toolkit::TextSelectionPopup::Property::OPTION_MAX_SIZE: { impl.SetDimensionToCustomise( OPTION_MAXIMUM_SIZE, value.Get< Vector2 >() ); @@ -203,6 +190,26 @@ void TextSelectionPopup::SetProperty( BaseObject* object, Property::Index index, 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; + } } // switch } // TextSelectionPopup } @@ -293,16 +300,42 @@ Property::Value TextSelectionPopup::GetProperty( BaseObject* object, Property::I } break; } + case Toolkit::TextSelectionPopup::Property::POPUP_PRESSED_IMAGE: + { + value = impl.GetPressedImage(); + break; + } } // switch } return value; } +void TextSelectionPopup::RaiseAbove( Layer target ) +{ + if( mToolbar ) + { + mToolbar.RaiseAbove( target ); + } +} + +void TextSelectionPopup::ShowPopup() +{ + AddPopupOptionsToToolbar( mShowIcons, mShowCaptions ); +} + void TextSelectionPopup::OnInitialize() { CreatePopup(); } +void TextSelectionPopup::OnStageConnection( int depth ) +{ + // 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. +} + bool TextSelectionPopup::OnCutButtonPressed( Toolkit::Button button ) { if( mCallbackInterface ) @@ -369,26 +402,16 @@ void TextSelectionPopup::SetDimensionToCustomise( const PopupCustomisations& set { case POPUP_MAXIMUM_SIZE : { - Actor self = Self(); - mMaxSize = dimension; if ( mToolbar ) { - mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mMaxSize ); + mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, dimension ); } break; } - case POPUP_MINIMUM_SIZE : - { - Actor self = Self(); - mMinSize = dimension; - // Option can not be smaller than this if only one. - break; - } case OPTION_MAXIMUM_SIZE : { mOptionMaxSize = dimension; // Option max size not currently currently supported - break; } case OPTION_MINIMUM_SIZE : @@ -415,11 +438,7 @@ Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& set { case POPUP_MAXIMUM_SIZE : { - return mMaxSize; - } - case POPUP_MINIMUM_SIZE : - { - return mMinSize; + return mToolbar.GetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE ).Get< Vector2 >(); } case OPTION_MAXIMUM_SIZE : { @@ -523,43 +542,27 @@ Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But 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( Toolkit::TextSelectionPopup::CUT, mCutOptionPriority, OPTION_CUT, POPUP_CUT_STRING , mCutIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::CUT) ) ); - - if ( !mCopyIconImage ) - { - mCopyIconImage = ResourceImage::New( OPTION_ICON_COPY ); - } mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::COPY, mCopyOptionPriority, OPTION_COPY, POPUP_COPY_STRING, mCopyIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::COPY) ) ); - - if ( !mPasteIconImage ) - { - mPasteIconImage = ResourceImage::New( OPTION_ICON_PASTE ); - } mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::PASTE, mPasteOptionPriority, OPTION_PASTE, POPUP_PASTE_STRING, mPasteIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::PASTE) ) ); - - if ( !mSelectIconImage ) - mSelectIconImage = ResourceImage::New( OPTION_ICON_SELECT ); mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::SELECT, mSelectOptionPriority, OPTION_SELECT_WORD, POPUP_SELECT_STRING, mSelectIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::SELECT) ) ); - - if ( !mSelectAllIconImage ) - { - mSelectAllIconImage = ResourceImage::New( OPTION_ICON_SELECT_ALL ); - } mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::SELECT_ALL, mSelectAllOptionPriority, OPTION_SELECT_ALL, POPUP_SELECT_ALL_STRING, mSelectAllIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::SELECT_ALL) ) ); - - if ( !mClipboardIconImage ) - { - mClipboardIconImage = ResourceImage::New( OPTION_ICON_CLIPBOARD ); - } mOrderListOfButtons.push_back( ButtonRequirement( Toolkit::TextSelectionPopup::CLIPBOARD, mClipboardOptionPriority, OPTION_CLIPBOARD, POPUP_CLIPBOARD_STRING, mClipboardIconImage, ( mEnabledButtons & Toolkit::TextSelectionPopup::CLIPBOARD) ) ); // Sort the buttons according their priorities. @@ -568,83 +571,11 @@ Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But void TextSelectionPopup::AddOption( const ButtonRequirement& button, bool showDivider, bool showIcons, bool showCaption ) { - - const std::string& name = button.name; - const std::string& caption = button.caption; - Image iconImage = button.icon; - - // 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&showCaption)?2:1 , 1 ); - optionContainer.SetFitHeight( 0 ); - optionContainer.SetFitWidth( 0 ); - - Toolkit::TableView optionPressedContainer = Toolkit::TableView::New( (showIcons&showCaption)?2:1 , 1 ); - optionPressedContainer.SetFitHeight( 0 ); - optionPressedContainer.SetFitWidth( 0 ); - optionPressedContainer.SetBackgroundColor( mPressedColor ); - -#ifdef DECORATOR_DEBUG - optionContainer.SetName("optionContainer"); - optionPressedContainer.SetName("optionPressedContainer"); -#endif - // 2. Add text. - - if ( showCaption ) - { - Toolkit::TextLabel captionTextLabel = Toolkit::TextLabel::New(); - captionTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, caption ); - captionTextLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - - Toolkit::TextLabel pressedCaptionTextLabel = Toolkit::TextLabel::New(); - pressedCaptionTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, caption ); - pressedCaptionTextLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - - Padding padding; - padding.left = 24.0f; - padding.right = 24.0f; - padding.top = 14.0f; - padding.bottom = 14.0f; - captionTextLabel.SetPadding( padding ); - pressedCaptionTextLabel.SetPadding( padding ); - - optionContainer.AddChild( captionTextLabel, Toolkit::TableView::CellPosition(( showIcons&showCaption)?1:0, 0 ) ); - optionPressedContainer.AddChild( pressedCaptionTextLabel, Toolkit::TableView::CellPosition(( showIcons&showCaption)?1:0, 0 ) ); - } - - // 3. Create the icons - if ( showIcons ) - { - ImageActor pressedIcon = ImageActor::New( iconImage ); - ImageActor icon = ImageActor::New( iconImage ); - icon.SetSortModifier( DECORATION_DEPTH_INDEX - 1 ); - pressedIcon.SetSortModifier( DECORATION_DEPTH_INDEX - 1 ); - - icon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - pressedIcon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - icon.SetColor( mIconColor ); - - if ( showCaption & showIcons ) - { - optionContainer.SetFitHeight( 1 ); - optionContainer.SetFitWidth( 1 ); - optionPressedContainer.SetFitHeight( 1 ); - optionPressedContainer.SetFitWidth( 1 ); - } - - 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 ) ); - } - - // 4. Create a option. + // 1. Create a option. Toolkit::PushButton option = Toolkit::PushButton::New(); - option.SetName( name ); + option.SetName( button.name ); option.SetAnimationTime( 0.0f ); - option.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); + option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); switch( button.id ) { @@ -685,24 +616,46 @@ Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But } } - // 5. Set the normal option image. - option.SetButtonImage( optionContainer ); + // 2. Set the options contents. + if( showCaption ) + { + option.SetProperty( Toolkit::PushButton::Property::LABEL_PADDING, Vector4( 24.0f, 24.0f, 14.0f, 14.0f ) ); + option.SetLabelText( button.caption ); + } + 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" ); - // 6. Set the pressed option image - option.SetSelectedImage( optionPressedContainer ); + // 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 ); - // 7 Add option to tool bar + // 5 Add option to tool bar mToolbar.AddOption( option ); - // 8. Add the divider + // 6. Add the divider if( showDivider ) { 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 ); - divider.SetColor( mLineColor ); + divider.SetColor( mDividerColor ); + divider.SetSortModifier( DECORATION_DEPTH_INDEX ); mToolbar.AddDivider( divider ); } } @@ -741,35 +694,30 @@ Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But void TextSelectionPopup::CreatePopup() { Actor self = Self(); - CreateOrderedListOfPopupOptions(); //todo Currently causes all options to be shown + CreateOrderedListOfPopupOptions(); self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - SetBackgroundImage( NinePatchImage::New( DEFAULT_POPUP_BACKGROUND_IMAGE ) ); - if ( !mToolbar ) + if( !mToolbar ) { mToolbar = Toolkit::TextSelectionToolbar::New(); mToolbar.SetParentOrigin( ParentOrigin::CENTER ); - mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mMaxSize ); self.Add( mToolbar ); - AddPopupOptionsToToolbar( mShowIcons, mShowCaptions ); } } TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* callbackInterface ) : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), mToolbar(), - mMaxSize(), - mMinSize(), - mOptionDividerSize( Size( 2.0f, 0.0f) ), + mOptionDividerSize(), mEnabledButtons( Toolkit::TextSelectionPopup::NONE ), mCallbackInterface( callbackInterface ), - mLineColor( DEFAULT_POPUP_LINE_COLOR ), - mIconColor( DEFAULT_OPTION_ICON ), - mPressedColor( DEFAULT_OPTION_ICON_PRESSED ), + 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( false ),