#include <dali-toolkit/dali-toolkit.h>
#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+
using namespace Dali;
using namespace Toolkit;
tet_infoline(" UtcDaliPushButtonPropertyGetLabelAlignment\n");
Button button = PushButton::New();
- button.SetProperty( Toolkit::Button::Property::LABEL_RELATIVE_ALIGNMENT, "END" );
- DALI_TEST_EQUALS( button.GetProperty<std::string>( Toolkit::Button::Property::LABEL_RELATIVE_ALIGNMENT ), "END", TEST_LOCATION );
+ button.SetProperty( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT, "END" );
+ DALI_TEST_EQUALS( button.GetProperty<std::string>( Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT ), "END", TEST_LOCATION );
END_TEST;
}
ToolkitTestApplication application;
Button button = PushButton::New();
+ button.SetProperty( Toolkit::Button::Property::LABEL,
+ Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+ .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
+ );
button.SetLabelText( "Button Label" );
Button button = PushButton::New();
+ button.SetProperty( Toolkit::Button::Property::LABEL,
+ Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+ .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f )
+ );
+
button.SetProperty( Button::Property::LABEL_TEXT, TEST_LABEL1 );
std::string labelText = button.GetProperty<std::string>( Button::Property::LABEL_TEXT );
DALI_TEST_EQUALS( labelText, TEST_LABEL1, TEST_LOCATION );
Property::Map propertyMap;
- propertyMap.Insert( Toolkit::TextLabel::Property::TEXT, TEST_LABEL2 );
- propertyMap.Insert( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLUE);
+ propertyMap.Insert( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT );
+ propertyMap.Insert( Toolkit::TextVisual::Property::TEXT, TEST_LABEL2 );
+ propertyMap.Insert( Toolkit::TextVisual::Property::TEXT_COLOR, Color::BLUE );
+ propertyMap.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f );
button.SetProperty( Button::Property::LABEL, propertyMap );
labelText = button.GetProperty<std::string>( Button::Property::LABEL_TEXT );
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;
}
tet_infoline(" UtcDaliButtonSetImagesWithDeprecatedProperties");
PushButton pushButton = PushButton::New();
+
Stage::GetCurrent().Add( pushButton );
Property::Map propertyMap;