Previously just returned an empty Actor but now returns a ImageView created from the Visual url.
SetSelectedImage and SetButtonImage fixed to return an Actor and parameter as Image to now break API.
Removed commented out code
Change-Id: I39edfc5200a8617fb3a2fc8a8576595ae7593dcd
try
{
- ResourceImage image1 = ResourceImage::New( "TestImage.jpg");
+ ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
button.SetButtonImage( image1 );
Property::Value value = button.GetProperty(Button::Property::UNSELECTED_STATE_IMAGE );
- DALI_TEST_CHECK( value.Get<std::string>() == "TestImage.jpg" );
+ DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
}
catch(...)
{
DALI_TEST_CHECK( false );
}
+ std::string imageUrl;
+
+ Dali::Actor actor = button.GetButtonImage();
+
+ Toolkit::ImageView imageView = Toolkit::ImageView ::DownCast( actor );
+
+ tet_infoline(" UtcDaliButtonSetButtonImageP Ensure an ImageView is returned\n");
+ DALI_TEST_CHECK ( imageView )
+
END_TEST;
}
try
{
- ResourceImage image1 = ResourceImage::New( "TestImage.jpg");
+ ResourceImage image1 = ResourceImage::New( TEST_IMAGE_ONE );
button.SetButtonImage( image1 );
DALI_TEST_CHECK( false );
try
{
button.SetSelectedImage( image1 );
- Property::Value value = button.GetProperty(Button::Property::SELECTED_STATE_IMAGE );
+ Property::Value value = button.GetProperty( Button::Property::SELECTED_STATE_IMAGE );
DALI_TEST_CHECK( value.Get<std::string>() == TEST_IMAGE_ONE );
}
catch(...)
DALI_TEST_CHECK( false );
}
+ std::string imageUrl;
+
+ Dali::Actor actor = button.GetSelectedImage();
+
+ Toolkit::ImageView imageView = Toolkit::ImageView::DownCast( actor );
+
+ tet_infoline(" UtcDaliButtonSetSelectedImageWithImageP Ensure an ImageView is returned\n");
+
END_TEST;
}
if( mTogglableButton ) // Button up will change state
{
- OnToggleReleased(); // Derived toggle buttons can override this to provide custom behaviour
+ validButtonAction = OnToggleReleased(); // Derived toggle buttons can override this to provide custom behaviour
}
else
{
{
DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout targetSize(%f,%f) ptr(%p) state[%d]\n", size.width, size.height, this, mButtonState );
+ PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState );
+
Toolkit::Visual::Base currentVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][FOREGROUND] );
Toolkit::Visual::Base currentBackGroundVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][BACKGROUND] );
void Button::SetAnimationTime( float animationTime )
{
- // Used by depreciated API
+ // Used by deprecated API
mAnimationTime = animationTime;
}
float Button::GetAnimationTime() const
{
- // Used by depreciated API
+ // Used by deprecated API
return mAnimationTime;
}
}
}
-std::string Button::GetUrlForImageVisual( Property::Index index )
+std::string Button::GetUrlForImageVisual( const Property::Index index ) const
{
Toolkit::Visual::Base visual = GetVisual( index );
std::string 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 ) );
+}
+
+void Button::SetSelectedImage( Image image )
+{
+ DALI_LOG_WARNING("Button::SetSelectedImage @DEPRECATED_1_0.50\n");
+ SetSelectedImage( GetUrlFromImage( image ) );
+}
+
Actor Button::GetButtonImage() const
{
- DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50 Returning empty Actor \n");
- return Actor();;
+ DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50\n");
+ Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::Button::Property::UNSELECTED_VISUAL ) );
+
+ return imageView;
}
Actor Button::GetSelectedImage() const
{
- DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50 Returning empty Actor \n");
- return Actor();
+ DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50\n");
+ Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::Button::Property::SELECTED_VISUAL ) );
+
+ return imageView;
}
} // namespace Internal
#include <dali-toolkit/public-api/controls/buttons/button.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
-//#if defined(DEBUG_ENABLED)
-// Debug::Filter* gLogButtonFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_BUTTON_CONTROL");
-//#endif
-
namespace Dali
{
/**
* @deprecated Sets the unselected image with an Actor.
- * @param[in] image The Actor to use.
+ * @param[in] image The Image to use.
*/
- void SetUnselectedImage( Actor image );
+ void SetButtonImage( Image image );
/**
* @deprecated Sets the selected image with an Actor.
- * @param[in] image The Actor to use.
- */
- void SetSelectedImage( Actor image );
-
- /**
- * @deprecated Sets the selected background image with an Actor.
- * @param[in] image The Actor to use.
- */
- void SetSelectedBackgroundImage( Actor image );
-
- /**
- * @deprecated Sets the disabled image with an Actor.
- * @param[in] image The Actor to use.
- */
- void SetDisabledImage( Actor image );
-
- /**
- * @deprecated Sets the disabled selected image with an Actor.
- * @param[in] image The Actor to use.
+ * @param[in] image The Image to use.
*/
- void SetDisabledSelectedImage( Actor image );
-
- /**
- * @deprecated Sets the disabled background image with an Actor.
- * @param[in] image The Actor to use.
- */
- void SetDisabledBackgroundImage( Actor image );
+ void SetSelectedImage( Image image );
/**
* @Gets url of a image visual, used by GetProperty but for deprecated Properties
* @param[in] index Visual index of url required
* @return filename for the corresponding visual
*/
- std::string GetUrlForImageVisual( Property::Index index );
-
+ std::string GetUrlForImageVisual( const Property::Index index ) const;
/**
* @copydoc Dali::Toolkit::Button::GetButtonImage
{
DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetButtonImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
- Dali::ResourceImage resourceImage = Dali::ResourceImage::DownCast( image );
-
- std::string imageUrl;
-
- if ( resourceImage )
- {
- imageUrl = resourceImage.GetUrl();
- }
-
- Dali::Toolkit::GetImplementation( *this ).SetUnselectedImage( imageUrl );
+ Dali::Toolkit::GetImplementation( *this ).SetButtonImage( image );
}
void Button::SetSelectedImage( Image image )
{
DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetSelectedImage() is deprecated and will be removed from next release. Use Styling file instead.\n" );
- Dali::ResourceImage resourceImage = Dali::ResourceImage::DownCast( image );
-
- std::string imageUrl;
-
- if ( resourceImage )
- {
- imageUrl = resourceImage.GetUrl();
- }
-
- Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( imageUrl );
+ Dali::Toolkit::GetImplementation( *this ).SetSelectedImage( image );
}
Actor Button::GetButtonImage() const
{
"label":
{
- "pointSize":8,
- "fontStyle":{"weight":"light"}
+ "visualType":"TEXT",
+ "pointSize":8
}
},
"TextSelectionToolbar":
{
"label":
{
- "pointSize":8,
- "fontStyle":{"weight":"light"}
+ "visualType": "TEXT",
+ "pointSize":8
}
},
"TextSelectionToolbar":