/*
- * Copyright (c) 2018 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.
#include <dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h>
// EXTERNAL INCLUDES
+#if defined(__GLIBC__)
#include <libintl.h>
+#endif
#include <string.h>
#include <cfloat>
#include <dali/public-api/animation/animation.h>
-#include <dali/devel-api/images/nine-patch-image.h>
-#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/math/vector4.h>
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
+#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/helpers/color-conversion.h>
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 ) );
}
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:
}
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:
} // switch
}
-Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise )
+Size TextSelectionPopup::GetDimensionToCustomise( const PopupCustomisations& settingToCustomise ) const
{
switch( settingToCustomise )
{
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 )
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() );
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 )
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
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<ButtonRequirement>::const_iterator it = mOrderListOfButtons.begin(), endIt = mOrderListOfButtons.end(); ( it != endIt ); ++it )
{
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 )
{
std::reverse( mOrderListOfButtons.begin(), mOrderListOfButtons.end() );
}
}
+#endif
// Iterate list of buttons and add active ones to Toolbar
std::size_t numberOfOptionsRequired = GetNumberOfEnabledOptions();
projects / platform / core / uifw / dali-toolkit.git / blobdiff