"},"
"\"stage\":"
"[{"
- " \"type\": \"ImageActor\","
+ " \"type\": \"ImageView\","
" \"name\": \"{NAME}\","
" \"size\": [100,100,1],"
" \"parentOrigin\": \"TOP_LEFT\","
" \"anchorPoint\": \"{ANCHOR}\","
" \"padding\": \"{PADDING}\","
- " \"image\": { \"filename\": \"dir/{IMAGE_PATH}\" },"
+ " \"image\": { \"imageUrl\": \"dir/{IMAGE_PATH}\" },"
" \"sizeWidth\": \"{WIDTH}\","
" \"signals\": [{"
" \"name\": \"touched\","
"\"templates\":\n"
"{\n"
" \"imageTree\": { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"styles\": [\"imageStyle\"],\n"
" \"name\": \"image\",\n"
" \"size\": \"{SIZE}\",\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
std::string templatejson(
"{ \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"styles\": [\"imageStyle\"],\n"
" \"name\": \"image\",\n"
" \"size\": \"{SIZE}\",\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
Builder builder = Builder::New();
builder.LoadFromString( json );
- ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) );
+ ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
DALI_TEST_CHECK( actor );
Dali::Property::Map map;
map["SIZE"] = Vector3(100,100,1);
- actor = ImageActor::DownCast( builder.Create( "imageTree", map ) );
+ actor = ImageView::DownCast( builder.Create( "imageTree", map ) );
DALI_TEST_CHECK( actor );
// create from json snippet
- actor = ImageActor::DownCast( builder.CreateFromJson( templatejson ) );
+ actor = ImageView::DownCast( builder.CreateFromJson( templatejson ) );
DALI_TEST_CHECK( actor );
" \"name\": \"image\"\n"
" }, \n"
" { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"image\",\n"
" \"size\": [100,100,1],\n"
" \"signals\": [{\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
"\"templates\":\n"
"{\n"
" \"imageTree\": { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"image\",\n"
" \"size\": [100,100,1],\n"
" \"signals\": [{\n"
" },\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
Builder builder = Builder::New();
builder.LoadFromString( json );
- ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) );
+ ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) );
DALI_TEST_CHECK( actor );
// NB: already applied in create
"{\n"
" \"stage\": [\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"Image1\",\n"
" \"position\": [\n"
" 0.40461349487305,\n"
"\"templates\":\n"
"{\n"
" \"imageTree\": { \n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"size\": [100,100,1],\n"
" \"parentOrigin\": [0.5, 0.5, 0.5],\n"
" \"position\": [\n"
" }],\n"
" \"actors\": [\n"
" {\n"
- " \"type\":\"ImageActor\",\n"
+ " \"type\":\"ImageView\",\n"
" \"name\":\"childImage\" \n"
" }\n"
" ]\n"
" },\n"
" \"stage\": [\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"fbOnStage\",\n"
" \"position\": [\n"
" 0.40461349487305,\n"
" \"clearColor\": [1,0,0,1]\n"
" },\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"Image1\",\n"
" \"size\": [200, 200, 0],\n"
" \"parentOrigin\": [0.5, 0.5, 0.5],\n"
" \"effect\": \"Ripple2D\",\n"
" \"image\": {\n"
- " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
- " \"width\": 200,\n"
- " \"height\": 80,\n"
- " \"loadPolicy\": \"IMMEDIATE\",\n"
- " \"releasePolicy\": \"NEVER\"\n"
+ " \"imageUrl\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n"
" },\n"
" \"signals\": [\n"
" {\n"
" },\n"
" \"stage\": [\n"
" {\n"
- " \"type\": \"ImageActor\",\n"
+ " \"type\": \"ImageView\",\n"
" \"name\": \"Image1\",\n"
" \"size\": [200, 200, 0],\n"
" \"parentOrigin\": [0.5, 0.5, 0.5],\n"
" \"effect\": \"Ripple2D\",\n"
" \"image\": {\n"
- " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
- " \"width\": 200,\n"
- " \"height\": 80,\n"
- " \"loadPolicy\": \"IMMEDIATE\",\n"
- " \"releasePolicy\": \"NEVER\"\n"
+ " \"imageUrl\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n"
" },\n"
" \"signals\": [\n"
" {\n"
+++ /dev/null
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-
-// Need to override adaptor classes for toolkit test harness, so include
-// test harness headers before dali headers.
-#include <dali-toolkit-test-suite-utils.h>
-
-#include <dali.h>
-#include <dali-toolkit/dali-toolkit.h>
-
-using namespace Dali;
-using namespace Toolkit;
-
-void utc_dali_toolkit_default_controls_startup(void)
-{
- test_return_value = TET_UNDEF;
-}
-
-void utc_dali_toolkit_default_controls_cleanup(void)
-{
- test_return_value = TET_PASS;
-}
-
-int UtcDaliDefaultControlsCreateSolidColorActor(void)
-{
- ToolkitTestApplication application;
-
- tet_infoline(" UtcDaliDefaultControlsCreateSolidColorActor");
-
- ImageActor image1 = CreateSolidColorActor( Color::RED );
- ImageActor image2 = CreateSolidColorActor( Color::RED, true, Color::BLUE, 2 );
- ImageActor image3 = CreateSolidColorActor( Color::RED, true, Color::BLUE, 12 );
-
- DALI_TEST_CHECK(image1);
- DALI_TEST_CHECK(image2);
- DALI_TEST_CHECK(!image3);
- END_TEST;
-}