Peter M. Groen / dali-demo

Commit a832af2813558a32f0a18747f3e6134ff6f6f301

Authored by Agnelo Vaz
Committed by Adeel Kazmi
1 parent 61caf238

Using migrated Public Visual API 

Change-Id: I4805f01066b272b7b56935fe59a9e76110177378
Inline Side-by-side
Showing 39 changed files with 86 additions and 135 deletions
examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,8 +16,6 @@
16 16 */
17 17  
18 18 #include <dali-toolkit/dali-toolkit.h>
19   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
20   -#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
21 19 #include <cstring>
22 20  
23 21 using namespace Dali;
... ... @@ -112,17 +110,17 @@ private:
112 110 Property::Map map;
113 111 map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE );
114 112 map.Add( Toolkit::ImageVisual::Property::URL, image );
115   - map.Add( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mask );
  113 + map.Add( Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mask );
116 114  
117 115 if( mImageCombinationIndex%2 == 0 )
118 116 {
119   - map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.f );
120   - map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, false );
  117 + map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.f );
  118 + map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, false );
121 119 }
122 120 else
123 121 {
124   - map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );
125   - map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, true );
  122 + map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );
  123 + map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, true );
126 124 }
127 125  
128 126 mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
... ...
examples/animated-images/animated-images-example.cpp
  View file @a832af2
... ... @@ -17,7 +17,6 @@
17 17  
18 18 #include <dali-toolkit/dali-toolkit.h>
19 19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
20   -#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
21 20 #include "shared/utility.h"
22 21  
23 22 using namespace Dali;
... ... @@ -361,9 +360,9 @@ public:
361 360 if( type == IMAGE_ARRAY )
362 361 {
363 362 map
364   - .Add( Toolkit::DevelImageVisual::Property::BATCH_SIZE, 4 )
365   - .Add( Toolkit::DevelImageVisual::Property::CACHE_SIZE, 10 )
366   - .Add( Toolkit::DevelImageVisual::Property::FRAME_DELAY, 150 );
  363 + .Add( Toolkit::ImageVisual::Property::BATCH_SIZE, 4 )
  364 + .Add( Toolkit::ImageVisual::Property::CACHE_SIZE, 10 )
  365 + .Add( Toolkit::ImageVisual::Property::FRAME_DELAY, 150 );
367 366 }
368 367 }
369 368  
... ...
examples/animated-shapes/animated-shapes-example.cpp
  View file @a832af2
... ... @@ -114,7 +114,7 @@ public:
114 114 background.SetParentOrigin( Dali::ParentOrigin::CENTER );
115 115 background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
116 116 Dali::Property::Map map;
117   - map.Insert( Visual::Property::TYPE, Visual::GRADIENT );
  117 + map.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT );
118 118 Property::Array stopOffsets;
119 119 stopOffsets.PushBack( 0.0f );
120 120 stopOffsets.PushBack( 1.0f );
... ...
examples/benchmark/benchmark.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,6 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/public-api/rendering/renderer.h>
20 19 #include <dali-toolkit/dali-toolkit.h>
21 20  
22 21 // INTERNAL INCLUDES
... ...
examples/clipping/clipping-example.cpp
  View file @a832af2
... ... @@ -19,8 +19,6 @@
19 19 #include <dali/dali.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21 #include <dali/devel-api/actors/actor-devel.h>
22   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
23   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
24 22  
25 23 // INTERNAL INCLUDES
26 24 #include "clipping-item-factory.h"
... ... @@ -121,7 +119,7 @@ private:
121 119 border.SetParentOrigin( ParentOrigin::CENTER );
122 120 border.SetAnchorPoint( AnchorPoint::CENTER );
123 121 border.SetProperty( Control::Property::BACKGROUND,
124   - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
  122 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
125 123 .Add( BorderVisual::Property::COLOR, Color::WHITE )
126 124 .Add( BorderVisual::Property::SIZE, 2.0f )
127 125 .Add( BorderVisual::Property::ANTI_ALIASING, true ) );
... ...
examples/clipping/clipping-item-factory.cpp
  View file @a832af2
... ... @@ -112,7 +112,7 @@ Actor ClippingItemFactory::NewItem( unsigned int itemId )
112 112 borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) );
113 113 borderActor.SetColorMode( USE_PARENT_COLOR );
114 114 borderActor.SetProperty( ImageView::Property::IMAGE,
115   - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
  115 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
116 116 .Add( BorderVisual::Property::COLOR, Color::WHITE )
117 117 .Add( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE )
118 118 .Add( BorderVisual::Property::ANTI_ALIASING, true ) );
... ...
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -17,7 +17,6 @@
17 17  
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20   -#include <dali/public-api/rendering/renderer.h>
21 20 #include <dali-toolkit/dali-toolkit.h>
22 21  
23 22 // INTERNAL INCLUDES
... ...
examples/contact-cards/contact-card.cpp
  View file @a832af2
... ... @@ -104,7 +104,7 @@ ContactCard::ContactCard(
104 104 // Create a control which will be used for the background and to clip the contents
105 105 mContactCard = Control::New();
106 106 mContactCard.SetProperty( Control::Property::BACKGROUND,
107   - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
  107 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
108 108 .Add( ColorVisual::Property::MIX_COLOR, Color::WHITE ) );
109 109 mContactCard.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
110 110 mContactCard.SetParentOrigin( ParentOrigin::TOP_LEFT );
... ... @@ -117,7 +117,7 @@ ContactCard::ContactCard(
117 117 mHeader = Control::New();
118 118 mHeader.SetSize( mContactCardLayoutInfo.headerSize );
119 119 mHeader.SetProperty( Control::Property::BACKGROUND,
120   - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
  120 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
121 121 .Add( ColorVisual::Property::MIX_COLOR, HEADER_COLOR ) );
122 122 mHeader.SetParentOrigin( ParentOrigin::TOP_LEFT );
123 123 mHeader.SetAnchorPoint( AnchorPoint::TOP_LEFT );
... ...
examples/fpp-game/fpp-game-tutorial-controller.cpp
  View file @a832af2
... ... @@ -115,7 +115,7 @@ void FppGameTutorialController::DisplayTutorial()
115 115 mLeftLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
116 116 mLeftLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) );
117 117 mLeftLabel.SetProperty( Toolkit::Control::Property::BACKGROUND,
118   - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
  118 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
119 119 .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.0, 0.0, 0.7, 0.2 ) ) );
120 120 mLeftLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
121 121 mLeftLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
... ... @@ -128,7 +128,7 @@ void FppGameTutorialController::DisplayTutorial()
128 128 mRightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
129 129 mRightLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) );
130 130 mRightLabel.SetProperty( Toolkit::Control::Property::BACKGROUND,
131   - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
  131 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
132 132 .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.5, 0.0, 0.0, 0.2 ) ) );
133 133 mRightLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
134 134 mRightLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
... ...
examples/gradients/gradients-example.cpp
  View file @a832af2
... ... @@ -78,7 +78,7 @@ public:
78 78  
79 79 // ---- Gradient for background
80 80  
81   - mGradientMap.Insert( Visual::Property::TYPE, Visual::GRADIENT );
  81 + mGradientMap.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT );
82 82  
83 83 Property::Array stopOffsets;
84 84 stopOffsets.PushBack( 0.0f );
... ...
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -22,8 +22,6 @@
22 22 #include <iostream>
23 23  
24 24 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
25   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
26   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
27 25  
28 26 using namespace Dali;
29 27 using Dali::Toolkit::TextLabel;
... ... @@ -323,7 +321,7 @@ public:
323 321 else
324 322 {
325 323 Property::Map map;
326   - map.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ).
  324 + map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ).
327 325 Add( Toolkit::TextVisual::Property::TEXT, DEMO_APPS_NAMES[currentIconIndex] ).
328 326 Add( Toolkit::TextVisual::Property::TEXT_COLOR, Color::WHITE ).
329 327 Add( Toolkit::TextVisual::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f ).
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -18,7 +18,6 @@
18 18 #include <dali/dali.h>
19 19 #include <dali-toolkit/dali-toolkit.h>
20 20 #include <dali-toolkit/devel-api/controls/popup/popup.h>
21   -#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
22 21 #include "shared/view.h"
23 22 #include <iostream>
24 23  
... ...
examples/image-view-url/image-view-url-example.cpp
  View file @a832af2
... ... @@ -17,7 +17,6 @@
17 17  
18 18 #include <dali-toolkit/dali-toolkit.h>
19 19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
20   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
21 20 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
22 21  
23 22 #include "shared/view.h"
... ... @@ -116,7 +115,7 @@ private:
116 115 Property::Map customShader;
117 116 customShader[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = FILTER_FRAGMENT_SOURCE;
118 117 Property::Map visualMap;
119   - visualMap.Insert(Toolkit::DevelVisual::Property::SHADER, customShader);
  118 + visualMap.Insert(Toolkit::Visual::Property::SHADER, customShader);
120 119 mActorForInput.SetProperty(Toolkit::ImageView::Property::IMAGE, visualMap);
121 120  
122 121 mDeltaPropertyIndex = mActorForInput.RegisterProperty(DELTA_UNIFORM_NAME, 0.f);
... ...
examples/item-view/item-view-example.cpp
  View file @a832af2
... ... @@ -879,7 +879,7 @@ public: // From ItemFactory
879 879 borderActor.SetColorMode( USE_PARENT_COLOR );
880 880  
881 881 Property::Map borderProperty;
882   - borderProperty.Insert( Visual::Property::TYPE, Visual::BORDER );
  882 + borderProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
883 883 borderProperty.Insert( BorderVisual::Property::COLOR, Color::WHITE );
884 884 borderProperty.Insert( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE );
885 885 borderProperty.Insert( BorderVisual::Property::ANTI_ALIASING, true );
... ... @@ -903,7 +903,7 @@ public: // From ItemFactory
903 903 checkbox.SetZ( 0.1f );
904 904  
905 905 Property::Map solidColorProperty;
906   - solidColorProperty.Insert( Visual::Property::TYPE, Visual::COLOR );
  906 + solidColorProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR );
907 907 solidColorProperty.Insert( ColorVisual::Property::MIX_COLOR, Vector4(0.f, 0.f, 0.f, 0.6f) );
908 908 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
909 909  
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @a832af2
... ... @@ -16,10 +16,7 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/public-api/rendering/renderer.h>
20 19 #include <dali-toolkit/dali-toolkit.h>
21   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
22   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
23 20  
24 21 // INTERNAL INCLUDES
25 22 #include "shared/view.h"
... ... @@ -246,7 +243,7 @@ public:
246 243  
247 244 radio.SetProperty( Toolkit::Button::Property::LABEL,
248 245 Property::Map()
249   - .Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
  246 + .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
250 247 .Add( Toolkit::TextVisual::Property::TEXT, labels[i] )
251 248 .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) )
252 249 );
... ...
examples/mesh-morph/mesh-morph-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,6 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/public-api/rendering/renderer.h>
20 19 #include <dali-toolkit/dali-toolkit.h>
21 20  
22 21 // INTERNAL INCLUDES
... ...
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,6 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/public-api/rendering/renderer.h>
20 19 #include <dali-toolkit/dali-toolkit.h>
21 20 #include <stdio.h>
22 21 #include <sstream>
... ...
examples/mesh-visual/mesh-visual-example.cpp
  View file @a832af2
1 1 #include <dali-toolkit/dali-toolkit.h>
2   -#include <dali/public-api/object/property-map.h>
3   -#include <dali-toolkit/devel-api/align-enums.h>
4   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
5 2  
6 3 using namespace Dali;
7 4 using namespace Dali::Toolkit;
... ... @@ -312,7 +309,7 @@ public:
312 309 }
313 310  
314 311 Property::Map lightMap;
315   - lightMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
  312 + lightMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
316 313 lightMap.Insert( ImageVisual::Property::URL, imageUrl );
317 314 mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) );
318 315 }
... ... @@ -322,10 +319,10 @@ public:
322 319 {
323 320 //Create mesh property map
324 321 Property::Map map;
325   - map.Insert( Visual::Property::TYPE, Visual::MESH );
326   - map.Insert( DevelVisual::Property::TRANSFORM,
327   - Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER )
328   - .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER ) );
  322 + map.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
  323 + map.Insert( Visual::Property::TRANSFORM,
  324 + Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER )
  325 + .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER ) );
329 326 map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] );
330 327 map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] );
331 328 map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH );
... ...
examples/native-image-source/native-image-source-example.cpp
  View file @a832af2
... ... @@ -18,8 +18,6 @@
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20 20 #include <dali/devel-api/images/native-image-interface-extension.h>
21   -#include <dali/public-api/rendering/renderer.h>
22   -#include <dali/public-api/rendering/frame-buffer.h>
23 21 #include <dali-toolkit/dali-toolkit.h>
24 22 #include <cstring>
25 23  
... ...
examples/perf-scroll/perf-scroll.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -15,7 +15,6 @@
15 15 *
16 16 */
17 17  
18   -#include <dali/public-api/rendering/renderer.h>
19 18 #include <dali-toolkit/dali-toolkit.h>
20 19  
21 20 #include "shared/utility.h"
... ...
examples/point-mesh/point-mesh-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,6 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/public-api/rendering/renderer.h>
20 19 #include <dali-toolkit/dali-toolkit.h>
21 20  
22 21 // INTERNAL INCLUDES
... ...
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @a832af2
... ... @@ -16,11 +16,7 @@
16 16 */
17 17  
18 18 #include <dali-toolkit/dali-toolkit.h>
19   -#include <dali/public-api/object/property-map.h>
20   -#include <dali-toolkit/devel-api/align-enums.h>
21 19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
22   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
23   -#include <dali-toolkit/public-api/controls/slider/slider.h>
24 20  
25 21 using namespace Dali;
26 22 using namespace Dali::Toolkit;
... ... @@ -355,11 +351,11 @@ public:
355 351  
356 352 //Visual map for model
357 353 mVisualMap.Clear();
358   - mVisualMap[ Visual::Property::TYPE ] = Visual::PRIMITIVE;
  354 + mVisualMap[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
359 355 mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor;
360   - mVisualMap[ DevelVisual::Property::TRANSFORM ] =
361   - Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER )
362   - .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER );
  356 + mVisualMap[ Visual::Property::TRANSFORM ] =
  357 + Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER )
  358 + .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER );
363 359 }
364 360  
365 361 //Sets the 3D model to a sphere and modifies the sliders appropriately.
... ...
examples/refraction-effect/refraction-effect-example.cpp
  View file @a832af2
... ... @@ -17,7 +17,6 @@
17 17  
18 18 // EXTERNAL INCLUDES
19 19 #include <dali/dali.h>
20   -#include <dali/public-api/rendering/renderer.h>
21 20 #include <dali-toolkit/dali-toolkit.h>
22 21 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
23 22  
... ...
examples/simple-visuals-control/my-control-impl.cpp
  View file @a832af2
... ... @@ -20,12 +20,10 @@
20 20  
21 21 // EXTERNAL INCLUDES
22 22  
23   -#include <dali/public-api/object/type-registry-helper.h>
24 23 #include <dali/devel-api/scripting/enum-helper.h>
25 24 #include <dali-toolkit/dali-toolkit.h>
26 25 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
27 26 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
28   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
29 27 #include <dali-toolkit/devel-api/controls/control-devel.h>
30 28  
31 29 using namespace Dali;
... ...
examples/simple-visuals-control/simple-visuals-application.cpp
  View file @a832af2
... ... @@ -19,8 +19,6 @@
19 19  
20 20 // EXTERNAL INCLUDES
21 21 #include <dali-toolkit/dali-toolkit.h>
22   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
23   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
24 22 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
25 23 #include <dali/integration-api/events/touch-event-integ.h>
26 24 #include <cstdio>
... ...
examples/styling/image-channel-control-impl.cpp
  View file @a832af2
... ... @@ -16,14 +16,12 @@
16 16  
17 17 #include "image-channel-control-impl.h"
18 18 #include <dali-toolkit/dali-toolkit.h>
19   -#include <dali/public-api/object/type-registry-helper.h>
20   -#include <dali-toolkit/devel-api/align-enums.h>
21 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
22 20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
23   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
24 21  
25 22 #include <cstdio>
26 23  
  24 +
27 25 using namespace Dali; // Needed for macros
28 26  
29 27 namespace Demo
... ... @@ -182,12 +180,12 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize )
182 180 Vector2 size( targetSize );
183 181 Property::Map transformMap;
184 182 transformMap
185   - .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
186   - .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
187   - .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
188   - .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
189   - .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) )
190   - .Add( Toolkit::DevelVisual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) );
  183 + .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
  184 + .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
  185 + .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
  186 + .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
  187 + .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) )
  188 + .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
191 189  
192 190 mVisual.SetTransformAndSize( transformMap, size );
193 191 }
... ...
examples/styling/styling-application.cpp
  View file @a832af2
... ... @@ -25,8 +25,6 @@
25 25 // External includes
26 26 #include <dali-toolkit/dali-toolkit.h>
27 27 #include <dali-toolkit/devel-api/controls/popup/popup.h>
28   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
29   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
30 28 #include "image-channel-control.h"
31 29 #include <cstdio>
32 30 #include <sstream>
... ...
examples/text-editor/text-editor-example.cpp
  View file @a832af2
... ... @@ -130,7 +130,7 @@ public:
130 130 // Add border to highlight harder-to-see colors.
131 131 // We use a color rather than border visual as the container will always be behind the button.
132 132 Property::Map colorMap;
133   - colorMap.Insert( Visual::Property::TYPE, Visual::COLOR);
  133 + colorMap.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR);
134 134 colorMap.Insert( ColorVisual::Property::MIX_COLOR, Color::BLACK );
135 135 mColorContainer.SetProperty( Control::Property::BACKGROUND, colorMap );
136 136  
... ... @@ -276,7 +276,7 @@ public:
276 276 void SetButtonColor( Button& button, const Vector4& color )
277 277 {
278 278 Property::Map colorVisualMap;
279   - colorVisualMap.Add( Visual::Property::TYPE, Visual::COLOR )
  279 + colorVisualMap.Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
280 280 .Add( ColorVisual::Property::MIX_COLOR, color );
281 281  
282 282 button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap );
... ...
examples/text-field/text-field-example.cpp
  View file @a832af2
... ... @@ -25,7 +25,6 @@
25 25 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
26 26 #include <dali-toolkit/devel-api/controls/popup/popup.h>
27 27 #include <iostream>
28   -#include <dali/public-api/events/touch-point.h>
29 28  
30 29 // INTERNAL INCLUDES
31 30 #include "shared/multi-language-strings.h"
... ...
examples/text-label/text-label-example.cpp
  View file @a832af2
... ... @@ -231,7 +231,7 @@ public:
231 231 mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
232 232  
233 233 Dali::Property::Map border;
234   - border.Insert( Visual::Property::TYPE, Visual::BORDER );
  234 + border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
235 235 border.Insert( BorderVisual::Property::COLOR, Color::WHITE );
236 236 border.Insert( BorderVisual::Property::SIZE, 2.f );
237 237 mBorder.SetProperty( Control::Property::BACKGROUND, border );
... ... @@ -343,7 +343,7 @@ public:
343 343 mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap );
344 344  
345 345 mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL,
346   - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
  346 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
347 347 .Add( BorderVisual::Property::COLOR, Color::WHITE )
348 348 .Add( BorderVisual::Property::SIZE, 2.0f )
349 349 .Add( BorderVisual::Property::ANTI_ALIASING, true ) );
... ...
examples/text-scrolling/text-scrolling-example.cpp
  View file @a832af2
... ... @@ -87,7 +87,7 @@ public:
87 87 parent.Add( box );
88 88  
89 89 Dali::Property::Map border;
90   - border.Insert( Visual::Property::TYPE, Visual::BORDER );
  90 + border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
91 91 border.Insert( BorderVisual::Property::COLOR, Color::BLUE );
92 92 border.Insert( BorderVisual::Property::SIZE, 1.f );
93 93 box.SetProperty( Control::Property::BACKGROUND, border );
... ... @@ -209,8 +209,8 @@ public:
209 209  
210 210 Toolkit::PushButton colorButton = Toolkit::PushButton::New();
211 211 colorButton.SetProperty( Button::Property::TOGGLABLE, true );
212   - colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
213   - colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) );
  212 + colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
  213 + colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) );
214 214 colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
215 215 colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
216 216 colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
... ...
examples/textured-mesh/textured-mesh-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,7 +16,6 @@
16 16 */
17 17  
18 18 // EXTERNAL INCLUDES
19   -#include <dali/public-api/rendering/renderer.h>
20 19 #include <dali-toolkit/dali-toolkit.h>
21 20  
22 21 // INTERNAL INCLUDES
... ...
examples/tooltip/tooltip-example.cpp
  View file @a832af2
1 1 /*
2   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -18,8 +18,6 @@
18 18 #include <dali-toolkit/dali-toolkit.h>
19 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
20 20 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>
21   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
22   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
23 21  
24 22 using namespace Dali;
25 23 using namespace Dali::Toolkit;
... ... @@ -97,9 +95,9 @@ private:
97 95 Layout( customFromCode, stageSize );
98 96 customFromCode.SetProperty( DevelControl::Property::TOOLTIP,
99 97 Property::Map().Add( Tooltip::Property::CONTENT,
100   - Property::Array().Add( Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE )
  98 + Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
101 99 .Add( ImageVisual::Property::URL, DEMO_IMAGE_DIR "Logo-for-demo.png" ) )
102   - .Add( Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
  100 + .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
103 101 .Add( TextVisual::Property::TEXT_COLOR, Color::WHITE )
104 102 .Add( TextVisual::Property::TEXT, "Custom coded style\nat hover point" )
105 103 .Add( TextVisual::Property::MULTI_LINE, true )
... ... @@ -140,7 +138,7 @@ private:
140 138 if( control )
141 139 {
142 140 control.SetProperty( Button::Property::LABEL,
143   - Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
  141 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
144 142 .Add( TextVisual::Property::TEXT, label ) );
145 143 }
146 144 }
... ...
examples/transitions/shadow-button-impl.cpp
  View file @a832af2
... ... @@ -16,11 +16,8 @@
16 16  
17 17 #include "shadow-button-impl.h"
18 18 #include <dali-toolkit/dali-toolkit.h>
19   -#include <dali/public-api/object/type-registry-helper.h>
20 19 #include <dali/devel-api/scripting/enum-helper.h>
21   -#include <dali-toolkit/devel-api/align-enums.h>
22 20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
23   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
24 21 #include <dali-toolkit/devel-api/controls/control-devel.h>
25 22  
26 23 #include <cstdio>
... ... @@ -374,7 +371,7 @@ void ShadowButton::ResetVisual(
374 371 }
375 372  
376 373 // Extract transform maps out of the visual definition and store them
377   - Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform");
  374 + Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform");
378 375 if( value )
379 376 {
380 377 Property::Map* transformMap = value->GetMap();
... ...
examples/transitions/transition-application.cpp
  View file @a832af2
... ... @@ -25,8 +25,6 @@
25 25 // External includes
26 26 #include <dali-toolkit/dali-toolkit.h>
27 27 #include <dali-toolkit/devel-api/controls/control-devel.h>
28   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
29   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
30 28 #include "shadow-button.h"
31 29 #include <cstdio>
32 30 #include <sstream>
... ...
examples/visual-transitions/beat-control-impl.cpp
  View file @a832af2
... ... @@ -16,10 +16,8 @@
16 16  
17 17 #include "beat-control-impl.h"
18 18 #include <dali-toolkit/dali-toolkit.h>
19   -#include <dali/public-api/object/type-registry-helper.h>
20 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
21 20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
22   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
23 21  
24 22 using namespace Dali; // Needed for macros
25 23 using namespace Dali::Toolkit;
... ... @@ -212,9 +210,9 @@ void BeatControl::RelayoutVisuals( const Vector2&amp; targetSize )
212 210 Property::Map transformMap;
213 211 // Make the visual half the size of the control, but leave
214 212 // origin and anchor point at center, position is relative, but Zer0
215   - transformMap[ DevelVisual::Transform::Property::SIZE ] = mTransformSize;
216   - transformMap[ DevelVisual::Transform::Property::ORIGIN ] = mTransformOrigin;
217   - transformMap[ DevelVisual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint;
  213 + transformMap[ Visual::Transform::Property::SIZE ] = mTransformSize;
  214 + transformMap[ Visual::Transform::Property::ORIGIN ] = mTransformOrigin;
  215 + transformMap[ Visual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint;
218 216 mVisual.SetTransformAndSize( transformMap, size );
219 217 }
220 218 }
... ... @@ -262,7 +260,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
262 260 Property::Map* map = value.GetMap();
263 261 if( map )
264 262 {
265   - Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform" );
  263 + Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform" );
266 264 if( value )
267 265 {
268 266 Property::Map* transformMap = value->GetMap();
... ... @@ -272,14 +270,14 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
272 270 // If there are more properties in the transform map, then we need to create a new visual
273 271 unsigned int sizeAndPositionPropertyCount = 0;
274 272  
275   - Property::Value* sizeValue = transformMap->Find( DevelVisual::Transform::Property::SIZE, "size" );
  273 + Property::Value* sizeValue = transformMap->Find( Visual::Transform::Property::SIZE, "size" );
276 274 if( sizeValue )
277 275 {
278 276 sizeValue->Get( impl.mTransformSize );
279 277 ++sizeAndPositionPropertyCount;
280 278 }
281 279  
282   - Property::Value* originValue = transformMap->Find( DevelVisual::Transform::Property::ORIGIN, "origin" );
  280 + Property::Value* originValue = transformMap->Find( Visual::Transform::Property::ORIGIN, "origin" );
283 281 if( originValue )
284 282 {
285 283 int intValue = 0;
... ... @@ -290,7 +288,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
290 288 }
291 289 }
292 290  
293   - Property::Value* anchorPointValue = transformMap->Find( DevelVisual::Transform::Property::ANCHOR_POINT, "anchorPoint" );
  291 + Property::Value* anchorPointValue = transformMap->Find( Visual::Transform::Property::ANCHOR_POINT, "anchorPoint" );
294 292 if( anchorPointValue )
295 293 {
296 294 int intValue = 0;
... ...
examples/visual-transitions/beat-control-impl.h
  View file @a832af2
... ... @@ -20,9 +20,9 @@
20 20 #include "beat-control.h"
21 21 #include <dali/public-api/animation/animation.h>
22 22 #include <dali-toolkit/public-api/controls/control-impl.h>
23   -#include <dali-toolkit/devel-api/align-enums.h>
24 23 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
25 24 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
  25 +#include <dali-toolkit/public-api/align-enumerations.h>
26 26  
27 27 namespace Demo
28 28 {
... ...
examples/visual-transitions/transition-application.cpp
  View file @a832af2
... ... @@ -24,8 +24,6 @@
24 24  
25 25 // External includes
26 26 #include <dali-toolkit/dali-toolkit.h>
27   -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
28   -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
29 27 #include "beat-control.h"
30 28 #include <cstdio>
31 29 #include <sstream>
... ... @@ -101,8 +99,8 @@ void TransitionApplication::Create( Application&amp; application )
101 99 mBeatControl = BeatControl::New();
102 100 mBeatControl.SetName("BeatControl");
103 101 mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map()
104   - .Add( DevelVisual::Property::TRANSFORM, Property::Map()
105   - .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
  102 + .Add( Visual::Property::TRANSFORM, Property::Map()
  103 + .Add( Visual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
106 104  
107 105 mBeatControl.SetAnchorPoint( AnchorPoint::CENTER );
108 106 mBeatControl.SetParentOrigin( ParentOrigin::CENTER );
... ... @@ -123,8 +121,8 @@ void TransitionApplication::Create( Application&amp; application )
123 121 {
124 122 Property::Map map;
125 123 CreateVisualMap( i, map );
126   - map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
127   - .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) );
  124 + map.Add( Visual::Property::TRANSFORM, Property::Map()
  125 + .Add( Visual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) );
128 126 mVisualButtons[i] = BeatControl::New();
129 127 mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map );
130 128 mVisualButtons[i].SetName("VisualButton");
... ... @@ -176,20 +174,20 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
176 174 {
177 175 case 0:
178 176 {
179   - map[ Visual::Property::TYPE ] = Visual::COLOR;
  177 + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
180 178 map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW;
181 179 break;
182 180 }
183 181 case 1:
184 182 {
185   - map[ Visual::Property::TYPE ] = Visual::BORDER;
  183 + map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
186 184 map[ BorderVisual::Property::COLOR ] = Color::GREEN;
187 185 map[ BorderVisual::Property::SIZE ] = 5;
188 186 break;
189 187 }
190 188 case 2:
191 189 {
192   - map[ Visual::Property::TYPE ] = Visual::GRADIENT;
  190 + map[ Toolkit::Visual::Property::TYPE ] = Visual::GRADIENT;
193 191  
194 192 Property::Array stopOffsets;
195 193 stopOffsets.PushBack( 0.0f );
... ... @@ -212,21 +210,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
212 210 }
213 211 case 3:
214 212 {
215   - map[ Visual::Property::TYPE ] = Visual::IMAGE;
  213 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
216 214 map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH;
217 215 break;
218 216 }
219 217 case 4:
220 218 {
221   - map[ Visual::Property::TYPE ] = Visual::IMAGE;
  219 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
222 220 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png";
223   - map[ DevelVisual::Property::PREMULTIPLIED_ALPHA ] = true;
  221 + map[ Visual::Property::PREMULTIPLIED_ALPHA ] = true;
224 222 break;
225 223 }
226 224  
227 225 case 5:
228 226 {
229   - map[ Visual::Property::TYPE ] = Visual::MESH;
  227 + map[ Toolkit::Visual::Property::TYPE ] = Visual::MESH;
230 228 map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH;
231 229 map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH;
232 230 map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR;
... ... @@ -236,7 +234,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
236 234  
237 235 case 6:
238 236 {
239   - map[ Visual::Property::TYPE ] = Visual::PRIMITIVE;
  237 + map[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
240 238  
241 239 map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE;
242 240 map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f;
... ... @@ -250,21 +248,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
250 248 case 7:
251 249 {
252 250 // NPatch
253   - map[ Visual::Property::TYPE ] = Visual::IMAGE;
  251 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
254 252 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png";
255 253 break;
256 254 }
257 255 case 8:
258 256 {
259 257 // SVG
260   - map[ Visual::Property::TYPE ] = Visual::IMAGE;
  258 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
261 259 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg";
262 260 break;
263 261 }
264 262  
265 263 case 9:
266 264 {
267   - map[ Visual::Property::TYPE ] = DevelVisual::TEXT;
  265 + map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
268 266 map[ TextVisual::Property::TEXT ] = "Text";
269 267 map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN;
270 268 map[ TextVisual::Property::POINT_SIZE ] = 10;
... ... @@ -273,7 +271,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
273 271  
274 272 default:
275 273 {
276   - map[ Visual::Property::TYPE ] = Visual::COLOR;
  274 + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
277 275 map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA;
278 276 break;
279 277 }
... ... @@ -287,8 +285,8 @@ bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData&amp;
287 285 int visual = actor.GetProperty<int>( mVisualIndex );
288 286 Property::Map map;
289 287 CreateVisualMap( visual, map );
290   - map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
291   - .Add( DevelVisual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
  288 + map.Add( Visual::Property::TRANSFORM, Property::Map()
  289 + .Add( Visual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
292 290 mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map );
293 291 }
294 292 return true;
... ...
shared/dali-table-view.cpp
  View file @a832af2
... ... @@ -753,7 +753,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count )
753 753 Dali::Property::Map effect = Toolkit::CreateDistanceFieldEffect();
754 754 Property::Map imageMap;
755 755 imageMap.Add( ImageVisual::Property::URL, SHAPE_IMAGE_TABLE[ shapeType ] );
756   - imageMap.Add( Visual::Property::SHADER, effect );
  756 + imageMap.Add( Toolkit::Visual::Property::SHADER, effect );
757 757 dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
758 758  
759 759 dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] );
... ...