X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=6c6ab02892a12dc45040e9cbdfe8891024197cea;hp=3207f9ba259a85b78b0f86675ac836c71c6bd3f7;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=b5b75a20279ee1671b8a78228583cf5114536fb0 diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 3207f9b..6c6ab02 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-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. @@ -22,8 +22,7 @@ #include // for strcmp #include #include -#include -#include +#include #include #include #include @@ -75,21 +74,15 @@ DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initialAutoRepeatingDelay", DALI_PROPERTY_REGISTRATION( Toolkit, Button, "nextAutoRepeatingDelay", FLOAT, NEXT_AUTO_REPEATING_DELAY ) DALI_PROPERTY_REGISTRATION( Toolkit, Button, "togglable", BOOLEAN, TOGGLABLE ) DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected", BOOLEAN, SELECTED ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedStateImage", MAP, UNSELECTED_STATE_IMAGE ) // Deprecated property -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedStateImage", MAP, SELECTED_STATE_IMAGE ) // Deprecated property -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledStateImage", MAP, DISABLED_STATE_IMAGE ) // Deprecated property -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedColor", VECTOR4, UNSELECTED_COLOR ) // Deprecated property -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedColor", VECTOR4, SELECTED_COLOR ) // Deprecated property +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedVisual", MAP, UNSELECTED_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedVisual", MAP, SELECTED_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedVisual", MAP, DISABLED_SELECTED_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedVisual", MAP, DISABLED_UNSELECTED_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedBackgroundVisual", MAP, UNSELECTED_BACKGROUND_VISUAL ) DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label", MAP, LABEL ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "labelText", STRING, LABEL_TEXT ) // Deprecated property -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedVisual", MAP, UNSELECTED_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "selectedVisual", MAP, SELECTED_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedVisual", MAP, DISABLED_SELECTED_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedVisual", MAP, DISABLED_UNSELECTED_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedBackgroundVisual", MAP, UNSELECTED_BACKGROUND_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "selectedBackgroundVisual", MAP, SELECTED_BACKGROUND_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedBackgroundVisual", MAP, DISABLED_UNSELECTED_BACKGROUND_VISUAL ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedBackgroundVisual", MAP, DISABLED_SELECTED_BACKGROUND_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedBackgroundVisual", MAP, SELECTED_BACKGROUND_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedBackgroundVisual", MAP, DISABLED_UNSELECTED_BACKGROUND_VISUAL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedBackgroundVisual", MAP, DISABLED_SELECTED_BACKGROUND_VISUAL ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "labelRelativeAlignment", STRING, LABEL_RELATIVE_ALIGNMENT ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "labelPadding", VECTOR4, LABEL_PADDING ) DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "visualPadding", VECTOR4, VISUAL_PADDING ) @@ -124,10 +117,10 @@ const unsigned int ALIGNMENT_STRING_TABLE_COUNT = sizeof( ALIGNMENT_STRING_TABLE const Property::Index VISUAL_INDEX_FOR_STATE[][Button::STATE_COUNT] = { - { Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::UNSELECTED_VISUAL }, - { Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::SELECTED_VISUAL }, - { Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL }, - { Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL } + { Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::UNSELECTED_VISUAL }, + { Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::SELECTED_VISUAL }, + { Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL }, + { Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::DISABLED_SELECTED_VISUAL } }; /** @@ -187,33 +180,18 @@ void Button::SetAutoRepeating( bool autoRepeating ) } } -bool Button::IsAutoRepeating() const -{ - return mAutoRepeating; -} - void Button::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay ) { DALI_ASSERT_DEBUG( initialAutoRepeatingDelay > 0.f ); mInitialAutoRepeatingDelay = initialAutoRepeatingDelay; } -float Button::GetInitialAutoRepeatingDelay() const -{ - return mInitialAutoRepeatingDelay; -} - void Button::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay ) { DALI_ASSERT_DEBUG( nextAutoRepeatingDelay > 0.f ); mNextAutoRepeatingDelay = nextAutoRepeatingDelay; } -float Button::GetNextAutoRepeatingDelay() const -{ - return mNextAutoRepeatingDelay; -} - void Button::SetTogglableButton( bool togglable ) { mTogglableButton = togglable; @@ -225,11 +203,6 @@ void Button::SetTogglableButton( bool togglable ) } } -bool Button::IsTogglableButton() const -{ - return mTogglableButton; -} - void Button::SetSelected( bool selected ) { if( mTogglableButton ) @@ -315,7 +288,7 @@ void Button::ChangeState( State requestedState ) mPreviousButtonState = mButtonState; // Store previous state for visual removal (used when animations ended) mButtonState = requestedState; // Update current state - if ( Self().OnStage() ) + if ( Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { OnStateChange( mButtonState ); // Notify derived buttons SelectRequiredVisual( VISUAL_INDEX_FOR_STATE[ mButtonState ][ BACKGROUND ] ); @@ -339,31 +312,6 @@ bool Button::IsSelected() const return mTogglableButton && selected; } -void Button::SetLabelText( const std::string& label ) -{ - Self().SetProperty( Toolkit::Button::Property::LABEL, label ); -} - -std::string Button::GetLabelText() const -{ - Property::Value value = Self().GetProperty( Toolkit::Button::Property::LABEL ); - - Property::Map *labelProperty = value.GetMap(); - - std::string textLabel; - - if ( labelProperty ) - { - Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); - if( value ) - { - value->Get( textLabel ); - } - } - - return textLabel; -} - void Button::MergeWithExistingLabelProperties( const Property::Map& inMap, Property::Map& outMap ) { DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties with %d properties\n", inMap.Count() ); @@ -431,7 +379,7 @@ void Button::CreateVisualsForComponent( Property::Index index, const Property::V else { // if its not a string then get a Property::Map from the property if possible. - Property::Map *map = value.GetMap(); + const Property::Map *map = value.GetMap(); if( map && !map->Empty() ) // Empty map results in current visual removal. { DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent Using Map(%d)\n", index ); @@ -670,9 +618,9 @@ void Button::OnInitialize() mTapDetector.Attach( self ); mTapDetector.DetectedSignal().Connect(this, &Button::OnTap); - self.SetKeyboardFocusable( true ); + self.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true ); - self.TouchSignal().Connect( this, &Button::OnTouch ); + self.TouchedSignal().Connect( this, &Button::OnTouch ); } bool Button::OnAccessibilityActivated() @@ -680,13 +628,9 @@ bool Button::OnAccessibilityActivated() return OnKeyboardEnter(); } -bool Button::OnTouch( Actor actor, const TouchData& touch ) +bool Button::OnTouch( Actor actor, const TouchEvent& touch ) { - - // Only events are processed when the button is not disabled - auto result( false ); - - if( !IsDisabled() ) + if( !IsDisabled() && (actor == touch.GetHitActor(0)) ) { if ( 1 == touch.GetPointCount() ) { @@ -727,9 +671,8 @@ bool Button::OnTouch( Actor actor, const TouchData& touch ) // Sets the button state to the default mButtonPressedState = UNPRESSED; } - result = true; } - return result; + return false; } bool Button::OnKeyboardEnter() @@ -741,7 +684,7 @@ bool Button::OnKeyboardEnter() return ret; } -void Button::OnStageDisconnection() +void Button::OnSceneDisconnection() { if( DEPRESSED == mButtonPressedState ) { @@ -758,18 +701,18 @@ void Button::OnStageDisconnection() mButtonPressedState = UNPRESSED; - Control::OnStageDisconnection(); // Visuals will be set off stage + Control::OnSceneDisconnection(); // Visuals will be set off stage } -void Button::OnStageConnection( int depth ) +void Button::OnSceneConnection( int depth ) { - DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::OnStageConnection ptr(%p) \n", this ); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::OnSceneConnection ptr(%p) \n", this ); OnButtonVisualRemoval( VISUAL_INDEX_FOR_STATE[ mPreviousButtonState ][ BACKGROUND ] ); OnButtonVisualRemoval( VISUAL_INDEX_FOR_STATE[ mPreviousButtonState ][ FOREGROUND ] ); SelectRequiredVisual( Toolkit::Button::Property::LABEL ); SelectRequiredVisual( VISUAL_INDEX_FOR_STATE[ mButtonState ][ BACKGROUND ] ); SelectRequiredVisual( VISUAL_INDEX_FOR_STATE[ mButtonState ][ FOREGROUND ] ); - Control::OnStageConnection( depth ); // Enabled visuals will be put on stage + Control::OnSceneConnection( depth ); // Enabled visuals will be put on stage RelayoutRequest(); } @@ -1172,60 +1115,24 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope break; } - case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: // Legacy Tizen 3.0 - { - GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND ); - break; - } - case Toolkit::Button::Property::DISABLED_STATE_IMAGE: // Legacy Tizen 3.0 - { - GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND ); - break; - } - case Toolkit::Button::Property::SELECTED_STATE_IMAGE: // Legacy Tizen 3.0 - { - GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND ); - break; - } - case Toolkit::DevelButton::Property::UNSELECTED_VISUAL: - case Toolkit::DevelButton::Property::SELECTED_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL: + case Toolkit::Button::Property::UNSELECTED_VISUAL: + case Toolkit::Button::Property::SELECTED_VISUAL: + case Toolkit::Button::Property::DISABLED_SELECTED_VISUAL: + case Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL: { GetImplementation( button ).CreateVisualsForComponent( index, value, DepthIndex::CONTENT ); break; } - case Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL: - case Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL: { GetImplementation( button ).CreateVisualsForComponent( index , value, DepthIndex::BACKGROUND); break; } - case Toolkit::Button::Property::UNSELECTED_COLOR: - { - DALI_LOG_WARNING("[%s] Using deprecated Property Button::Property::UNSELECTED_COLOR instead use Button::Property::UNSELECTED_BACKGROUND_VISUAL\n", __FUNCTION__); - GetImplementation( button ).SetColor( value.Get< Vector4 >(), Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); - break; - } - - case Toolkit::Button::Property::SELECTED_COLOR: - { - DALI_LOG_WARNING("[%s] Using deprecated Property Button::Property::SELECTED_COLOR instead use Button::Property::SELECTED_BACKGROUND_VISUAL\n", __FUNCTION__); - GetImplementation( button ).SetColor( value.Get< Vector4 >(), Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ); - break; - } - - case Toolkit::Button::Property::LABEL_TEXT: - { - DALI_LOG_WARNING("[%s] Using deprecated Property Button::Property::LABEL_TEXT instead use Button::Property::LABEL\n", __FUNCTION__); - GetImplementation( button ).SetLabelText(value.Get< std::string >() ); - break; - } - case Toolkit::Button::Property::LABEL: { Property::Map outTextVisualProperties; @@ -1244,11 +1151,11 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope else { // Get a Property::Map from the property if possible. - Property::Map* setPropertyMap = value.GetMap(); + const Property::Map* setPropertyMap = value.GetMap(); if( setPropertyMap ) { - TextVisual::ConvertStringKeysToIndexKeys( *setPropertyMap ); - GetImplementation( button ).MergeWithExistingLabelProperties( *setPropertyMap, outTextVisualProperties ); + Property::Map indexKeys = TextVisual::ConvertStringKeysToIndexKeys( *setPropertyMap ); + GetImplementation( button ).MergeWithExistingLabelProperties( indexKeys, outTextVisualProperties ); } } @@ -1333,32 +1240,14 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert break; } - case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: - { - value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); - break; - } - - case Toolkit::Button::Property::SELECTED_STATE_IMAGE: - { - value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ); - break; - } - - case Toolkit::Button::Property::DISABLED_STATE_IMAGE: - { - value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL ); - break; - } - - case Toolkit::DevelButton::Property::UNSELECTED_VISUAL: - case Toolkit::DevelButton::Property::SELECTED_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL: - case Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL: - case Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL: - case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::UNSELECTED_VISUAL: + case Toolkit::Button::Property::SELECTED_VISUAL: + case Toolkit::Button::Property::DISABLED_SELECTED_VISUAL: + case Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL: + case Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL: case Toolkit::Button::Property::LABEL: { Property::Map visualProperty; @@ -1369,24 +1258,6 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert break; } - case Toolkit::Button::Property::UNSELECTED_COLOR: - { - value = GetImplementation( button ).GetUnselectedColor(); - break; - } - - case Toolkit::Button::Property::SELECTED_COLOR: - { - value = GetImplementation( button ).GetSelectedColor(); - break; - } - - case Toolkit::Button::Property::LABEL_TEXT: - { - value = GetImplementation( button ).GetLabelText(); - break; - } - case Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT: { const char* alignment = Scripting::GetEnumerationName< Button::Align >( GetImplementation( button ).GetLabelAlignment(), @@ -1442,210 +1313,26 @@ Padding Button::GetForegroundPadding() return mForegroundPadding; } -//////////////////////////////////////////////////////////////////////// -// Legacy functions from Tizen 2.4 and 3.0 - -// Legacy code needed whilst Color can be set by direct Property setting ( deprecated ) instead of setting a Visual -void Button::SetColor( const Vector4& color, Property::Index visualIndex ) +std::string Button::AccessibleImpl::GetNameRaw() { - if ( visualIndex == Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ) - { - mSelectedColor = color; - } - else - { - mUnselectedColor = color; - } + auto slf = Toolkit::Button::DownCast( self ); - Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; - map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; + Property::Map label = slf.GetProperty( Toolkit::Button::Property::LABEL ); - CreateVisualsForComponent( visualIndex, map, DepthIndex::BACKGROUND ); -} - -const Vector4 Button::GetUnselectedColor() const -{ - return mUnselectedColor; -} + std::string labelText; + label.Find( Toolkit::TextVisual::Property::TEXT )->Get( labelText ); -const Vector4 Button::GetSelectedColor() const -{ - return mSelectedColor; -} - -void Button::SetAnimationTime( float animationTime ) -{ - // Used by deprecated API - mAnimationTime = animationTime; -} - -float Button::GetAnimationTime() const -{ - // Used by deprecated API - return mAnimationTime; + return labelText; } -void Button::SetLabel( Actor label ) +Dali::Accessibility::States Button::AccessibleImpl::CalculateStates() { - if ( label ) - { - Property::Value value =""; - value = label.GetProperty(Toolkit::TextLabel::Property::TEXT); - - SetLabelText( value.Get() ); - } -} - -void Button::SetUnselectedImage( const std::string& filename ) -{ - SetBackgroundImage( filename ); -} - -void Button::SetBackgroundImage( const std::string& filename ) -{ - if( !filename.empty() ) - { - CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND ); - } - else - { - DevelControl::UnregisterVisual( *this, Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); - } -} - -void Button::SetSelectedImage( const std::string& filename ) -{ - SetSelectedBackgroundImage( filename ); -} - -void Button::SetSelectedBackgroundImage( const std::string& filename ) -{ - if( !filename.empty() ) - { - CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND ); - } - else - { - DevelControl::UnregisterVisual( *this, Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); - } -} - -void Button::SetDisabledBackgroundImage( const std::string& filename ) -{ - if( !filename.empty() ) - { - CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND ); - } -} - -void Button::SetDisabledImage( const std::string& filename ) -{ - if( !filename.empty() ) - { - CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL, filename, DepthIndex::CONTENT ); - } -} - -void Button::SetDisabledSelectedImage( const std::string& filename ) -{ - if( !filename.empty() ) - { - CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL, filename, DepthIndex::CONTENT ); - } -} - -// Used by Deprecated Properties which don't use the Visual Property maps for setting and getting -std::string Button::GetUrlForImageVisual( const Property::Index index ) const -{ - Toolkit::Visual::Base visual = DevelControl::GetVisual( *this, index ); - std::string result; - - if ( visual ) - { - Dali::Property::Map retreivedMap; - visual.CreatePropertyMap( retreivedMap ); - Property::Value* value = retreivedMap.Find( Toolkit::ImageVisual::Property::URL, Property::STRING ); - if ( value ) - { - result = value->Get(); - } - } - - return result; -} - -// Below functions DEPRECATED_1_0.50 - Return empty Actors - -namespace -{ -std::string GetUrlFromImage( Image& image ) -{ - ResourceImage resourceImage = ResourceImage::DownCast( image ); - - std::string imageUrl; - - if ( resourceImage ) - { - imageUrl = resourceImage.GetUrl(); - } - return imageUrl; -} - -} // namespace - - -void Button::SetButtonImage( Image image ) -{ - DALI_LOG_WARNING("Button::SetButtonImage @DEPRECATED_1_0.50\n"); - SetUnselectedImage( GetUrlFromImage( image ) ); - mSetButtonImage = image; -} - -void Button::SetSelectedImage( Image image ) -{ - DALI_LOG_WARNING("Button::SetSelectedImage @DEPRECATED_1_0.50\n"); - SetSelectedImage( GetUrlFromImage( image ) ); - mSetSelectedImage = image; -} - -Actor Button::GetButtonImage() const -{ - // When deprecated ImageView API removed then this button API can be removed too. - DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50\n"); - - Actor imageView; - - if ( mSetButtonImage ) - { - imageView = Toolkit::ImageView::New( mSetButtonImage ); - } - else - { - ResourceImage image = ResourceImage::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ) ); - imageView = Toolkit::ImageView::New( image ); - } - - return imageView; -} - -Actor Button::GetSelectedImage() const -{ - // When deprecated ImageView API removed then this button API can be removed too. - DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50\n"); - - Actor imageView; - - if ( mSetSelectedImage ) - { - imageView = Toolkit::ImageView::New( mSetSelectedImage ); - } - else - { - ResourceImage image = ResourceImage::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ) ); - imageView = Toolkit::ImageView::New( image ); - } - return imageView; + auto tmp = Control::Impl::AccessibleImpl::CalculateStates(); + tmp[Dali::Accessibility::State::SELECTABLE] = true; + auto slf = Toolkit::Button::DownCast( self ); + tmp[Dali::Accessibility::State::ENABLED] = !slf.GetProperty( Toolkit::Button::Property::DISABLED ); + tmp[Dali::Accessibility::State::CHECKED] = slf.GetProperty( Toolkit::Button::Property::SELECTED ); + return tmp; } } // namespace Internal