/*
- * Copyright (c) 2018 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.
// 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/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>
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 )
}
// 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 );
{
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 );
}