#include <toolkit-timer.h>
#include <toolkit-event-thread-callback.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
#include "dummy-control.h"
VisualFactory factory = VisualFactory::Get();
Visual::Base animatedImageVisual = factory.CreateVisual(
Property::Map()
- .Add( Visual::Property::TYPE, DevelVisual::ANIMATED_IMAGE )
+ .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
.Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME )
.Add( ImageVisual::Property::PIXEL_AREA, Vector4() )
.Add( ImageVisual::Property::WRAP_MODE_U, WrapMode::REPEAT )
Property::Map resultMap;
animatedImageVisual.CreatePropertyMap( resultMap );
// check the property values from the returned map from a visual
- Property::Value* value = resultMap.Find( Visual::Property::TYPE, Property::INTEGER );
+ Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_IMAGE );
+ DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
DALI_TEST_CHECK( value );
resultMap.Clear();
animatedImageVisual2.CreatePropertyMap( resultMap );
// check the property values from the returned map from a visual
- value = resultMap.Find( Visual::Property::TYPE, Property::INTEGER );
+ value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_IMAGE );
+ DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
value = resultMap.Find( ImageVisual::Property::URL, Property::STRING );
DALI_TEST_CHECK( value );
Visual::Base animatedImageVisual = factory.CreateVisual(
Property::Map()
- .Add( Visual::Property::TYPE, DevelVisual::ANIMATED_IMAGE )
+ .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE )
.Add( "url", urls )
.Add( "batchSize", 4 )
.Add( "cacheSize", 8 )
Property::Map resultMap;
animatedImageVisual.CreatePropertyMap( resultMap );
// check the property values from the returned map from a visual
- Property::Value* value = resultMap.Find( Visual::Property::TYPE, Property::INTEGER );
+ Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get<int>() == DevelVisual::ANIMATED_IMAGE );
+ DALI_TEST_CHECK( value->Get<int>() == Visual::ANIMATED_IMAGE );
- value = resultMap.Find( DevelImageVisual::Property::URL, "url" );
+ value = resultMap.Find( ImageVisual::Property::URL, "url" );
DALI_TEST_CHECK( value );
Property::Array* resultUrls = value->GetArray();
DALI_TEST_CHECK( resultUrls );
DALI_TEST_EQUALS( resultUrls->Count(), urls.Count(), TEST_LOCATION );
- value = resultMap.Find( DevelImageVisual::Property::BATCH_SIZE, "batchSize" );
+ value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" );
DALI_TEST_CHECK( value );
DALI_TEST_EQUALS( value->Get<int>(), 4, TEST_LOCATION );
- value = resultMap.Find( DevelImageVisual::Property::CACHE_SIZE, "cacheSize" );
+ value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" );
DALI_TEST_CHECK( value );
DALI_TEST_EQUALS( value->Get<int>(), 8, TEST_LOCATION );
- value = resultMap.Find( DevelImageVisual::Property::FRAME_DELAY, "frameDelay" );
+ value = resultMap.Find( ImageVisual::Property::FRAME_DELAY, "frameDelay" );
DALI_TEST_CHECK( value );
DALI_TEST_EQUALS( value->Get<int>(), 200, TEST_LOCATION );
{
Property::Map propertyMap;
propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
- propertyMap.Insert( DevelImageVisual::Property::URL, Property::Value(urls) );
- propertyMap.Insert( DevelImageVisual::Property::BATCH_SIZE, 4);
- propertyMap.Insert( DevelImageVisual::Property::CACHE_SIZE, 8);
- propertyMap.Insert( DevelImageVisual::Property::FRAME_DELAY, 100);
+ propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
+ propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
+ propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 8);
+ propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
VisualFactory factory = VisualFactory::Get();
Visual::Base visual = factory.CreateVisual( propertyMap );
Property::Map propertyMap;
propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
- propertyMap.Insert( DevelImageVisual::Property::URL, Property::Value(urls) );
- propertyMap.Insert( DevelImageVisual::Property::BATCH_SIZE, 0);
- propertyMap.Insert( DevelImageVisual::Property::CACHE_SIZE, 0);
- propertyMap.Insert( DevelImageVisual::Property::FRAME_DELAY, 100);
+ propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
+ propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 0);
+ propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 0);
+ propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
VisualFactory factory = VisualFactory::Get();
Visual::Base visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0
Property::Map animatedImageMap1;
animatedImageMap1.Insert(Visual::Property::TYPE, Visual::IMAGE );
- animatedImageMap1.Insert( DevelImageVisual::Property::URL, Property::Value(urls1) );
- animatedImageMap1.Insert( DevelImageVisual::Property::BATCH_SIZE, 3);
- animatedImageMap1.Insert( DevelImageVisual::Property::CACHE_SIZE, 3);
- animatedImageMap1.Insert( DevelImageVisual::Property::FRAME_DELAY, 100);
+ animatedImageMap1.Insert( ImageVisual::Property::URL, Property::Value(urls1) );
+ animatedImageMap1.Insert( ImageVisual::Property::BATCH_SIZE, 3);
+ animatedImageMap1.Insert( ImageVisual::Property::CACHE_SIZE, 3);
+ animatedImageMap1.Insert( ImageVisual::Property::FRAME_DELAY, 100);
Property::Map animatedImageMap2;
animatedImageMap2.Insert(Visual::Property::TYPE, Visual::IMAGE );
- animatedImageMap2.Insert( DevelImageVisual::Property::URL, Property::Value(urls2) );
- animatedImageMap2.Insert( DevelImageVisual::Property::BATCH_SIZE, 2);
- animatedImageMap2.Insert( DevelImageVisual::Property::CACHE_SIZE, 2);
- animatedImageMap2.Insert( DevelImageVisual::Property::FRAME_DELAY, 100);
+ animatedImageMap2.Insert( ImageVisual::Property::URL, Property::Value(urls2) );
+ animatedImageMap2.Insert( ImageVisual::Property::BATCH_SIZE, 2);
+ animatedImageMap2.Insert( ImageVisual::Property::CACHE_SIZE, 2);
+ animatedImageMap2.Insert( ImageVisual::Property::FRAME_DELAY, 100);
VisualFactory factory = VisualFactory::Get();
Visual::Base animatedImageVisual1 = factory.CreateVisual( animatedImageMap1 );
{
Property::Map propertyMap;
propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
- propertyMap.Insert( DevelImageVisual::Property::URL, Property::Value(urls) );
- propertyMap.Insert( DevelImageVisual::Property::BATCH_SIZE, 6);
- propertyMap.Insert( DevelImageVisual::Property::CACHE_SIZE, 11);
- propertyMap.Insert( DevelImageVisual::Property::FRAME_DELAY, 100);
+ propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
+ propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 6);
+ propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 11);
+ propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
VisualFactory factory = VisualFactory::Get();
Visual::Base visual = factory.CreateVisual( propertyMap );
{
Property::Map propertyMap;
propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE );
- propertyMap.Insert( DevelImageVisual::Property::URL, Property::Value(urls) );
- propertyMap.Insert( DevelImageVisual::Property::BATCH_SIZE, 4);
- propertyMap.Insert( DevelImageVisual::Property::CACHE_SIZE, 11);
- propertyMap.Insert( DevelImageVisual::Property::FRAME_DELAY, 100);
+ propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) );
+ propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 4);
+ propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 11);
+ propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100);
VisualFactory factory = VisualFactory::Get();
Visual::Base visual = factory.CreateVisual( propertyMap );