diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml index fa6cd12..df0424c 100644 --- a/com.samsung.dali-demo.xml +++ b/com.samsung.dali-demo.xml @@ -103,6 +103,9 @@ + + + diff --git a/examples-reel/dali-examples-reel.cpp b/examples-reel/dali-examples-reel.cpp index ad5575c..f2691e2 100644 --- a/examples-reel/dali-examples-reel.cpp +++ b/examples-reel/dali-examples-reel.cpp @@ -82,6 +82,7 @@ int DALI_EXPORT_API main(int argc, char **argv) demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)); demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE)); demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT)); + demo.AddExample(Example("text-memory-profiling.example", DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING)); demo.AddExample(Example("text-overlap.example", DALI_DEMO_STR_TITLE_TEXT_OVERLAP)); demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING)); demo.AddExample(Example("remote-image-loading.example", DALI_DEMO_STR_TITLE_REMOTE_IMAGE)); 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-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index 69f5931..cbac87a 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -477,7 +477,7 @@ public: image.SetPosition( Vector3( imagePosition.x, imagePosition.y, 0 ) ); image.SetSize( imageSize ); image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); - Toolkit::DevelControl::ResourceReadySignal( image).Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal); + image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal ); mFittingModes[image.GetId()] = fittingMode; mResourceUrls[image.GetId()] = imageSource.configuration.path; mSizes[image.GetId()] = imageSize; diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp index a264ca5..fa89c05 100644 --- a/examples/image-view-svg/image-view-svg-example.cpp +++ b/examples/image-view-svg/image-view-svg-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. @@ -123,8 +123,8 @@ public: mPinchGestureDetector.Attach( mStageBackground); mPinchGestureDetector.DetectedSignal().Connect(this, &ImageSvgController::OnPinch); - DevelActor::RaiseToTop(changeButton); - DevelActor::RaiseToTop(resetButton); + changeButton.RaiseToTop(); + resetButton.RaiseToTop(); } // Callback of push button, for changing image set 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/image-view/image-view-example.cpp b/examples/image-view/image-view-example.cpp index 3447c84..a772665 100644 --- a/examples/image-view/image-view-example.cpp +++ b/examples/image-view/image-view-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. @@ -19,7 +19,6 @@ #include "shared/view.h" #include #include -#include using namespace Dali; 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/pivot/pivot-example.cpp b/examples/pivot/pivot-example.cpp index 9ea5f47..fe62dcf 100644 --- a/examples/pivot/pivot-example.cpp +++ b/examples/pivot/pivot-example.cpp @@ -116,7 +116,7 @@ private: void OnTap( Actor actor, const TapGesture& /* tap */ ) { // Raise the actor to the top. - DevelActor::RaiseToTop( actor ); + actor.RaiseToTop(); // Create the animation to rotate and scale our actor. Animation animation = Animation::New( 1.0f ); 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/progress-bar/progress-bar-example.cpp b/examples/progress-bar/progress-bar-example.cpp index f12fd28..049b559 100644 --- a/examples/progress-bar/progress-bar-example.cpp +++ b/examples/progress-bar/progress-bar-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 @@ #include "shared/view.h" #include -#include using namespace Dali; using namespace Dali::Toolkit; diff --git a/examples/property-notification/property-notification-example.cpp b/examples/property-notification/property-notification-example.cpp index 3d3b6d6..8748533 100644 --- a/examples/property-notification/property-notification-example.cpp +++ b/examples/property-notification/property-notification-example.cpp @@ -17,7 +17,6 @@ #include #include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -68,16 +67,16 @@ public: mTextLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mTextLabel.SetProperty( TextLabel::Property::MULTI_LINE, true ); mTextLabel.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); - mTextLabel.SetProperty( DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE, Color::BLACK ); + mTextLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLACK ); stage.Add( mTextLabel ); // Create an animation and animate the text color to red Animation animation = Animation::New( COLOR_ANIMATION_DURATION ); - animation.AnimateTo( Property( mTextLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::RED ); + animation.AnimateTo( Property( mTextLabel, TextLabel::Property::TEXT_COLOR ), Color::RED ); animation.Play(); // Set up a property notification so we are notified when the red component of the text-color reaches 50% - PropertyNotification notification = mTextLabel.AddPropertyNotification( DevelTextLabel::Property::TEXT_COLOR_RED, GreaterThanCondition( 0.5f ) ); + PropertyNotification notification = mTextLabel.AddPropertyNotification( TextLabel::Property::TEXT_COLOR_RED, GreaterThanCondition( 0.5f ) ); notification.NotifySignal().Connect( this, &PropertyNotificationController::RedComponentNotification ); } 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/rendering-basic-pbr/ktx-loader.cpp b/examples/rendering-basic-pbr/ktx-loader.cpp index 1c3268d..b54704c 100644 --- a/examples/rendering-basic-pbr/ktx-loader.cpp +++ b/examples/rendering-basic-pbr/ktx-loader.cpp @@ -19,8 +19,6 @@ #include "ktx-loader.h" // EXTERNAL INCLUDES -#include -#include #include #include #include @@ -49,38 +47,38 @@ struct KtxFileHeader /** * Convert KTX format to Dali::Pixel::Format */ -bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::DevelPixel::Format& format) +bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::Pixel::Format& format) { switch( ktxPixelFormat ) { case 0x93B0: // GL_COMPRESSED_RGBA_ASTC_4x4_KHR { - format = Dali::DevelPixel::COMPRESSED_RGBA_ASTC_4x4_KHR; + format = Dali::Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR; break; } case 0x881B:// GL_RGB16F { - format = Dali::DevelPixel::RGB16F; + format = Dali::Pixel::RGB16F; break; } case 0x8815: // GL_RGB32F { - format = Dali::DevelPixel::RGB32F; + format = Dali::Pixel::RGB32F; break; } case 0x8C3A: // GL_R11F_G11F_B10F { - format = Dali::DevelPixel::RGB32F; + format = Dali::Pixel::RGB32F; break; } case 0x8D7C: // GL_RGBA8UI { - format = Dali::DevelPixel::RGBA8888; + format = Dali::Pixel::RGBA8888; break; } case 0x8D7D: // GL_RGB8UI { - format = Dali::DevelPixel::RGB888; + format = Dali::Pixel::RGB888; break; } default: @@ -162,7 +160,7 @@ bool LoadCubeMapFromKtxFile( const std::string& path, CubeData& cubedata ) header.pixelHeight = 1u; } - Dali::DevelPixel::Format daliformat = DevelPixel::RGB888; + Dali::Pixel::Format daliformat = Pixel::RGB888; ConvertPixelFormat(header.glInternalFormat, daliformat); @@ -185,7 +183,7 @@ bool LoadCubeMapFromKtxFile( const std::string& path, CubeData& cubedata ) memcpy(img[face],imgPointer,byteSize); imgSize[face] = byteSize; imgPointer += byteSize; - cubedata.img[face][mipmapLevel] = DevelPixelData::New( img[face], imgSize[face], header.pixelWidth , header.pixelHeight , daliformat, PixelData::FREE ); + cubedata.img[face][mipmapLevel] = PixelData::New( img[face], imgSize[face], header.pixelWidth , header.pixelHeight , daliformat, PixelData::FREE ); } } header.pixelHeight/=2u; 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 f2b0802..759a684 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-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. @@ -23,7 +23,6 @@ // EXTERNAL INCLUDES #include #include -#include #include #include #include @@ -209,7 +208,7 @@ public: mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); mLabel.SetSize(mLayoutSize); mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true ); - mLabel.SetProperty( DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE, Color::GREEN ); + mLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN ); mLabel.SetBackgroundColor( Color::WHITE ); mContainer.Add( mLabel ); @@ -231,14 +230,14 @@ 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 ); mContainer.Add( mBorder ); mBorder.SetVisible(false); - DevelActor::RaiseToTop(mGrabCorner); + mGrabCorner.RaiseToTop(); mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f ); Renderer bgRenderer = mLabel.GetRendererAt(0); @@ -256,7 +255,7 @@ public: // Animate the text color 3 times from source color to Yellow Animation animation = Animation::New( 2.f ); - animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::YELLOW, AlphaFunction::SIN ); + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), Color::YELLOW, AlphaFunction::SIN ); animation.SetLoopCount( 3 ); animation.Play(); @@ -270,7 +269,7 @@ public: if( button == mStyleButtons[ StyleType::TEXT_COLOR ] ) { Animation animation = Animation::New( 2.f ); - animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), mSelectedColor, AlphaFunction::LINEAR ); + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), mSelectedColor, AlphaFunction::LINEAR ); animation.Play(); } else if( button == mStyleButtons[ StyleType::OUTLINE ] ) @@ -343,7 +342,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 ) ); @@ -463,7 +462,7 @@ public: case KEY_A: // Animate text colour { Animation animation = Animation::New( 2.f ); - animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::RED, AlphaFunction::SIN ); + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), Color::RED, AlphaFunction::SIN ); animation.SetLoopCount( 3 ); animation.Play(); break; diff --git a/examples/text-memory-profiling/text-memory-profiling-example.cpp b/examples/text-memory-profiling/text-memory-profiling-example.cpp new file mode 100644 index 0000000..693b0d4 --- /dev/null +++ b/examples/text-memory-profiling/text-memory-profiling-example.cpp @@ -0,0 +1,436 @@ +/* + * 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. + * 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. + * + */ + +/** + * @file text-memory-profiling-example.cpp + * @brief Memory consumption profiling for TextLabel + */ + +// EXTERNAL INCLUDES +#include +#include +#include +#include + +// INTERNAL INCLUDES +#include "shared/view.h" + +using namespace Dali; +using namespace Dali::Toolkit; + +namespace +{ + +enum TextType +{ + SINGLE_COLOR_TEXT, + SINGLE_COLOR_TEXT_WITH_STYLE, + SINGLE_COLOR_TEXT_WITH_EMOJI, + SINGLE_COLOR_TEXT_WITH_STYLE_EMOJI, + MULTI_COLOR_TEXT, + MULTI_COLOR_TEXT_WITH_STYLE, + MULTI_COLOR_TEXT_WITH_EMOJI, + MULTI_COLOR_TEXT_WITH_STYLE_EMOJI, + NUMBER_OF_TYPES +}; + +std::string TEXT_TYPE_STRING[ NUMBER_OF_TYPES ] = +{ + "Single color text", + "Single color text with style", + "Single color text with emoji", + "Single color text with style and emoji", + "Multi color text", + "Multi color text with style", + "Multi color text with emoji", + "Multi color text with style and emoji" +}; + +const int NUMBER_OF_LABELS = 500; + +const char* BACKGROUND_IMAGE( "" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char* BACK_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* BACK_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); +const char* INDICATOR_IMAGE( DEMO_IMAGE_DIR "loading.png" ); + +} // anonymous namespace + +/** + * @brief The main class of the demo. + */ +class TextMemoryProfilingExample : public ConnectionTracker, public Toolkit::ItemFactory +{ +public: + + TextMemoryProfilingExample( Application& application ) + : mApplication( application ), + mCurrentTextStyle( SINGLE_COLOR_TEXT ) + { + // Connect to the Application's Init signal + mApplication.InitSignal().Connect( this, &TextMemoryProfilingExample::Create ); + } + + ~TextMemoryProfilingExample() + { + // Nothing to do here. + } + + /** + * @brief Create a text label in the given type + */ + TextLabel SetupTextLabel( int type ) + { + TextLabel label = TextLabel::New(); + label.SetAnchorPoint( ParentOrigin::TOP_LEFT ); + label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLACK ); + label.SetProperty( TextLabel::Property::POINT_SIZE, 12.0f ); + label.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::YELLOW ); + label.SetProperty( TextLabel::Property::ENABLE_MARKUP, true ); + + Vector2 stageSize = Stage::GetCurrent().GetSize(); + label.SetPosition( Vector3( Random::Range( 0.0f, stageSize.x ), Random::Range( 0.0f, stageSize.y ), 0.0f) ); + + switch ( type ) + { + case SINGLE_COLOR_TEXT: + { + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) ); + break; + } + case SINGLE_COLOR_TEXT_WITH_STYLE: + { + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) ); + break; + } + case SINGLE_COLOR_TEXT_WITH_EMOJI: + { + label.SetProperty( TextLabel::Property::TEXT, "\xF0\x9F\x98\x81 A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) ); + break; + } + case SINGLE_COLOR_TEXT_WITH_STYLE_EMOJI: + { + label.SetProperty( TextLabel::Property::TEXT, "\xF0\x9F\x98\x81 A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) ); + break; + } + case MULTI_COLOR_TEXT: + { + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) ); + break; + } + case MULTI_COLOR_TEXT_WITH_STYLE: + { + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) ); + break; + } + case MULTI_COLOR_TEXT_WITH_EMOJI: + { + label.SetProperty( TextLabel::Property::TEXT, " \xF0\x9F\x98\x81 A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) ); + break; + } + case MULTI_COLOR_TEXT_WITH_STYLE_EMOJI: + { + label.SetProperty( TextLabel::Property::TEXT, " \xF0\x9F\x98\x81 A Quick Brown Fox Jumps Over The Lazy Dog" ); + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) ); + break; + } + default: + break; + } + + return label; + } + + /** + * @brief Create the main menu + */ + void CreateMainMenu() + { + Stage stage = Stage::GetCurrent(); + Vector2 stageSize = stage.GetSize(); + + mTapDetector = TapGestureDetector::New(); + mTapDetector.DetectedSignal().Connect( this, &TextMemoryProfilingExample::OnTap ); + + // Create an item view for the main menu + mItemView = ItemView::New( *this ); + + mItemView.SetParentOrigin( ParentOrigin::CENTER ); + mItemView.SetAnchorPoint( AnchorPoint::CENTER ); + + mLayout = DefaultItemLayout::New( DefaultItemLayout::LIST ); + mLayout->SetItemSize( Vector3( stageSize.width, 60.0f, 0.0f ) ); + + mItemView.AddLayout( *mLayout ); + + // Activate the layout + mItemView.ActivateLayout( 0, Vector3( stageSize ), 0.0f ); + } + + /** + * @brief Return the number of items in the main menu + */ + virtual unsigned int GetNumberOfItems() + { + return NUMBER_OF_TYPES; + } + + /** + * @brief Create new item for the main menu + */ + virtual Actor NewItem( unsigned int itemId ) + { + TextLabel label = TextLabel::New( TEXT_TYPE_STRING[itemId] ); + label.SetStyleName( "BuilderLabel" ); + label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + + // Hook up tap detector + mTapDetector.Attach( label ); + + return label; + } + + /** + * @brief Create text labels for memory profiling + */ + void CreateTextLabels( int type ) + { + Stage stage = Stage::GetCurrent(); + + // Render tasks may have been setup last load so remove them + RenderTaskList taskList = stage.GetRenderTaskList(); + if( taskList.GetTaskCount() > 1 ) + { + typedef std::vector Collection; + typedef Collection::iterator ColIter; + Collection tasks; + + for( unsigned int i = 1; i < taskList.GetTaskCount(); ++i ) + { + tasks.push_back( taskList.GetTask(i) ); + } + + for( ColIter iter = tasks.begin(); iter != tasks.end(); ++iter ) + { + taskList.RemoveTask(*iter); + } + + RenderTask defaultTask = taskList.GetTask( 0 ); + defaultTask.SetSourceActor( stage.GetRootLayer() ); + defaultTask.SetTargetFrameBuffer( FrameBufferImage() ); + } + + // Delete any existing text labels + unsigned int numChildren = mLayer.GetChildCount(); + + for( unsigned int i = 0; i < numChildren; ++i ) + { + mLayer.Remove( mLayer.GetChildAt( 0 ) ); + } + + mLayer.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); + mLayer.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + mLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + mLayer.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::HEIGHT ); + mLayer.SetSizeModeFactor( Vector3( 0.0f, -DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight, 0.0f ) ); + + mNavigationView.Push( mLayer ); + + // Create new text labels + for ( int i = 0; i < NUMBER_OF_LABELS; i++ ) + { + TextLabel label = SetupTextLabel( type ); + mLayer.Add( label ); + } + + mTitle.SetProperty( TextLabel::Property::TEXT, "Run memps on target" ); + } + + /** + * @brief One-time setup in response to Application InitSignal. + */ + void Create( Application& application ) + { + Stage stage = Stage::GetCurrent(); + + stage.KeyEventSignal().Connect(this, &TextMemoryProfilingExample::OnKeyEvent); + + Layer contents = DemoHelper::CreateView( mApplication, + mView, + mToolBar, + BACKGROUND_IMAGE, + TOOLBAR_IMAGE, + "" ); + + mTitle = DemoHelper::CreateToolBarLabel( "" ); + mTitle.SetProperty( TextLabel::Property::TEXT, "Select the type of text" ); + + // Add title to the tool bar. + mToolBar.AddControl( mTitle, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter ); + + // Create a layer to contain dynamically created text labels + mLayer = Layer::New(); + + mIndicator = Toolkit::ImageView::New(INDICATOR_IMAGE); + mIndicator.SetParentOrigin( ParentOrigin::CENTER ); + mIndicator.SetAnchorPoint( AnchorPoint::CENTER ); + mIndicator.SetProperty( Actor::Property::VISIBLE, false ); + + // Create a back button in the left of toolbar + PushButton backButton = PushButton::New(); + backButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BACK_IMAGE ); + backButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BACK_IMAGE_SELECTED ); + backButton.ClickedSignal().Connect( this, &TextMemoryProfilingExample::OnBackButtonPressed ); + backButton.SetLeaveRequired( true ); + mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); + + // Create a navigation view to navigate different types of text labels + mNavigationView = NavigationView::New(); + mNavigationView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + mNavigationView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mNavigationView.SetBackgroundColor( Color::WHITE ); + stage.Add( mNavigationView ); + + CreateMainMenu(); + mNavigationView.Push( mItemView ); + + mItemView.Add(mIndicator); + + PropertyNotification notification = mIndicator.AddPropertyNotification( Actor::Property::VISIBLE, GreaterThanCondition(0.01f) ); + notification.NotifySignal().Connect( this, &TextMemoryProfilingExample::OnIndicatorVisible ); + } + + /** + * @brief Main key event handler + */ + void OnKeyEvent( const KeyEvent& event ) + { + if( event.state == KeyEvent::Down ) + { + if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) + { + ReturnToPreviousScreen(); + } + } + } + + /** + * @brief Tap gesture handler + */ + void OnTap( Actor actor, const TapGesture& tap ) + { + mCurrentTextStyle = mItemView.GetItemId( actor ); + + // Show the loading indicator + mIndicator.SetProperty( Actor::Property::VISIBLE, true ); + + if ( mAnimation ) + { + mAnimation.Clear(); + mAnimation.Reset(); + } + + mAnimation = Animation::New( 0.8f ); + mAnimation.AnimateBy( Property( mIndicator, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(180.0f) ), Vector3::ZAXIS ) ); + mAnimation.SetLooping( true ); + mAnimation.Play(); + } + + /** + * @brief Property notification handler + */ + void OnIndicatorVisible( PropertyNotification& source ) + { + CreateTextLabels( mCurrentTextStyle ); + + // Hide the loading indicator + mAnimation.Stop(); + mIndicator.SetProperty( Actor::Property::VISIBLE, false ); + } + + /** + * @brief Button signal handler + */ + bool OnBackButtonPressed( Toolkit::Button button ) + { + ReturnToPreviousScreen(); + return true; + } + + /** + * @brief Returns to the previous screen + */ + void ReturnToPreviousScreen() + { + if ( mItemView.OnStage() ) + { + // Quit the application if it is in the main menu + mApplication.Quit(); + } + else + { + // Return to the main menu + mNavigationView.Pop(); + + mTitle.SetProperty( TextLabel::Property::TEXT, "Select type of text to test" ); + } + } + +private: + + Application& mApplication; + + ItemLayoutPtr mLayout; + ItemView mItemView; + NavigationView mNavigationView; + + Control mView; + ToolBar mToolBar; + TextLabel mTitle; + ImageView mIndicator; + Animation mAnimation; + + Layer mLayer; + + TapGestureDetector mTapDetector; + + unsigned int mCurrentTextStyle; +}; + +void RunTest( Application& application ) +{ + TextMemoryProfilingExample test( application ); + + application.MainLoop(); +} + +/** Entry point for Linux & Tizen applications */ +int DALI_EXPORT_API main( int argc, char **argv ) +{ + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); + RunTest( application ); + + return 0; +} diff --git a/examples/text-overlap/text-overlap-example.cpp b/examples/text-overlap/text-overlap-example.cpp index 560ebe0..f5609bd 100644 --- a/examples/text-overlap/text-overlap-example.cpp +++ b/examples/text-overlap/text-overlap-example.cpp @@ -113,7 +113,7 @@ void TextOverlapController::Destroy( Application& app ) bool TextOverlapController::OnClicked( Button button ) { mTopmostLabel = 1-mTopmostLabel; // toggles between 0 and 1 - DevelActor::RaiseToTop(mLabels[mTopmostLabel]); + mLabels[mTopmostLabel].RaiseToTop(); return false; } diff --git a/examples/text-scrolling/text-scrolling-example.cpp b/examples/text-scrolling/text-scrolling-example.cpp index 872f289..5a4ff9e 100644 --- a/examples/text-scrolling/text-scrolling-example.cpp +++ b/examples/text-scrolling/text-scrolling-example.cpp @@ -23,7 +23,6 @@ // EXTERNAL INCLUDES #include #include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -87,7 +86,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 ); @@ -190,8 +189,8 @@ public: Toolkit::PushButton scrollRtlButton = Toolkit::PushButton::New(); scrollRtlButton.ClickedSignal().Connect( this, &TextScrollingExample::OnButtonClickedRtl ); CreateLabel( mRtlLabel, "مرحبا بالعالم", boxD , true, scrollRtlButton ); - mRtlLabel.SetProperty(DevelTextLabel::Property::AUTO_SCROLL_STOP_MODE, DevelTextLabel::AutoScrollStopMode::IMMEDIATE ); - mRtlLabel.SetProperty(DevelTextLabel::Property::AUTO_SCROLL_LOOP_DELAY, 0.3f ); + mRtlLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE ); + mRtlLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_DELAY, 0.3f ); CreateBox( "boxE", boxE, desktop, SCROLLING_BOX_SIZE ); boxE.SetPosition( 0.0f, -100.0f, 1.0f ); @@ -201,7 +200,7 @@ public: mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 500); mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 500); mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3); - mRtlLongLabel.SetProperty(DevelTextLabel::Property::AUTO_SCROLL_STOP_MODE, DevelTextLabel::AutoScrollStopMode::FINISH_LOOP ); + mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP ); mPanGestureDetector = PanGestureDetector::New(); mPanGestureDetector.DetectedSignal().Connect(this, &TextScrollingExample::OnPanGesture ); @@ -209,8 +208,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/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index b9e60cc..eccd985 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.2.59 +Version: 1.2.60 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/resources/images/loading.png b/resources/images/loading.png new file mode 100644 index 0000000..d794364 --- /dev/null +++ b/resources/images/loading.png diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po index e2447d3..a864a77 100755 --- a/resources/po/en_GB.po +++ b/resources/po/en_GB.po @@ -151,6 +151,9 @@ msgstr "Text Field" msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" msgstr "Text Label" +msgid "DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING" +msgstr "Text Memory Profiling" + msgid "DALI_DEMO_STR_TITLE_TEXT_OVERLAP" msgstr "Text Overlap" diff --git a/resources/po/en_US.po b/resources/po/en_US.po index 27b618f..4015058 100755 --- a/resources/po/en_US.po +++ b/resources/po/en_US.po @@ -154,6 +154,9 @@ msgstr "Text Field" msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" msgstr "Text Label" +msgid "DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING" +msgstr "Text Memory Profiling" + msgid "DALI_DEMO_STR_TITLE_TEXT_OVERLAP" msgstr "Text Overlap" diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h index 64c617d..480c81c 100644 --- a/shared/dali-demo-strings.h +++ b/shared/dali-demo-strings.h @@ -94,6 +94,7 @@ extern "C" #define DALI_DEMO_STR_TITLE_TEXT_EDITOR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_EDITOR") #define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD") #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL") +#define DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING") #define DALI_DEMO_STR_TITLE_TEXT_OVERLAP dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_OVERLAP") #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE") #define DALI_DEMO_STR_TITLE_TEXT_SCROLLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_SCROLLING") @@ -165,6 +166,7 @@ extern "C" #define DALI_DEMO_STR_TITLE_TEXT_EDITOR "Text Editor" #define DALI_DEMO_STR_TITLE_TEXT_FIELD "Text Field" #define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label" +#define DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING "Text Memory Profiling" #define DALI_DEMO_STR_TITLE_TEXT_OVERLAP "Text Overlap" #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts" #define DALI_DEMO_STR_TITLE_TEXT_SCROLLING "Text Scrolling" 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 ] );