From a832af2813558a32f0a18747f3e6134ff6f6f301 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Fri, 29 Sep 2017 19:20:37 +0100 Subject: [PATCH] Using migrated Public Visual API Change-Id: I4805f01066b272b7b56935fe59a9e76110177378 --- .../alpha-blending-cpu-example.cpp | 14 ++++---- .../animated-images/animated-images-example.cpp | 7 ++-- .../animated-shapes/animated-shapes-example.cpp | 2 +- examples/benchmark/benchmark.cpp | 3 +- examples/clipping/clipping-example.cpp | 4 +-- examples/clipping/clipping-item-factory.cpp | 2 +- .../compressed-texture-formats-example.cpp | 3 +- examples/contact-cards/contact-card.cpp | 4 +-- examples/fpp-game/fpp-game-tutorial-controller.cpp | 4 +-- examples/gradients/gradients-example.cpp | 2 +- .../homescreen-benchmark/homescreen-benchmark.cpp | 6 ++-- .../image-scaling-and-filtering-example.cpp | 3 +- examples/image-view-url/image-view-url-example.cpp | 3 +- examples/item-view/item-view-example.cpp | 4 +-- examples/line-mesh/line-mesh-example.cpp | 5 +-- examples/mesh-morph/mesh-morph-example.cpp | 3 +- examples/mesh-sorting/mesh-sorting-example.cpp | 3 +- examples/mesh-visual/mesh-visual-example.cpp | 13 +++----- .../native-image-source-example.cpp | 2 -- examples/perf-scroll/perf-scroll.cpp | 3 +- examples/point-mesh/point-mesh-example.cpp | 3 +- .../primitive-shapes/primitive-shapes-example.cpp | 12 +++---- .../refraction-effect-example.cpp | 1 - .../simple-visuals-control/my-control-impl.cpp | 2 -- .../simple-visuals-application.cpp | 2 -- examples/styling/image-channel-control-impl.cpp | 16 ++++----- examples/styling/styling-application.cpp | 2 -- examples/text-editor/text-editor-example.cpp | 4 +-- examples/text-field/text-field-example.cpp | 1 - examples/text-label/text-label-example.cpp | 4 +-- examples/text-scrolling/text-scrolling-example.cpp | 6 ++-- examples/textured-mesh/textured-mesh-example.cpp | 3 +- examples/tooltip/tooltip-example.cpp | 10 +++--- examples/transitions/shadow-button-impl.cpp | 5 +-- examples/transitions/transition-application.cpp | 2 -- examples/visual-transitions/beat-control-impl.cpp | 16 ++++----- examples/visual-transitions/beat-control-impl.h | 2 +- .../visual-transitions/transition-application.cpp | 38 ++++++++++------------ shared/dali-table-view.cpp | 2 +- 39 files changed, 86 insertions(+), 135 deletions(-) diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp index 35a71fc..8c30f84 100644 --- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp +++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -16,8 +16,6 @@ */ #include -#include -#include #include using namespace Dali; @@ -112,17 +110,17 @@ private: Property::Map map; map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE ); map.Add( Toolkit::ImageVisual::Property::URL, image ); - map.Add( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mask ); + map.Add( Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mask ); if( mImageCombinationIndex%2 == 0 ) { - map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.f ); - map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, false ); + map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.f ); + map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, false ); } else { - map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.6f ); - map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, true ); + map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f ); + map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, true ); } mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); diff --git a/examples/animated-images/animated-images-example.cpp b/examples/animated-images/animated-images-example.cpp index 102470c..ddcbc99 100644 --- a/examples/animated-images/animated-images-example.cpp +++ b/examples/animated-images/animated-images-example.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "shared/utility.h" using namespace Dali; @@ -361,9 +360,9 @@ public: if( type == IMAGE_ARRAY ) { map - .Add( Toolkit::DevelImageVisual::Property::BATCH_SIZE, 4 ) - .Add( Toolkit::DevelImageVisual::Property::CACHE_SIZE, 10 ) - .Add( Toolkit::DevelImageVisual::Property::FRAME_DELAY, 150 ); + .Add( Toolkit::ImageVisual::Property::BATCH_SIZE, 4 ) + .Add( Toolkit::ImageVisual::Property::CACHE_SIZE, 10 ) + .Add( Toolkit::ImageVisual::Property::FRAME_DELAY, 150 ); } } diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp index dd79982..206bacb 100644 --- a/examples/animated-shapes/animated-shapes-example.cpp +++ b/examples/animated-shapes/animated-shapes-example.cpp @@ -114,7 +114,7 @@ public: background.SetParentOrigin( Dali::ParentOrigin::CENTER ); background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS ); Dali::Property::Map map; - map.Insert( Visual::Property::TYPE, Visual::GRADIENT ); + map.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ); Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); stopOffsets.PushBack( 1.0f ); diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 546e8e5..cd3c332 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -16,7 +16,6 @@ */ // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES diff --git a/examples/clipping/clipping-example.cpp b/examples/clipping/clipping-example.cpp index 6598b68..884bc18 100644 --- a/examples/clipping/clipping-example.cpp +++ b/examples/clipping/clipping-example.cpp @@ -19,8 +19,6 @@ #include #include #include -#include -#include // INTERNAL INCLUDES #include "clipping-item-factory.h" @@ -121,7 +119,7 @@ private: border.SetParentOrigin( ParentOrigin::CENTER ); border.SetAnchorPoint( AnchorPoint::CENTER ); border.SetProperty( Control::Property::BACKGROUND, - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER ) .Add( BorderVisual::Property::COLOR, Color::WHITE ) .Add( BorderVisual::Property::SIZE, 2.0f ) .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); diff --git a/examples/clipping/clipping-item-factory.cpp b/examples/clipping/clipping-item-factory.cpp index 50ec810..1233831 100644 --- a/examples/clipping/clipping-item-factory.cpp +++ b/examples/clipping/clipping-item-factory.cpp @@ -112,7 +112,7 @@ Actor ClippingItemFactory::NewItem( unsigned int itemId ) borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) ); borderActor.SetColorMode( USE_PARENT_COLOR ); borderActor.SetProperty( ImageView::Property::IMAGE, - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER ) .Add( BorderVisual::Property::COLOR, Color::WHITE ) .Add( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE ) .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp index 9363805..d53b8cf 100644 --- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp +++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -17,7 +17,6 @@ // EXTERNAL INCLUDES #include -#include #include // INTERNAL INCLUDES diff --git a/examples/contact-cards/contact-card.cpp b/examples/contact-cards/contact-card.cpp index eb89a6c..61fd38e 100644 --- a/examples/contact-cards/contact-card.cpp +++ b/examples/contact-cards/contact-card.cpp @@ -104,7 +104,7 @@ ContactCard::ContactCard( // Create a control which will be used for the background and to clip the contents mContactCard = Control::New(); mContactCard.SetProperty( Control::Property::BACKGROUND, - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ) .Add( ColorVisual::Property::MIX_COLOR, Color::WHITE ) ); mContactCard.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); mContactCard.SetParentOrigin( ParentOrigin::TOP_LEFT ); @@ -117,7 +117,7 @@ ContactCard::ContactCard( mHeader = Control::New(); mHeader.SetSize( mContactCardLayoutInfo.headerSize ); mHeader.SetProperty( Control::Property::BACKGROUND, - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ) .Add( ColorVisual::Property::MIX_COLOR, HEADER_COLOR ) ); mHeader.SetParentOrigin( ParentOrigin::TOP_LEFT ); mHeader.SetAnchorPoint( AnchorPoint::TOP_LEFT ); diff --git a/examples/fpp-game/fpp-game-tutorial-controller.cpp b/examples/fpp-game/fpp-game-tutorial-controller.cpp index 61af0c1..8141986 100644 --- a/examples/fpp-game/fpp-game-tutorial-controller.cpp +++ b/examples/fpp-game/fpp-game-tutorial-controller.cpp @@ -115,7 +115,7 @@ void FppGameTutorialController::DisplayTutorial() mLeftLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); mLeftLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) ); mLeftLabel.SetProperty( Toolkit::Control::Property::BACKGROUND, - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ) .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.0, 0.0, 0.7, 0.2 ) ) ); mLeftLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White. mLeftLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); @@ -128,7 +128,7 @@ void FppGameTutorialController::DisplayTutorial() mRightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); mRightLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) ); mRightLabel.SetProperty( Toolkit::Control::Property::BACKGROUND, - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ) .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.5, 0.0, 0.0, 0.2 ) ) ); mRightLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White. mRightLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp index 9a92d2e..822caef 100644 --- a/examples/gradients/gradients-example.cpp +++ b/examples/gradients/gradients-example.cpp @@ -78,7 +78,7 @@ public: // ---- Gradient for background - mGradientMap.Insert( Visual::Property::TYPE, Visual::GRADIENT ); + mGradientMap.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ); Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp index c0cb012..64ff1ad 100644 --- a/examples/homescreen-benchmark/homescreen-benchmark.cpp +++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -22,8 +22,6 @@ #include #include -#include -#include using namespace Dali; using Dali::Toolkit::TextLabel; @@ -323,7 +321,7 @@ public: else { Property::Map map; - map.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ). + map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ). Add( Toolkit::TextVisual::Property::TEXT, DEMO_APPS_NAMES[currentIconIndex] ). Add( Toolkit::TextVisual::Property::TEXT_COLOR, Color::WHITE ). Add( Toolkit::TextVisual::Property::POINT_SIZE, ( ( static_cast( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f ). diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index c6941b4..6219742 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -18,7 +18,6 @@ #include #include #include -#include #include "shared/view.h" #include diff --git a/examples/image-view-url/image-view-url-example.cpp b/examples/image-view-url/image-view-url-example.cpp index 2bd3518..3522929 100644 --- a/examples/image-view-url/image-view-url-example.cpp +++ b/examples/image-view-url/image-view-url-example.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include "shared/view.h" @@ -116,7 +115,7 @@ private: Property::Map customShader; customShader[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = FILTER_FRAGMENT_SOURCE; Property::Map visualMap; - visualMap.Insert(Toolkit::DevelVisual::Property::SHADER, customShader); + visualMap.Insert(Toolkit::Visual::Property::SHADER, customShader); mActorForInput.SetProperty(Toolkit::ImageView::Property::IMAGE, visualMap); mDeltaPropertyIndex = mActorForInput.RegisterProperty(DELTA_UNIFORM_NAME, 0.f); diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index 9b13be3..c9f4e97 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -879,7 +879,7 @@ public: // From ItemFactory borderActor.SetColorMode( USE_PARENT_COLOR ); Property::Map borderProperty; - borderProperty.Insert( Visual::Property::TYPE, Visual::BORDER ); + borderProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER ); borderProperty.Insert( BorderVisual::Property::COLOR, Color::WHITE ); borderProperty.Insert( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE ); borderProperty.Insert( BorderVisual::Property::ANTI_ALIASING, true ); @@ -903,7 +903,7 @@ public: // From ItemFactory checkbox.SetZ( 0.1f ); Property::Map solidColorProperty; - solidColorProperty.Insert( Visual::Property::TYPE, Visual::COLOR ); + solidColorProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR ); solidColorProperty.Insert( ColorVisual::Property::MIX_COLOR, Vector4(0.f, 0.f, 0.f, 0.6f) ); checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp index 922da41..e2cb540 100644 --- a/examples/line-mesh/line-mesh-example.cpp +++ b/examples/line-mesh/line-mesh-example.cpp @@ -16,10 +16,7 @@ */ // EXTERNAL INCLUDES -#include #include -#include -#include // INTERNAL INCLUDES #include "shared/view.h" @@ -246,7 +243,7 @@ public: radio.SetProperty( Toolkit::Button::Property::LABEL, Property::Map() - .Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ) .Add( Toolkit::TextVisual::Property::TEXT, labels[i] ) .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) ) ); diff --git a/examples/mesh-morph/mesh-morph-example.cpp b/examples/mesh-morph/mesh-morph-example.cpp index 7b59146..ebf3654 100644 --- a/examples/mesh-morph/mesh-morph-example.cpp +++ b/examples/mesh-morph/mesh-morph-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -16,7 +16,6 @@ */ // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp index 0b94968..35300d5 100644 --- a/examples/mesh-sorting/mesh-sorting-example.cpp +++ b/examples/mesh-sorting/mesh-sorting-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -16,7 +16,6 @@ */ // EXTERNAL INCLUDES -#include #include #include #include diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp index 4b9fb23..682c243 100644 --- a/examples/mesh-visual/mesh-visual-example.cpp +++ b/examples/mesh-visual/mesh-visual-example.cpp @@ -1,7 +1,4 @@ #include -#include -#include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -312,7 +309,7 @@ public: } Property::Map lightMap; - lightMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); + lightMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE ); lightMap.Insert( ImageVisual::Property::URL, imageUrl ); mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) ); } @@ -322,10 +319,10 @@ public: { //Create mesh property map Property::Map map; - map.Insert( Visual::Property::TYPE, Visual::MESH ); - map.Insert( DevelVisual::Property::TRANSFORM, - Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER ) - .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER ) ); + map.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH ); + map.Insert( Visual::Property::TRANSFORM, + Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER ) + .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER ) ); map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] ); map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] ); map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH ); diff --git a/examples/native-image-source/native-image-source-example.cpp b/examples/native-image-source/native-image-source-example.cpp index 267452a..35d08fc 100644 --- a/examples/native-image-source/native-image-source-example.cpp +++ b/examples/native-image-source/native-image-source-example.cpp @@ -18,8 +18,6 @@ // EXTERNAL INCLUDES #include #include -#include -#include #include #include diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index 3bfdda5..9283dce 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -15,7 +15,6 @@ * */ -#include #include #include "shared/utility.h" diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index 86e2d71..747f07f 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -16,7 +16,6 @@ */ // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp index cce4f3c..8f43722 100644 --- a/examples/primitive-shapes/primitive-shapes-example.cpp +++ b/examples/primitive-shapes/primitive-shapes-example.cpp @@ -16,11 +16,7 @@ */ #include -#include -#include #include -#include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -355,11 +351,11 @@ public: //Visual map for model mVisualMap.Clear(); - mVisualMap[ Visual::Property::TYPE ] = Visual::PRIMITIVE; + mVisualMap[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE; mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor; - mVisualMap[ DevelVisual::Property::TRANSFORM ] = - Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER ) - .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER ); + mVisualMap[ Visual::Property::TRANSFORM ] = + Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER ) + .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER ); } //Sets the 3D model to a sphere and modifies the sliders appropriately. diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index 4150ac8..f713ee9 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -17,7 +17,6 @@ // EXTERNAL INCLUDES #include -#include #include #include diff --git a/examples/simple-visuals-control/my-control-impl.cpp b/examples/simple-visuals-control/my-control-impl.cpp index 9a2aa51..b297aea 100644 --- a/examples/simple-visuals-control/my-control-impl.cpp +++ b/examples/simple-visuals-control/my-control-impl.cpp @@ -20,12 +20,10 @@ // EXTERNAL INCLUDES -#include #include #include #include #include -#include #include using namespace Dali; diff --git a/examples/simple-visuals-control/simple-visuals-application.cpp b/examples/simple-visuals-control/simple-visuals-application.cpp index a698f17..2b9d93c 100644 --- a/examples/simple-visuals-control/simple-visuals-application.cpp +++ b/examples/simple-visuals-control/simple-visuals-application.cpp @@ -19,8 +19,6 @@ // EXTERNAL INCLUDES #include -#include -#include #include #include #include diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp index b0d9dbb..155e145 100644 --- a/examples/styling/image-channel-control-impl.cpp +++ b/examples/styling/image-channel-control-impl.cpp @@ -16,14 +16,12 @@ #include "image-channel-control-impl.h" #include -#include -#include #include #include -#include #include + using namespace Dali; // Needed for macros namespace Demo @@ -182,12 +180,12 @@ void ImageChannelControl::OnSizeSet( const Vector3& targetSize ) Vector2 size( targetSize ); Property::Map transformMap; transformMap - .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) - .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) - .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) - .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) - .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) ) - .Add( Toolkit::DevelVisual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) ); + .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) + .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) + .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) + .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) + .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ) + .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) ); mVisual.SetTransformAndSize( transformMap, size ); } diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp index 2a4d7b6..ff88750 100644 --- a/examples/styling/styling-application.cpp +++ b/examples/styling/styling-application.cpp @@ -25,8 +25,6 @@ // External includes #include #include -#include -#include #include "image-channel-control.h" #include #include diff --git a/examples/text-editor/text-editor-example.cpp b/examples/text-editor/text-editor-example.cpp index 44b08c8..866bded 100644 --- a/examples/text-editor/text-editor-example.cpp +++ b/examples/text-editor/text-editor-example.cpp @@ -130,7 +130,7 @@ public: // Add border to highlight harder-to-see colors. // We use a color rather than border visual as the container will always be behind the button. Property::Map colorMap; - colorMap.Insert( Visual::Property::TYPE, Visual::COLOR); + colorMap.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR); colorMap.Insert( ColorVisual::Property::MIX_COLOR, Color::BLACK ); mColorContainer.SetProperty( Control::Property::BACKGROUND, colorMap ); @@ -276,7 +276,7 @@ public: void SetButtonColor( Button& button, const Vector4& color ) { Property::Map colorVisualMap; - colorVisualMap.Add( Visual::Property::TYPE, Visual::COLOR ) + colorVisualMap.Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ) .Add( ColorVisual::Property::MIX_COLOR, color ); button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap ); diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 9462657..36fd1db 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -25,7 +25,6 @@ #include #include #include -#include // INTERNAL INCLUDES #include "shared/multi-language-strings.h" diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index d3218a6..ada8b1c 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -231,7 +231,7 @@ public: mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); Dali::Property::Map border; - border.Insert( Visual::Property::TYPE, Visual::BORDER ); + border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER ); border.Insert( BorderVisual::Property::COLOR, Color::WHITE ); border.Insert( BorderVisual::Property::SIZE, 2.f ); mBorder.SetProperty( Control::Property::BACKGROUND, border ); @@ -343,7 +343,7 @@ public: mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap ); mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL, - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER ) .Add( BorderVisual::Property::COLOR, Color::WHITE ) .Add( BorderVisual::Property::SIZE, 2.0f ) .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); diff --git a/examples/text-scrolling/text-scrolling-example.cpp b/examples/text-scrolling/text-scrolling-example.cpp index 872f289..2db7033 100644 --- a/examples/text-scrolling/text-scrolling-example.cpp +++ b/examples/text-scrolling/text-scrolling-example.cpp @@ -87,7 +87,7 @@ public: parent.Add( box ); Dali::Property::Map border; - border.Insert( Visual::Property::TYPE, Visual::BORDER ); + border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER ); border.Insert( BorderVisual::Property::COLOR, Color::BLUE ); border.Insert( BorderVisual::Property::SIZE, 1.f ); box.SetProperty( Control::Property::BACKGROUND, border ); @@ -209,8 +209,8 @@ public: Toolkit::PushButton colorButton = Toolkit::PushButton::New(); colorButton.SetProperty( Button::Property::TOGGLABLE, true ); - colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) ); - colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) ); + colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) ); + colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) ); colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index 288e880..510e34d 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -16,7 +16,6 @@ */ // EXTERNAL INCLUDES -#include #include // INTERNAL INCLUDES diff --git a/examples/tooltip/tooltip-example.cpp b/examples/tooltip/tooltip-example.cpp index 3af4e11..885c55e 100644 --- a/examples/tooltip/tooltip-example.cpp +++ b/examples/tooltip/tooltip-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -18,8 +18,6 @@ #include #include #include -#include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -97,9 +95,9 @@ private: Layout( customFromCode, stageSize ); customFromCode.SetProperty( DevelControl::Property::TOOLTIP, Property::Map().Add( Tooltip::Property::CONTENT, - Property::Array().Add( Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE ) + Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE ) .Add( ImageVisual::Property::URL, DEMO_IMAGE_DIR "Logo-for-demo.png" ) ) - .Add( Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT ) + .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT ) .Add( TextVisual::Property::TEXT_COLOR, Color::WHITE ) .Add( TextVisual::Property::TEXT, "Custom coded style\nat hover point" ) .Add( TextVisual::Property::MULTI_LINE, true ) @@ -140,7 +138,7 @@ private: if( control ) { control.SetProperty( Button::Property::LABEL, - Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT ) .Add( TextVisual::Property::TEXT, label ) ); } } diff --git a/examples/transitions/shadow-button-impl.cpp b/examples/transitions/shadow-button-impl.cpp index 135ea16..4273bcc 100644 --- a/examples/transitions/shadow-button-impl.cpp +++ b/examples/transitions/shadow-button-impl.cpp @@ -16,11 +16,8 @@ #include "shadow-button-impl.h" #include -#include #include -#include #include -#include #include #include @@ -374,7 +371,7 @@ void ShadowButton::ResetVisual( } // Extract transform maps out of the visual definition and store them - Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform"); + Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform"); if( value ) { Property::Map* transformMap = value->GetMap(); diff --git a/examples/transitions/transition-application.cpp b/examples/transitions/transition-application.cpp index d3acd98..d2697d5 100644 --- a/examples/transitions/transition-application.cpp +++ b/examples/transitions/transition-application.cpp @@ -25,8 +25,6 @@ // External includes #include #include -#include -#include #include "shadow-button.h" #include #include diff --git a/examples/visual-transitions/beat-control-impl.cpp b/examples/visual-transitions/beat-control-impl.cpp index 54ae6b0..dc88985 100644 --- a/examples/visual-transitions/beat-control-impl.cpp +++ b/examples/visual-transitions/beat-control-impl.cpp @@ -16,10 +16,8 @@ #include "beat-control-impl.h" #include -#include #include #include -#include using namespace Dali; // Needed for macros using namespace Dali::Toolkit; @@ -212,9 +210,9 @@ void BeatControl::RelayoutVisuals( const Vector2& targetSize ) Property::Map transformMap; // Make the visual half the size of the control, but leave // origin and anchor point at center, position is relative, but Zer0 - transformMap[ DevelVisual::Transform::Property::SIZE ] = mTransformSize; - transformMap[ DevelVisual::Transform::Property::ORIGIN ] = mTransformOrigin; - transformMap[ DevelVisual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint; + transformMap[ Visual::Transform::Property::SIZE ] = mTransformSize; + transformMap[ Visual::Transform::Property::ORIGIN ] = mTransformOrigin; + transformMap[ Visual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint; mVisual.SetTransformAndSize( transformMap, size ); } } @@ -262,7 +260,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const Property::Map* map = value.GetMap(); if( map ) { - Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform" ); + Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform" ); if( value ) { Property::Map* transformMap = value->GetMap(); @@ -272,14 +270,14 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const // If there are more properties in the transform map, then we need to create a new visual unsigned int sizeAndPositionPropertyCount = 0; - Property::Value* sizeValue = transformMap->Find( DevelVisual::Transform::Property::SIZE, "size" ); + Property::Value* sizeValue = transformMap->Find( Visual::Transform::Property::SIZE, "size" ); if( sizeValue ) { sizeValue->Get( impl.mTransformSize ); ++sizeAndPositionPropertyCount; } - Property::Value* originValue = transformMap->Find( DevelVisual::Transform::Property::ORIGIN, "origin" ); + Property::Value* originValue = transformMap->Find( Visual::Transform::Property::ORIGIN, "origin" ); if( originValue ) { int intValue = 0; @@ -290,7 +288,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const } } - Property::Value* anchorPointValue = transformMap->Find( DevelVisual::Transform::Property::ANCHOR_POINT, "anchorPoint" ); + Property::Value* anchorPointValue = transformMap->Find( Visual::Transform::Property::ANCHOR_POINT, "anchorPoint" ); if( anchorPointValue ) { int intValue = 0; diff --git a/examples/visual-transitions/beat-control-impl.h b/examples/visual-transitions/beat-control-impl.h index 7e77def..95596a3 100644 --- a/examples/visual-transitions/beat-control-impl.h +++ b/examples/visual-transitions/beat-control-impl.h @@ -20,9 +20,9 @@ #include "beat-control.h" #include #include -#include #include #include +#include namespace Demo { diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp index 87a69d5..5192396 100644 --- a/examples/visual-transitions/transition-application.cpp +++ b/examples/visual-transitions/transition-application.cpp @@ -24,8 +24,6 @@ // External includes #include -#include -#include #include "beat-control.h" #include #include @@ -101,8 +99,8 @@ void TransitionApplication::Create( Application& application ) mBeatControl = BeatControl::New(); mBeatControl.SetName("BeatControl"); mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map() - .Add( DevelVisual::Property::TRANSFORM, Property::Map() - .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) ); + .Add( Visual::Property::TRANSFORM, Property::Map() + .Add( Visual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) ); mBeatControl.SetAnchorPoint( AnchorPoint::CENTER ); mBeatControl.SetParentOrigin( ParentOrigin::CENTER ); @@ -123,8 +121,8 @@ void TransitionApplication::Create( Application& application ) { Property::Map map; CreateVisualMap( i, map ); - map.Add( DevelVisual::Property::TRANSFORM, Property::Map() - .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) ); + map.Add( Visual::Property::TRANSFORM, Property::Map() + .Add( Visual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) ); mVisualButtons[i] = BeatControl::New(); mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map ); mVisualButtons[i].SetName("VisualButton"); @@ -176,20 +174,20 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) { case 0: { - map[ Visual::Property::TYPE ] = Visual::COLOR; + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR; map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW; break; } case 1: { - map[ Visual::Property::TYPE ] = Visual::BORDER; + map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER; map[ BorderVisual::Property::COLOR ] = Color::GREEN; map[ BorderVisual::Property::SIZE ] = 5; break; } case 2: { - map[ Visual::Property::TYPE ] = Visual::GRADIENT; + map[ Toolkit::Visual::Property::TYPE ] = Visual::GRADIENT; Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); @@ -212,21 +210,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) } case 3: { - map[ Visual::Property::TYPE ] = Visual::IMAGE; + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE; map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH; break; } case 4: { - map[ Visual::Property::TYPE ] = Visual::IMAGE; + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE; map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png"; - map[ DevelVisual::Property::PREMULTIPLIED_ALPHA ] = true; + map[ Visual::Property::PREMULTIPLIED_ALPHA ] = true; break; } case 5: { - map[ Visual::Property::TYPE ] = Visual::MESH; + map[ Toolkit::Visual::Property::TYPE ] = Visual::MESH; map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH; map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH; map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR; @@ -236,7 +234,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) case 6: { - map[ Visual::Property::TYPE ] = Visual::PRIMITIVE; + map[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE; map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE; map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f; @@ -250,21 +248,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) case 7: { // NPatch - map[ Visual::Property::TYPE ] = Visual::IMAGE; + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE; map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png"; break; } case 8: { // SVG - map[ Visual::Property::TYPE ] = Visual::IMAGE; + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE; map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg"; break; } case 9: { - map[ Visual::Property::TYPE ] = DevelVisual::TEXT; + map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT; map[ TextVisual::Property::TEXT ] = "Text"; map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN; map[ TextVisual::Property::POINT_SIZE ] = 10; @@ -273,7 +271,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) default: { - map[ Visual::Property::TYPE ] = Visual::COLOR; + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR; map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA; break; } @@ -287,8 +285,8 @@ bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData& int visual = actor.GetProperty( mVisualIndex ); Property::Map map; CreateVisualMap( visual, map ); - map.Add( DevelVisual::Property::TRANSFORM, Property::Map() - .Add( DevelVisual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) ); + map.Add( Visual::Property::TRANSFORM, Property::Map() + .Add( Visual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) ); mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map ); } return true; diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp index cae9fb1..84737d0 100644 --- a/shared/dali-table-view.cpp +++ b/shared/dali-table-view.cpp @@ -753,7 +753,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count ) Dali::Property::Map effect = Toolkit::CreateDistanceFieldEffect(); Property::Map imageMap; imageMap.Add( ImageVisual::Property::URL, SHAPE_IMAGE_TABLE[ shapeType ] ); - imageMap.Add( Visual::Property::SHADER, effect ); + imageMap.Add( Toolkit::Visual::Property::SHADER, effect ); dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] ); -- 2.7.4