X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=d09f7811aa23677ca964387e5d21f4965d4d49a5;hp=1b7f4950d2af6dd109c2d35ec31ab8123184424a;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=0e07671d24b10bd49423ec6ce22817000bb18336 diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 1b7f495..d09f781 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -21,7 +21,6 @@ // EXTERNAL INCLUDES #include #include -#include #include #include @@ -30,7 +29,6 @@ #include #include #include -#include #if defined(DEBUG_ENABLED) extern Debug::Filter* gLogButtonFilter; @@ -57,24 +55,11 @@ BaseHandle Create() DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create ) -DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "unselectedIcon", STRING, UNSELECTED_ICON ) -DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "selectedIcon", STRING, SELECTED_ICON ) -DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconAlignment", STRING, ICON_ALIGNMENT ) DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "labelPadding", STRING, LABEL_PADDING ) DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconPadding", STRING, ICON_PADDING ) DALI_TYPE_REGISTRATION_END() -/* - * Table to define Text-to-enum conversions for IconAlignment. - */ -const Dali::Scripting::StringEnum IconAlignmentTable[] = { - { "LEFT", Toolkit::Internal::PushButton::LEFT }, - { "RIGHT", Toolkit::Internal::PushButton::RIGHT }, - { "TOP", Toolkit::Internal::PushButton::TOP }, - { "BOTTOM", Toolkit::Internal::PushButton::BOTTOM }, -}; const unsigned int IconAlignmentTableCount = sizeof( IconAlignmentTable ) / sizeof( IconAlignmentTable[0] ); - } // unnamed namespace namespace @@ -113,7 +98,7 @@ void PushButton::OnInitialize() // Push button requires the Leave event. Actor self = Self(); - self.SetLeaveRequired( true ); + self.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); } void PushButton::SetIconAlignment( const PushButton::IconAlignment iconAlignment ) @@ -163,25 +148,6 @@ void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, switch ( propertyIndex ) { - case Toolkit::PushButton::Property::UNSELECTED_ICON: - { - pushButtonImpl.CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, value, DepthIndex::CONTENT ); - break; - } - case Toolkit::PushButton::Property::SELECTED_ICON: - { - pushButtonImpl.CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_VISUAL, value, DepthIndex::CONTENT ); - break; - } - case Toolkit::PushButton::Property::ICON_ALIGNMENT: - { - IconAlignment iconAlignment; - if( Scripting::GetEnumeration< IconAlignment >( value.Get< std::string >().c_str(), IconAlignmentTable, IconAlignmentTableCount, iconAlignment ) ) - { - pushButtonImpl.SetIconAlignment( iconAlignment ); - } - break; - } case Toolkit::PushButton::Property::LABEL_PADDING: { Vector4 padding ( value.Get< Vector4 >() ); @@ -210,21 +176,6 @@ Property::Value PushButton::GetProperty( BaseObject* object, Property::Index pro switch ( propertyIndex ) { - case Toolkit::PushButton::Property::UNSELECTED_ICON: - { - //value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION ); - break; - } - case Toolkit::PushButton::Property::SELECTED_ICON: - { - //value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION ); - break; - } - case Toolkit::PushButton::Property::ICON_ALIGNMENT: - { - value = Scripting::GetLinearEnumerationName< IconAlignment >( pushButtonImpl.GetIconAlignment(), IconAlignmentTable, IconAlignmentTableCount ); - break; - } case Toolkit::PushButton::Property::LABEL_PADDING: { Padding padding = pushButtonImpl.Button::GetLabelPadding(); @@ -243,104 +194,6 @@ Property::Value PushButton::GetProperty( BaseObject* object, Property::Index pro return value; } -// Deprecated API using Actor to set images - -void PushButton::SetButtonImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetButtonImage() is deprecated and will be removed from next release. Use Button.SetProperty UNSELECTED_STATE_IMAGE or Styling file instead.\n" ); - - Image retreivedButtonImage = Toolkit::ImageView::DownCast( image ).GetImage(); - if ( retreivedButtonImage ) - { - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - - if ( resourceImage ) - { - Self().SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, resourceImage.GetUrl() ); - - } - } -} - -void PushButton::SetBackgroundImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundImage() is deprecated and will be removed from next release.\n" ); - - SetButtonImage( image ); - -} - -void PushButton::SetSelectedImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedImage() is deprecated and will be removed from next release. Use Button.SetProperty SELECTED_STATE_IMAGE or Styling file instead.\n" ); - - Image retreivedButtonImage = Toolkit::ImageView::DownCast( image ).GetImage(); - if ( retreivedButtonImage ) - { - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - - if ( resourceImage ) - { - Self().SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, resourceImage.GetUrl() ); - } - } -} - -void PushButton::SetSelectedBackgroundImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedBackgroundImage() is deprecated and will be removed from next release.\n" ); - - SetSelectedImage( image ); -} - -void PushButton::SetDisabledBackgroundImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledBackgroundImage() is deprecated and will be removed from next release.\n" ); - - Image retreivedButtonImage = Toolkit::ImageView::DownCast( image ).GetImage(); - if ( retreivedButtonImage ) - { - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - - if ( resourceImage ) - { - Self().SetProperty( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, resourceImage.GetUrl() ); - } - } -} - -void PushButton::SetDisabledImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledImage() is deprecated and will be removed from next release. Use Button.SetProperty DISABLED_STATE_IMAGE or Styling file instead.\n" ); - - Image retreivedButtonImage = Toolkit::ImageView::DownCast( image ).GetImage(); - if ( retreivedButtonImage ) - { - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - - if ( resourceImage ) - { - Self().SetProperty( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, resourceImage.GetUrl() ); - } - } -} - -void PushButton::SetDisabledSelectedImage( Actor image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetDisabledSelectedImage() is deprecated and will be removed from next release.\n" ); - - Image retreivedButtonImage = Toolkit::ImageView::DownCast( image ).GetImage(); - if ( retreivedButtonImage ) - { - ResourceImage resourceImage = ResourceImage::DownCast( retreivedButtonImage ); - - if ( resourceImage ) - { - Self().SetProperty( Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, resourceImage.GetUrl() ); - } - } -} - } // namespace Internal } // namespace Toolkit