#include <dali-toolkit/dali-toolkit.h>
#include <dali/devel-api/scripting/scripting.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali/public-api/rendering/renderer.h>
+#include <dali-toolkit/devel-api/image-loader/texture-manager.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
+#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
#include <test-native-image.h>
#include <sstream>
#include <unistd.h>
+
+#include "dummy-control.h"
+
using namespace Dali;
using namespace Toolkit;
imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
imageMap[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
imageMap[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
- imageMap[ DevelImageVisual::Property::ATLASING] = true;
+ imageMap[ ImageVisual::Property::ATLASING] = true;
ImageView imageView = ImageView::New();
imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
+ imageView.SetProperty( Toolkit::Control::Property::PADDING, Extents( 10u, 10u, 10u, 10u ) );
// By default, Aysnc loading is used
// loading is not started if the actor is offStage
application.Render(16);
application.SendNotification();
+ imageView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
+ application.SendNotification();
+ application.Render(16);
+ application.Render(16);
+ application.SendNotification();
+
// loading started, this waits for the loader thread for max 30 seconds
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
Property::Map syncLoadingMap;
syncLoadingMap[ ImageVisual::Property::SYNCHRONOUS_LOADING ] = true;
- syncLoadingMap[ DevelImageVisual::Property::ATLASING ] = true;
+ syncLoadingMap[ ImageVisual::Property::ATLASING ] = true;
// Sync loading, no atlasing for big size image
{
END_TEST;
}
-
int UtcDaliImageViewSyncLoading02(void)
{
ToolkitTestApplication application;
END_TEST;
}
+int UtcDaliImageViewAddedTexture(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline("ImageView Testing image view with texture provided manager url");
+
+ ImageView imageView = ImageView::New();
+
+ // empty texture is ok, though pointless from app point of view
+ TextureSet empty;
+ std::string url = TextureManager::AddTexture(empty);
+ DALI_TEST_CHECK(url.size() > 0u);
+
+ Property::Map propertyMap;
+ propertyMap[ImageVisual::Property::URL] = url;
+ imageView.SetProperty(ImageView::Property::IMAGE, propertyMap);
+
+ Stage::GetCurrent().Add( imageView );
+ application.SendNotification();
+ application.Render();
+
+ END_TEST;
+}
+
int UtcDaliImageViewSizeWithBackground(void)
{
ToolkitTestApplication application;
}
bool gResourceReadySignalFired = false;
+Vector3 gNaturalSize;
void ResourceReadySignal( Control control )
{
imageView.SetBackgroundImage( image );
- DALI_TEST_EQUALS( Toolkit::DevelControl::IsResourceReady( imageView ), false, TEST_LOCATION );
+ DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
- Toolkit::DevelControl::ResourceReadySignal( imageView ).Connect( &ResourceReadySignal);
+ imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
Stage::GetCurrent().Add( imageView );
application.Render(16);
- DALI_TEST_EQUALS( Toolkit::DevelControl::IsResourceReady( imageView ), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
ToolkitTestApplication application;
ImageView imageView = ImageView::New();
+ Toolkit::Internal::Control& controlImpl = Toolkit::Internal::GetImplementation( imageView );
+ Stage::GetCurrent().Add( imageView );
std::string url;
Property::Map map;
+ Toolkit::Visual::Base visual;
Property::Value value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+
+ application.SendNotification();
+ application.Render( 16 );
+
DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+ DALI_TEST_CHECK( ! visual ); // Visual should be invalid
// Set a URL
imageView.SetImage( "TEST_URL" );
+
+ application.SendNotification();
+ application.Render( 16 );
+
value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
DALI_TEST_CHECK( value.Get( url ) ); // Value should NOT be empty
DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+ DALI_TEST_CHECK( visual ); // Visual should be valid
// Set an empty Image
imageView.SetImage( Image() );
+
+ application.SendNotification();
+ application.Render( 16 );
+
value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+ DALI_TEST_CHECK( ! visual ); // Visual should be invalid
// Set an Image
ResourceImage image1 = ResourceImage::New( TEST_IMAGE_FILE_NAME );
imageView.SetImage( image1 );
+
+ application.SendNotification();
+ application.Render( 16 );
+
value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty
+ DALI_TEST_CHECK( visual ); // Visual should be valid
// Set an empty URL
imageView.SetImage( "" );
+
+ application.SendNotification();
+ application.Render( 16 );
+
value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
DALI_TEST_CHECK( ! value.Get( map ) ); // Value should be empty
+ DALI_TEST_CHECK( ! visual ); // Visual should be invalid
+
+ // Set a URL in property map
+ Property::Map propertyMap;
+ propertyMap[ImageVisual::Property::URL] = TEST_IMAGE_FILE_NAME;
+ imageView.SetProperty( ImageView::Property::IMAGE, propertyMap );
+
+ application.SendNotification();
+ application.Render( 16 );
+
+ value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+
+ DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+ DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty
+ DALI_TEST_CHECK( visual ); // Visual should be valid
+
+ // Set a URL in property map again
+ propertyMap[ImageVisual::Property::URL] = gImage_34_RGBA;
+ imageView.SetProperty( ImageView::Property::IMAGE, propertyMap );
+
+ application.SendNotification();
+ application.Render( 16 );
+
+ value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+
+ DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+ DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty
+ DALI_TEST_CHECK( visual ); // Visual should be valid
+
+ // Set an empty URL in property map
+ propertyMap[ImageVisual::Property::URL] = std::string();
+ imageView.SetProperty( ImageView::Property::IMAGE, propertyMap );
+
+ application.SendNotification();
+ application.Render( 16 );
+
+ value = imageView.GetProperty( imageView.GetPropertyIndex( "image" ) );
+ visual = DevelControl::GetVisual( controlImpl, ImageView::Property::IMAGE );
+
+ DALI_TEST_CHECK( ! value.Get( url ) ); // Value should be empty
+ DALI_TEST_CHECK( value.Get( map ) ); // Value should NOT be empty
+ DALI_TEST_CHECK( ! visual ); // Visual should be invalid
END_TEST;
}
// Check ImageView with background and main image, to ensure both visuals are marked as loaded
ImageView imageView = ImageView::New( TEST_IMAGE_1 );
- DALI_TEST_EQUALS( Toolkit::DevelControl::IsResourceReady( imageView ), false, TEST_LOCATION );
+ DALI_TEST_EQUALS( imageView.IsResourceReady(), false, TEST_LOCATION );
- Toolkit::DevelControl::ResourceReadySignal( imageView ).Connect( &ResourceReadySignal);
+ imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
Stage::GetCurrent().Add( imageView );
DALI_TEST_EQUALS( imageView.GetRendererCount(), 1u, TEST_LOCATION );
- DALI_TEST_EQUALS( Toolkit::DevelControl::IsResourceReady( imageView ), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( imageView.IsResourceReady(), true, TEST_LOCATION );
+
+ DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+
+ END_TEST;
+}
+
+void OnRelayoutOverride( Size size )
+{
+ gNaturalSize = size; // Size Relayout is using
+}
+
+int UtcDaliImageViewReplaceImageAndGetNaturalSize(void)
+{
+ ToolkitTestApplication application;
+
+ // Check ImageView with background and main image, to ensure both visuals are marked as loaded
+ ImageView imageView = ImageView::New( TEST_IMAGE_1 );
+ imageView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+
+ DummyControl dummyControl = DummyControl::New( true );
+ Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
+ dummyControl.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
+
+ dummyControl.Add( imageView );
+ dummyImpl.SetRelayoutCallback( &OnRelayoutOverride );
+ Stage::GetCurrent().Add( dummyControl );
+
+ application.SendNotification();
+ application.Render();
+
+ // loading started, this waits for the loader thread for max 30 seconds
+ DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+ DALI_TEST_EQUALS( gNaturalSize.width, 1024.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( gNaturalSize.height, 1024.0f, TEST_LOCATION );
+
+ gNaturalSize = Vector3::ZERO;
+
+ imageView.SetImage(gImage_600_RGB);
+
+ // Waiting for resourceReady so SendNotifcation not called here.
+
+ // loading started, this waits for the loader thread for max 30 seconds
+ DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+ // Trigger a potential relayout
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( gNaturalSize.width, 600.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( gNaturalSize.height, 600.0f, TEST_LOCATION );
+
+ END_TEST;
+}
+
+int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void)
+{
+ tet_infoline("Test Setting Image with IMMEDIATE load and receving ResourceReadySignal before staged.");
+
+ ToolkitTestApplication application;
+
+ gResourceReadySignalFired = false;
+
+ Property::Map imageMap;
+
+ imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
+ imageMap[ DevelImageVisual::Property::LOAD_POLICY ] = DevelImageVisual::LoadPolicy::IMMEDIATE;
+
+ tet_infoline("Creating ImageView without URL so image does not start loading");
+ ImageView imageView = ImageView::New();
+ tet_infoline("Connect to image loaded signal before setting image");
+ imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+ tet_infoline("Setting Image with IMMEDIATE load, signal already connected so will be triggered.");
+ imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
+
+ // loading started, this waits for the loader thread
+ DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+ application.SendNotification();
+ application.Render(16);
+
+ DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+
+ END_TEST;
+}
+
+int UtcDaliImageViewResourceReadySignalWithReusedImage(void)
+{
+ tet_infoline("Test Setting Image that was already loaded by another ImageView and still getting ResourceReadySignal.");
+
+ ToolkitTestApplication application;
+
+ gResourceReadySignalFired = false;
+
+ Property::Map imageMap;
+
+ imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
+ imageMap[ DevelImageVisual::Property::LOAD_POLICY ] = DevelImageVisual::LoadPolicy::IMMEDIATE;
+
+ ImageView imageView = ImageView::New();
+ imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+ imageView.SetProperty( ImageView::Property::IMAGE, imageMap );
+
+ // loading started, this waits for the loader thread
+ DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+ application.SendNotification();
+ application.Render(16);
+
+ DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+ gResourceReadySignalFired = false;
+
+ ImageView imageViewWithExistingImage = ImageView::New();
+ imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal);
+ imageViewWithExistingImage.SetProperty( ImageView::Property::IMAGE, imageMap );
+
+ DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+
+ END_TEST;
+}
+
+int UtcDaliImageViewResourceReadySignalWithReusedImage02(void)
+{
+ tet_infoline("Test Setting Image that was already loaded by another ImageView and still getting ResourceReadySignal when staged.");
+
+ ToolkitTestApplication application;
+
+ gResourceReadySignalFired = false;
+
+ Property::Map imageImmediateLoadingMap;
+ imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
+ imageImmediateLoadingMap[ DevelImageVisual::Property::LOAD_POLICY ] = DevelImageVisual::LoadPolicy::IMMEDIATE;
+
+ tet_infoline("Immediate load an image");
+ ImageView imageView = ImageView::New();
+ imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
+ imageView.SetProperty( ImageView::Property::IMAGE, imageImmediateLoadingMap );
+
+ // loading started, this waits for the loader thread
+ DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
+
+ application.SendNotification();
+ application.Render(16);
+
+ tet_infoline("Check image loaded");
+ DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
+ gResourceReadySignalFired = false;
+
+ tet_infoline("Create another ImageView with the same URL");
+ ImageView imageViewWithExistingImage = ImageView::New( gImage_34_RGBA );
+ tet_infoline("Connect to ResourceReady signal for second ImageView, it should still fire as resource is ready");
+ imageViewWithExistingImage.ResourceReadySignal().Connect( &ResourceReadySignal);
+
+ Stage::GetCurrent().Add( imageViewWithExistingImage );
DALI_TEST_EQUALS( gResourceReadySignalFired, true, TEST_LOCATION );
projects / platform / core / uifw / dali-toolkit.git / blobdiff