Peter M. Groen / dali-demo

Commit 8b8df4bd98ecbf5226c2f06d477aec784d326860

Authored by Adeel Kazmi
2 parents d83929a2 75137815

[dali_1.2.60] Merge branch 'devel/master' 

Change-Id: I64b3eb9bf57d879c6bebb8f8b128e268ac0957c7
Inline Side-by-side
Showing 55 changed files with 564 additions and 172 deletions
com.samsung.dali-demo.xml
  View file @8b8df4b
@@ -103,6 +103,9 @@ @@ -103,6 +103,9 @@
103 <ui-application appid="text-fonts.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-fonts.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 103 <ui-application appid="text-fonts.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-fonts.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
104 <label>Text Fonts</label> 104 <label>Text Fonts</label>
105 </ui-application> 105 </ui-application>
  106 + <ui-application appid="text-memory-profiling.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-memory-profiling.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
  107 + <label>Text Memory Profiling</label>
  108 + </ui-application>
106 <ui-application appid="text-scrolling.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-scrolling.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true"> 109 <ui-application appid="text-scrolling.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-scrolling.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
107 <label>Text Scrolling</label> 110 <label>Text Scrolling</label>
108 </ui-application> 111 </ui-application>
examples-reel/dali-examples-reel.cpp
  View file @8b8df4b
@@ -82,6 +82,7 @@ int DALI_EXPORT_API main(int argc, char **argv) @@ -82,6 +82,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
82 demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)); 82 demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
83 demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE)); 83 demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
84 demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT)); 84 demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
  85 + demo.AddExample(Example("text-memory-profiling.example", DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING));
85 demo.AddExample(Example("text-overlap.example", DALI_DEMO_STR_TITLE_TEXT_OVERLAP)); 86 demo.AddExample(Example("text-overlap.example", DALI_DEMO_STR_TITLE_TEXT_OVERLAP));
86 demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING)); 87 demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING));
87 demo.AddExample(Example("remote-image-loading.example", DALI_DEMO_STR_TITLE_REMOTE_IMAGE)); 88 demo.AddExample(Example("remote-image-loading.example", DALI_DEMO_STR_TITLE_REMOTE_IMAGE));
examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2015 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
20 -#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>  
21 #include <cstring> 19 #include <cstring>
22 20
23 using namespace Dali; 21 using namespace Dali;
@@ -112,17 +110,17 @@ private: @@ -112,17 +110,17 @@ private:
112 Property::Map map; 110 Property::Map map;
113 map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE ); 111 map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE );
114 map.Add( Toolkit::ImageVisual::Property::URL, image ); 112 map.Add( Toolkit::ImageVisual::Property::URL, image );
115 - map.Add( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mask ); 113 + map.Add( Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mask );
116 114
117 if( mImageCombinationIndex%2 == 0 ) 115 if( mImageCombinationIndex%2 == 0 )
118 { 116 {
119 - map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.f );  
120 - map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, false ); 117 + map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.f );
  118 + map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, false );
121 } 119 }
122 else 120 else
123 { 121 {
124 - map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );  
125 - map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, true ); 122 + map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );
  123 + map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, true );
126 } 124 }
127 125
128 mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); 126 mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
examples/animated-images/animated-images-example.cpp
  View file @8b8df4b
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
20 -#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>  
21 #include "shared/utility.h" 20 #include "shared/utility.h"
22 21
23 using namespace Dali; 22 using namespace Dali;
@@ -361,9 +360,9 @@ public: @@ -361,9 +360,9 @@ public:
361 if( type == IMAGE_ARRAY ) 360 if( type == IMAGE_ARRAY )
362 { 361 {
363 map 362 map
364 - .Add( Toolkit::DevelImageVisual::Property::BATCH_SIZE, 4 )  
365 - .Add( Toolkit::DevelImageVisual::Property::CACHE_SIZE, 10 )  
366 - .Add( Toolkit::DevelImageVisual::Property::FRAME_DELAY, 150 ); 363 + .Add( Toolkit::ImageVisual::Property::BATCH_SIZE, 4 )
  364 + .Add( Toolkit::ImageVisual::Property::CACHE_SIZE, 10 )
  365 + .Add( Toolkit::ImageVisual::Property::FRAME_DELAY, 150 );
367 } 366 }
368 } 367 }
369 368
examples/animated-shapes/animated-shapes-example.cpp
  View file @8b8df4b
@@ -114,7 +114,7 @@ public: @@ -114,7 +114,7 @@ public:
114 background.SetParentOrigin( Dali::ParentOrigin::CENTER ); 114 background.SetParentOrigin( Dali::ParentOrigin::CENTER );
115 background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS ); 115 background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
116 Dali::Property::Map map; 116 Dali::Property::Map map;
117 - map.Insert( Visual::Property::TYPE, Visual::GRADIENT ); 117 + map.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT );
118 Property::Array stopOffsets; 118 Property::Array stopOffsets;
119 stopOffsets.PushBack( 0.0f ); 119 stopOffsets.PushBack( 0.0f );
120 stopOffsets.PushBack( 1.0f ); 120 stopOffsets.PushBack( 1.0f );
examples/benchmark/benchmark.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 -#include <dali/public-api/rendering/renderer.h>  
20 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
21 20
22 // INTERNAL INCLUDES 21 // INTERNAL INCLUDES
examples/clipping/clipping-example.cpp
  View file @8b8df4b
@@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
19 #include <dali/dali.h> 19 #include <dali/dali.h>
20 #include <dali-toolkit/dali-toolkit.h> 20 #include <dali-toolkit/dali-toolkit.h>
21 #include <dali/devel-api/actors/actor-devel.h> 21 #include <dali/devel-api/actors/actor-devel.h>
22 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
23 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
24 22
25 // INTERNAL INCLUDES 23 // INTERNAL INCLUDES
26 #include "clipping-item-factory.h" 24 #include "clipping-item-factory.h"
@@ -121,7 +119,7 @@ private: @@ -121,7 +119,7 @@ private:
121 border.SetParentOrigin( ParentOrigin::CENTER ); 119 border.SetParentOrigin( ParentOrigin::CENTER );
122 border.SetAnchorPoint( AnchorPoint::CENTER ); 120 border.SetAnchorPoint( AnchorPoint::CENTER );
123 border.SetProperty( Control::Property::BACKGROUND, 121 border.SetProperty( Control::Property::BACKGROUND,
124 - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) 122 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
125 .Add( BorderVisual::Property::COLOR, Color::WHITE ) 123 .Add( BorderVisual::Property::COLOR, Color::WHITE )
126 .Add( BorderVisual::Property::SIZE, 2.0f ) 124 .Add( BorderVisual::Property::SIZE, 2.0f )
127 .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); 125 .Add( BorderVisual::Property::ANTI_ALIASING, true ) );
examples/clipping/clipping-item-factory.cpp
  View file @8b8df4b
@@ -112,7 +112,7 @@ Actor ClippingItemFactory::NewItem( unsigned int itemId ) @@ -112,7 +112,7 @@ Actor ClippingItemFactory::NewItem( unsigned int itemId )
112 borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) ); 112 borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) );
113 borderActor.SetColorMode( USE_PARENT_COLOR ); 113 borderActor.SetColorMode( USE_PARENT_COLOR );
114 borderActor.SetProperty( ImageView::Property::IMAGE, 114 borderActor.SetProperty( ImageView::Property::IMAGE,
115 - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) 115 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
116 .Add( BorderVisual::Property::COLOR, Color::WHITE ) 116 .Add( BorderVisual::Property::COLOR, Color::WHITE )
117 .Add( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE ) 117 .Add( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE )
118 .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); 118 .Add( BorderVisual::Property::ANTI_ALIASING, true ) );
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 #include <dali/dali.h> 19 #include <dali/dali.h>
20 -#include <dali/public-api/rendering/renderer.h>  
21 #include <dali-toolkit/dali-toolkit.h> 20 #include <dali-toolkit/dali-toolkit.h>
22 21
23 // INTERNAL INCLUDES 22 // INTERNAL INCLUDES
examples/contact-cards/contact-card.cpp
  View file @8b8df4b
@@ -104,7 +104,7 @@ ContactCard::ContactCard( @@ -104,7 +104,7 @@ ContactCard::ContactCard(
104 // Create a control which will be used for the background and to clip the contents 104 // Create a control which will be used for the background and to clip the contents
105 mContactCard = Control::New(); 105 mContactCard = Control::New();
106 mContactCard.SetProperty( Control::Property::BACKGROUND, 106 mContactCard.SetProperty( Control::Property::BACKGROUND,
107 - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) 107 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
108 .Add( ColorVisual::Property::MIX_COLOR, Color::WHITE ) ); 108 .Add( ColorVisual::Property::MIX_COLOR, Color::WHITE ) );
109 mContactCard.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); 109 mContactCard.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
110 mContactCard.SetParentOrigin( ParentOrigin::TOP_LEFT ); 110 mContactCard.SetParentOrigin( ParentOrigin::TOP_LEFT );
@@ -117,7 +117,7 @@ ContactCard::ContactCard( @@ -117,7 +117,7 @@ ContactCard::ContactCard(
117 mHeader = Control::New(); 117 mHeader = Control::New();
118 mHeader.SetSize( mContactCardLayoutInfo.headerSize ); 118 mHeader.SetSize( mContactCardLayoutInfo.headerSize );
119 mHeader.SetProperty( Control::Property::BACKGROUND, 119 mHeader.SetProperty( Control::Property::BACKGROUND,
120 - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) 120 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
121 .Add( ColorVisual::Property::MIX_COLOR, HEADER_COLOR ) ); 121 .Add( ColorVisual::Property::MIX_COLOR, HEADER_COLOR ) );
122 mHeader.SetParentOrigin( ParentOrigin::TOP_LEFT ); 122 mHeader.SetParentOrigin( ParentOrigin::TOP_LEFT );
123 mHeader.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 123 mHeader.SetAnchorPoint( AnchorPoint::TOP_LEFT );
examples/fpp-game/fpp-game-tutorial-controller.cpp
  View file @8b8df4b
@@ -115,7 +115,7 @@ void FppGameTutorialController::DisplayTutorial() @@ -115,7 +115,7 @@ void FppGameTutorialController::DisplayTutorial()
115 mLeftLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 115 mLeftLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
116 mLeftLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) ); 116 mLeftLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) );
117 mLeftLabel.SetProperty( Toolkit::Control::Property::BACKGROUND, 117 mLeftLabel.SetProperty( Toolkit::Control::Property::BACKGROUND,
118 - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) 118 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
119 .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.0, 0.0, 0.7, 0.2 ) ) ); 119 .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.0, 0.0, 0.7, 0.2 ) ) );
120 mLeftLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White. 120 mLeftLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
121 mLeftLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); 121 mLeftLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
@@ -128,7 +128,7 @@ void FppGameTutorialController::DisplayTutorial() @@ -128,7 +128,7 @@ void FppGameTutorialController::DisplayTutorial()
128 mRightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 128 mRightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
129 mRightLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) ); 129 mRightLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) );
130 mRightLabel.SetProperty( Toolkit::Control::Property::BACKGROUND, 130 mRightLabel.SetProperty( Toolkit::Control::Property::BACKGROUND,
131 - Property::Map().Add( Visual::Property::TYPE, Visual::COLOR ) 131 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
132 .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.5, 0.0, 0.0, 0.2 ) ) ); 132 .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.5, 0.0, 0.0, 0.2 ) ) );
133 mRightLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White. 133 mRightLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
134 mRightLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); 134 mRightLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
examples/gradients/gradients-example.cpp
  View file @8b8df4b
@@ -78,7 +78,7 @@ public: @@ -78,7 +78,7 @@ public:
78 78
79 // ---- Gradient for background 79 // ---- Gradient for background
80 80
81 - mGradientMap.Insert( Visual::Property::TYPE, Visual::GRADIENT ); 81 + mGradientMap.Insert( Toolkit::Visual::Property::TYPE, Visual::GRADIENT );
82 82
83 Property::Array stopOffsets; 83 Property::Array stopOffsets;
84 stopOffsets.PushBack( 0.0f ); 84 stopOffsets.PushBack( 0.0f );
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -22,8 +22,6 @@ @@ -22,8 +22,6 @@
22 #include <iostream> 22 #include <iostream>
23 23
24 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 24 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
25 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
26 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
27 25
28 using namespace Dali; 26 using namespace Dali;
29 using Dali::Toolkit::TextLabel; 27 using Dali::Toolkit::TextLabel;
@@ -323,7 +321,7 @@ public: @@ -323,7 +321,7 @@ public:
323 else 321 else
324 { 322 {
325 Property::Map map; 323 Property::Map map;
326 - map.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ). 324 + map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ).
327 Add( Toolkit::TextVisual::Property::TEXT, DEMO_APPS_NAMES[currentIconIndex] ). 325 Add( Toolkit::TextVisual::Property::TEXT, DEMO_APPS_NAMES[currentIconIndex] ).
328 Add( Toolkit::TextVisual::Property::TEXT_COLOR, Color::WHITE ). 326 Add( Toolkit::TextVisual::Property::TEXT_COLOR, Color::WHITE ).
329 Add( Toolkit::TextVisual::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f ). 327 Add( Toolkit::TextVisual::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f ) / dpi.y ) * 0.25f ).
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 #include <dali/dali.h> 18 #include <dali/dali.h>
19 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
20 #include <dali-toolkit/devel-api/controls/popup/popup.h> 20 #include <dali-toolkit/devel-api/controls/popup/popup.h>
21 -#include <dali-toolkit/public-api/visuals/image-visual-properties.h>  
22 #include "shared/view.h" 21 #include "shared/view.h"
23 #include <iostream> 22 #include <iostream>
24 23
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @8b8df4b
@@ -477,7 +477,7 @@ public: @@ -477,7 +477,7 @@ public:
477 image.SetPosition( Vector3( imagePosition.x, imagePosition.y, 0 ) ); 477 image.SetPosition( Vector3( imagePosition.x, imagePosition.y, 0 ) );
478 image.SetSize( imageSize ); 478 image.SetSize( imageSize );
479 image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); 479 image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage );
480 - Toolkit::DevelControl::ResourceReadySignal( image).Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal); 480 + image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal );
481 mFittingModes[image.GetId()] = fittingMode; 481 mFittingModes[image.GetId()] = fittingMode;
482 mResourceUrls[image.GetId()] = imageSource.configuration.path; 482 mResourceUrls[image.GetId()] = imageSource.configuration.path;
483 mSizes[image.GetId()] = imageSize; 483 mSizes[image.GetId()] = imageSize;
examples/image-view-svg/image-view-svg-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -123,8 +123,8 @@ public: @@ -123,8 +123,8 @@ public:
123 mPinchGestureDetector.Attach( mStageBackground); 123 mPinchGestureDetector.Attach( mStageBackground);
124 mPinchGestureDetector.DetectedSignal().Connect(this, &ImageSvgController::OnPinch); 124 mPinchGestureDetector.DetectedSignal().Connect(this, &ImageSvgController::OnPinch);
125 125
126 - DevelActor::RaiseToTop(changeButton);  
127 - DevelActor::RaiseToTop(resetButton); 126 + changeButton.RaiseToTop();
  127 + resetButton.RaiseToTop();
128 } 128 }
129 129
130 // Callback of push button, for changing image set 130 // Callback of push button, for changing image set
examples/image-view-url/image-view-url-example.cpp
  View file @8b8df4b
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
20 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
21 #include <dali-toolkit/devel-api/image-loader/texture-manager.h> 20 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
22 21
23 #include "shared/view.h" 22 #include "shared/view.h"
@@ -116,7 +115,7 @@ private: @@ -116,7 +115,7 @@ private:
116 Property::Map customShader; 115 Property::Map customShader;
117 customShader[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = FILTER_FRAGMENT_SOURCE; 116 customShader[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = FILTER_FRAGMENT_SOURCE;
118 Property::Map visualMap; 117 Property::Map visualMap;
119 - visualMap.Insert(Toolkit::DevelVisual::Property::SHADER, customShader); 118 + visualMap.Insert(Toolkit::Visual::Property::SHADER, customShader);
120 mActorForInput.SetProperty(Toolkit::ImageView::Property::IMAGE, visualMap); 119 mActorForInput.SetProperty(Toolkit::ImageView::Property::IMAGE, visualMap);
121 120
122 mDeltaPropertyIndex = mActorForInput.RegisterProperty(DELTA_UNIFORM_NAME, 0.f); 121 mDeltaPropertyIndex = mActorForInput.RegisterProperty(DELTA_UNIFORM_NAME, 0.f);
examples/image-view/image-view-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2015 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
19 #include "shared/view.h" 19 #include "shared/view.h"
20 #include <dali/dali.h> 20 #include <dali/dali.h>
21 #include <dali-toolkit/dali-toolkit.h> 21 #include <dali-toolkit/dali-toolkit.h>
22 -#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>  
23 22
24 using namespace Dali; 23 using namespace Dali;
25 24
examples/item-view/item-view-example.cpp
  View file @8b8df4b
@@ -879,7 +879,7 @@ public: // From ItemFactory @@ -879,7 +879,7 @@ public: // From ItemFactory
879 borderActor.SetColorMode( USE_PARENT_COLOR ); 879 borderActor.SetColorMode( USE_PARENT_COLOR );
880 880
881 Property::Map borderProperty; 881 Property::Map borderProperty;
882 - borderProperty.Insert( Visual::Property::TYPE, Visual::BORDER ); 882 + borderProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
883 borderProperty.Insert( BorderVisual::Property::COLOR, Color::WHITE ); 883 borderProperty.Insert( BorderVisual::Property::COLOR, Color::WHITE );
884 borderProperty.Insert( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE ); 884 borderProperty.Insert( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE );
885 borderProperty.Insert( BorderVisual::Property::ANTI_ALIASING, true ); 885 borderProperty.Insert( BorderVisual::Property::ANTI_ALIASING, true );
@@ -903,7 +903,7 @@ public: // From ItemFactory @@ -903,7 +903,7 @@ public: // From ItemFactory
903 checkbox.SetZ( 0.1f ); 903 checkbox.SetZ( 0.1f );
904 904
905 Property::Map solidColorProperty; 905 Property::Map solidColorProperty;
906 - solidColorProperty.Insert( Visual::Property::TYPE, Visual::COLOR ); 906 + solidColorProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR );
907 solidColorProperty.Insert( ColorVisual::Property::MIX_COLOR, Vector4(0.f, 0.f, 0.f, 0.6f) ); 907 solidColorProperty.Insert( ColorVisual::Property::MIX_COLOR, Vector4(0.f, 0.f, 0.f, 0.6f) );
908 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); 908 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
909 909
examples/line-mesh/line-mesh-example.cpp
  View file @8b8df4b
@@ -16,10 +16,7 @@ @@ -16,10 +16,7 @@
16 */ 16 */
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 -#include <dali/public-api/rendering/renderer.h>  
20 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
21 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
22 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
23 20
24 // INTERNAL INCLUDES 21 // INTERNAL INCLUDES
25 #include "shared/view.h" 22 #include "shared/view.h"
@@ -246,7 +243,7 @@ public: @@ -246,7 +243,7 @@ public:
246 243
247 radio.SetProperty( Toolkit::Button::Property::LABEL, 244 radio.SetProperty( Toolkit::Button::Property::LABEL,
248 Property::Map() 245 Property::Map()
249 - .Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) 246 + .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
250 .Add( Toolkit::TextVisual::Property::TEXT, labels[i] ) 247 .Add( Toolkit::TextVisual::Property::TEXT, labels[i] )
251 .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) ) 248 .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) )
252 ); 249 );
examples/mesh-morph/mesh-morph-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 -#include <dali/public-api/rendering/renderer.h>  
20 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
21 20
22 // INTERNAL INCLUDES 21 // INTERNAL INCLUDES
examples/mesh-sorting/mesh-sorting-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 -#include <dali/public-api/rendering/renderer.h>  
20 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
21 #include <stdio.h> 20 #include <stdio.h>
22 #include <sstream> 21 #include <sstream>
examples/mesh-visual/mesh-visual-example.cpp
  View file @8b8df4b
1 #include <dali-toolkit/dali-toolkit.h> 1 #include <dali-toolkit/dali-toolkit.h>
2 -#include <dali/public-api/object/property-map.h>  
3 -#include <dali-toolkit/devel-api/align-enums.h>  
4 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
5 2
6 using namespace Dali; 3 using namespace Dali;
7 using namespace Dali::Toolkit; 4 using namespace Dali::Toolkit;
@@ -312,7 +309,7 @@ public: @@ -312,7 +309,7 @@ public:
312 } 309 }
313 310
314 Property::Map lightMap; 311 Property::Map lightMap;
315 - lightMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); 312 + lightMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
316 lightMap.Insert( ImageVisual::Property::URL, imageUrl ); 313 lightMap.Insert( ImageVisual::Property::URL, imageUrl );
317 mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) ); 314 mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) );
318 } 315 }
@@ -322,10 +319,10 @@ public: @@ -322,10 +319,10 @@ public:
322 { 319 {
323 //Create mesh property map 320 //Create mesh property map
324 Property::Map map; 321 Property::Map map;
325 - map.Insert( Visual::Property::TYPE, Visual::MESH );  
326 - map.Insert( DevelVisual::Property::TRANSFORM,  
327 - Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER )  
328 - .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER ) ); 322 + map.Insert( Toolkit::Visual::Property::TYPE, Visual::MESH );
  323 + map.Insert( Visual::Property::TRANSFORM,
  324 + Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER )
  325 + .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER ) );
329 map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] ); 326 map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] );
330 map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] ); 327 map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] );
331 map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH ); 328 map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH );
examples/native-image-source/native-image-source-example.cpp
  View file @8b8df4b
@@ -18,8 +18,6 @@ @@ -18,8 +18,6 @@
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 #include <dali/dali.h> 19 #include <dali/dali.h>
20 #include <dali/devel-api/images/native-image-interface-extension.h> 20 #include <dali/devel-api/images/native-image-interface-extension.h>
21 -#include <dali/public-api/rendering/renderer.h>  
22 -#include <dali/public-api/rendering/frame-buffer.h>  
23 #include <dali-toolkit/dali-toolkit.h> 21 #include <dali-toolkit/dali-toolkit.h>
24 #include <cstring> 22 #include <cstring>
25 23
examples/perf-scroll/perf-scroll.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 * 15 *
16 */ 16 */
17 17
18 -#include <dali/public-api/rendering/renderer.h>  
19 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
20 19
21 #include "shared/utility.h" 20 #include "shared/utility.h"
examples/pivot/pivot-example.cpp
  View file @8b8df4b
@@ -116,7 +116,7 @@ private: @@ -116,7 +116,7 @@ private:
116 void OnTap( Actor actor, const TapGesture& /* tap */ ) 116 void OnTap( Actor actor, const TapGesture& /* tap */ )
117 { 117 {
118 // Raise the actor to the top. 118 // Raise the actor to the top.
119 - DevelActor::RaiseToTop( actor ); 119 + actor.RaiseToTop();
120 120
121 // Create the animation to rotate and scale our actor. 121 // Create the animation to rotate and scale our actor.
122 Animation animation = Animation::New( 1.0f ); 122 Animation animation = Animation::New( 1.0f );
examples/point-mesh/point-mesh-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 -#include <dali/public-api/rendering/renderer.h>  
20 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
21 20
22 // INTERNAL INCLUDES 21 // INTERNAL INCLUDES
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @8b8df4b
@@ -16,11 +16,7 @@ @@ -16,11 +16,7 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali/public-api/object/property-map.h>  
20 -#include <dali-toolkit/devel-api/align-enums.h>  
21 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 19 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
22 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
23 -#include <dali-toolkit/public-api/controls/slider/slider.h>  
24 20
25 using namespace Dali; 21 using namespace Dali;
26 using namespace Dali::Toolkit; 22 using namespace Dali::Toolkit;
@@ -355,11 +351,11 @@ public: @@ -355,11 +351,11 @@ public:
355 351
356 //Visual map for model 352 //Visual map for model
357 mVisualMap.Clear(); 353 mVisualMap.Clear();
358 - mVisualMap[ Visual::Property::TYPE ] = Visual::PRIMITIVE; 354 + mVisualMap[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
359 mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor; 355 mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor;
360 - mVisualMap[ DevelVisual::Property::TRANSFORM ] =  
361 - Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER )  
362 - .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER ); 356 + mVisualMap[ Visual::Property::TRANSFORM ] =
  357 + Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER )
  358 + .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER );
363 } 359 }
364 360
365 //Sets the 3D model to a sphere and modifies the sliders appropriately. 361 //Sets the 3D model to a sphere and modifies the sliders appropriately.
examples/progress-bar/progress-bar-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 #include "shared/view.h" 18 #include "shared/view.h"
19 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
20 -#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>  
21 20
22 using namespace Dali; 21 using namespace Dali;
23 using namespace Dali::Toolkit; 22 using namespace Dali::Toolkit;
examples/property-notification/property-notification-example.cpp
  View file @8b8df4b
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 #include <dali/devel-api/actors/actor-devel.h> 18 #include <dali/devel-api/actors/actor-devel.h>
19 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
20 -#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>  
21 20
22 using namespace Dali; 21 using namespace Dali;
23 using namespace Dali::Toolkit; 22 using namespace Dali::Toolkit;
@@ -68,16 +67,16 @@ public: @@ -68,16 +67,16 @@ public:
68 mTextLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); 67 mTextLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
69 mTextLabel.SetProperty( TextLabel::Property::MULTI_LINE, true ); 68 mTextLabel.SetProperty( TextLabel::Property::MULTI_LINE, true );
70 mTextLabel.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); 69 mTextLabel.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
71 - mTextLabel.SetProperty( DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE, Color::BLACK ); 70 + mTextLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLACK );
72 stage.Add( mTextLabel ); 71 stage.Add( mTextLabel );
73 72
74 // Create an animation and animate the text color to red 73 // Create an animation and animate the text color to red
75 Animation animation = Animation::New( COLOR_ANIMATION_DURATION ); 74 Animation animation = Animation::New( COLOR_ANIMATION_DURATION );
76 - animation.AnimateTo( Property( mTextLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::RED ); 75 + animation.AnimateTo( Property( mTextLabel, TextLabel::Property::TEXT_COLOR ), Color::RED );
77 animation.Play(); 76 animation.Play();
78 77
79 // Set up a property notification so we are notified when the red component of the text-color reaches 50% 78 // Set up a property notification so we are notified when the red component of the text-color reaches 50%
80 - PropertyNotification notification = mTextLabel.AddPropertyNotification( DevelTextLabel::Property::TEXT_COLOR_RED, GreaterThanCondition( 0.5f ) ); 79 + PropertyNotification notification = mTextLabel.AddPropertyNotification( TextLabel::Property::TEXT_COLOR_RED, GreaterThanCondition( 0.5f ) );
81 notification.NotifySignal().Connect( this, &PropertyNotificationController::RedComponentNotification ); 80 notification.NotifySignal().Connect( this, &PropertyNotificationController::RedComponentNotification );
82 } 81 }
83 82
examples/refraction-effect/refraction-effect-example.cpp
  View file @8b8df4b
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 #include <dali/dali.h> 19 #include <dali/dali.h>
20 -#include <dali/public-api/rendering/renderer.h>  
21 #include <dali-toolkit/dali-toolkit.h> 20 #include <dali-toolkit/dali-toolkit.h>
22 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 21 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
23 22
examples/rendering-basic-pbr/ktx-loader.cpp
  View file @8b8df4b
@@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
19 #include "ktx-loader.h" 19 #include "ktx-loader.h"
20 20
21 // EXTERNAL INCLUDES 21 // EXTERNAL INCLUDES
22 -#include <dali/devel-api/images/pixel-devel.h>  
23 -#include <dali/devel-api/images/pixel-data-devel.h>  
24 #include <memory.h> 22 #include <memory.h>
25 #include <stdio.h> 23 #include <stdio.h>
26 #include <stdint.h> 24 #include <stdint.h>
@@ -49,38 +47,38 @@ struct KtxFileHeader @@ -49,38 +47,38 @@ struct KtxFileHeader
49 /** 47 /**
50 * Convert KTX format to Dali::Pixel::Format 48 * Convert KTX format to Dali::Pixel::Format
51 */ 49 */
52 -bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::DevelPixel::Format& format) 50 +bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::Pixel::Format& format)
53 { 51 {
54 switch( ktxPixelFormat ) 52 switch( ktxPixelFormat )
55 { 53 {
56 case 0x93B0: // GL_COMPRESSED_RGBA_ASTC_4x4_KHR 54 case 0x93B0: // GL_COMPRESSED_RGBA_ASTC_4x4_KHR
57 { 55 {
58 - format = Dali::DevelPixel::COMPRESSED_RGBA_ASTC_4x4_KHR; 56 + format = Dali::Pixel::COMPRESSED_RGBA_ASTC_4x4_KHR;
59 break; 57 break;
60 } 58 }
61 case 0x881B:// GL_RGB16F 59 case 0x881B:// GL_RGB16F
62 { 60 {
63 - format = Dali::DevelPixel::RGB16F; 61 + format = Dali::Pixel::RGB16F;
64 break; 62 break;
65 } 63 }
66 case 0x8815: // GL_RGB32F 64 case 0x8815: // GL_RGB32F
67 { 65 {
68 - format = Dali::DevelPixel::RGB32F; 66 + format = Dali::Pixel::RGB32F;
69 break; 67 break;
70 } 68 }
71 case 0x8C3A: // GL_R11F_G11F_B10F 69 case 0x8C3A: // GL_R11F_G11F_B10F
72 { 70 {
73 - format = Dali::DevelPixel::RGB32F; 71 + format = Dali::Pixel::RGB32F;
74 break; 72 break;
75 } 73 }
76 case 0x8D7C: // GL_RGBA8UI 74 case 0x8D7C: // GL_RGBA8UI
77 { 75 {
78 - format = Dali::DevelPixel::RGBA8888; 76 + format = Dali::Pixel::RGBA8888;
79 break; 77 break;
80 } 78 }
81 case 0x8D7D: // GL_RGB8UI 79 case 0x8D7D: // GL_RGB8UI
82 { 80 {
83 - format = Dali::DevelPixel::RGB888; 81 + format = Dali::Pixel::RGB888;
84 break; 82 break;
85 } 83 }
86 default: 84 default:
@@ -162,7 +160,7 @@ bool LoadCubeMapFromKtxFile( const std::string&amp; path, CubeData&amp; cubedata ) @@ -162,7 +160,7 @@ bool LoadCubeMapFromKtxFile( const std::string&amp; path, CubeData&amp; cubedata )
162 header.pixelHeight = 1u; 160 header.pixelHeight = 1u;
163 } 161 }
164 162
165 - Dali::DevelPixel::Format daliformat = DevelPixel::RGB888; 163 + Dali::Pixel::Format daliformat = Pixel::RGB888;
166 164
167 ConvertPixelFormat(header.glInternalFormat, daliformat); 165 ConvertPixelFormat(header.glInternalFormat, daliformat);
168 166
@@ -185,7 +183,7 @@ bool LoadCubeMapFromKtxFile( const std::string&amp; path, CubeData&amp; cubedata ) @@ -185,7 +183,7 @@ bool LoadCubeMapFromKtxFile( const std::string&amp; path, CubeData&amp; cubedata )
185 memcpy(img[face],imgPointer,byteSize); 183 memcpy(img[face],imgPointer,byteSize);
186 imgSize[face] = byteSize; 184 imgSize[face] = byteSize;
187 imgPointer += byteSize; 185 imgPointer += byteSize;
188 - cubedata.img[face][mipmapLevel] = DevelPixelData::New( img[face], imgSize[face], header.pixelWidth , header.pixelHeight , daliformat, PixelData::FREE ); 186 + cubedata.img[face][mipmapLevel] = PixelData::New( img[face], imgSize[face], header.pixelWidth , header.pixelHeight , daliformat, PixelData::FREE );
189 } 187 }
190 } 188 }
191 header.pixelHeight/=2u; 189 header.pixelHeight/=2u;
examples/simple-visuals-control/my-control-impl.cpp
  View file @8b8df4b
@@ -20,12 +20,10 @@ @@ -20,12 +20,10 @@
20 20
21 // EXTERNAL INCLUDES 21 // EXTERNAL INCLUDES
22 22
23 -#include <dali/public-api/object/type-registry-helper.h>  
24 #include <dali/devel-api/scripting/enum-helper.h> 23 #include <dali/devel-api/scripting/enum-helper.h>
25 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
26 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h> 25 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
27 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 26 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
28 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
29 #include <dali-toolkit/devel-api/controls/control-devel.h> 27 #include <dali-toolkit/devel-api/controls/control-devel.h>
30 28
31 using namespace Dali; 29 using namespace Dali;
examples/simple-visuals-control/simple-visuals-application.cpp
  View file @8b8df4b
@@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
19 19
20 // EXTERNAL INCLUDES 20 // EXTERNAL INCLUDES
21 #include <dali-toolkit/dali-toolkit.h> 21 #include <dali-toolkit/dali-toolkit.h>
22 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
23 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
24 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h> 22 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
25 #include <dali/integration-api/events/touch-event-integ.h> 23 #include <dali/integration-api/events/touch-event-integ.h>
26 #include <cstdio> 24 #include <cstdio>
examples/styling/image-channel-control-impl.cpp
  View file @8b8df4b
@@ -16,14 +16,12 @@ @@ -16,14 +16,12 @@
16 16
17 #include "image-channel-control-impl.h" 17 #include "image-channel-control-impl.h"
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali/public-api/object/type-registry-helper.h>  
20 -#include <dali-toolkit/devel-api/align-enums.h>  
21 #include <dali-toolkit/devel-api/controls/control-devel.h> 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
22 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
23 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
24 21
25 #include <cstdio> 22 #include <cstdio>
26 23
  24 +
27 using namespace Dali; // Needed for macros 25 using namespace Dali; // Needed for macros
28 26
29 namespace Demo 27 namespace Demo
@@ -182,12 +180,12 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize ) @@ -182,12 +180,12 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize )
182 Vector2 size( targetSize ); 180 Vector2 size( targetSize );
183 Property::Map transformMap; 181 Property::Map transformMap;
184 transformMap 182 transformMap
185 - .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )  
186 - .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )  
187 - .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )  
188 - .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )  
189 - .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) )  
190 - .Add( Toolkit::DevelVisual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) ); 183 + .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
  184 + .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
  185 + .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
  186 + .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
  187 + .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) )
  188 + .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
191 189
192 mVisual.SetTransformAndSize( transformMap, size ); 190 mVisual.SetTransformAndSize( transformMap, size );
193 } 191 }
examples/styling/styling-application.cpp
  View file @8b8df4b
@@ -25,8 +25,6 @@ @@ -25,8 +25,6 @@
25 // External includes 25 // External includes
26 #include <dali-toolkit/dali-toolkit.h> 26 #include <dali-toolkit/dali-toolkit.h>
27 #include <dali-toolkit/devel-api/controls/popup/popup.h> 27 #include <dali-toolkit/devel-api/controls/popup/popup.h>
28 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
29 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
30 #include "image-channel-control.h" 28 #include "image-channel-control.h"
31 #include <cstdio> 29 #include <cstdio>
32 #include <sstream> 30 #include <sstream>
examples/text-editor/text-editor-example.cpp
  View file @8b8df4b
@@ -130,7 +130,7 @@ public: @@ -130,7 +130,7 @@ public:
130 // Add border to highlight harder-to-see colors. 130 // Add border to highlight harder-to-see colors.
131 // We use a color rather than border visual as the container will always be behind the button. 131 // We use a color rather than border visual as the container will always be behind the button.
132 Property::Map colorMap; 132 Property::Map colorMap;
133 - colorMap.Insert( Visual::Property::TYPE, Visual::COLOR); 133 + colorMap.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR);
134 colorMap.Insert( ColorVisual::Property::MIX_COLOR, Color::BLACK ); 134 colorMap.Insert( ColorVisual::Property::MIX_COLOR, Color::BLACK );
135 mColorContainer.SetProperty( Control::Property::BACKGROUND, colorMap ); 135 mColorContainer.SetProperty( Control::Property::BACKGROUND, colorMap );
136 136
@@ -276,7 +276,7 @@ public: @@ -276,7 +276,7 @@ public:
276 void SetButtonColor( Button& button, const Vector4& color ) 276 void SetButtonColor( Button& button, const Vector4& color )
277 { 277 {
278 Property::Map colorVisualMap; 278 Property::Map colorVisualMap;
279 - colorVisualMap.Add( Visual::Property::TYPE, Visual::COLOR ) 279 + colorVisualMap.Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
280 .Add( ColorVisual::Property::MIX_COLOR, color ); 280 .Add( ColorVisual::Property::MIX_COLOR, color );
281 281
282 button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap ); 282 button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap );
examples/text-field/text-field-example.cpp
  View file @8b8df4b
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
25 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 25 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
26 #include <dali-toolkit/devel-api/controls/popup/popup.h> 26 #include <dali-toolkit/devel-api/controls/popup/popup.h>
27 #include <iostream> 27 #include <iostream>
28 -#include <dali/public-api/events/touch-point.h>  
29 28
30 // INTERNAL INCLUDES 29 // INTERNAL INCLUDES
31 #include "shared/multi-language-strings.h" 30 #include "shared/multi-language-strings.h"
examples/text-label/text-label-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali/devel-api/object/handle-devel.h> 24 #include <dali/devel-api/object/handle-devel.h>
25 #include <dali/devel-api/actors/actor-devel.h> 25 #include <dali/devel-api/actors/actor-devel.h>
26 -#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>  
27 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 26 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
28 #include <dali-toolkit/dali-toolkit.h> 27 #include <dali-toolkit/dali-toolkit.h>
29 #include <iostream> 28 #include <iostream>
@@ -209,7 +208,7 @@ public: @@ -209,7 +208,7 @@ public:
209 mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 208 mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
210 mLabel.SetSize(mLayoutSize); 209 mLabel.SetSize(mLayoutSize);
211 mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true ); 210 mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true );
212 - mLabel.SetProperty( DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE, Color::GREEN ); 211 + mLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN );
213 mLabel.SetBackgroundColor( Color::WHITE ); 212 mLabel.SetBackgroundColor( Color::WHITE );
214 mContainer.Add( mLabel ); 213 mContainer.Add( mLabel );
215 214
@@ -231,14 +230,14 @@ public: @@ -231,14 +230,14 @@ public:
231 mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); 230 mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
232 231
233 Dali::Property::Map border; 232 Dali::Property::Map border;
234 - border.Insert( Visual::Property::TYPE, Visual::BORDER ); 233 + border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
235 border.Insert( BorderVisual::Property::COLOR, Color::WHITE ); 234 border.Insert( BorderVisual::Property::COLOR, Color::WHITE );
236 border.Insert( BorderVisual::Property::SIZE, 2.f ); 235 border.Insert( BorderVisual::Property::SIZE, 2.f );
237 mBorder.SetProperty( Control::Property::BACKGROUND, border ); 236 mBorder.SetProperty( Control::Property::BACKGROUND, border );
238 mContainer.Add( mBorder ); 237 mContainer.Add( mBorder );
239 mBorder.SetVisible(false); 238 mBorder.SetVisible(false);
240 239
241 - DevelActor::RaiseToTop(mGrabCorner); 240 + mGrabCorner.RaiseToTop();
242 241
243 mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f ); 242 mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f );
244 Renderer bgRenderer = mLabel.GetRendererAt(0); 243 Renderer bgRenderer = mLabel.GetRendererAt(0);
@@ -256,7 +255,7 @@ public: @@ -256,7 +255,7 @@ public:
256 255
257 // Animate the text color 3 times from source color to Yellow 256 // Animate the text color 3 times from source color to Yellow
258 Animation animation = Animation::New( 2.f ); 257 Animation animation = Animation::New( 2.f );
259 - animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::YELLOW, AlphaFunction::SIN ); 258 + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), Color::YELLOW, AlphaFunction::SIN );
260 animation.SetLoopCount( 3 ); 259 animation.SetLoopCount( 3 );
261 animation.Play(); 260 animation.Play();
262 261
@@ -270,7 +269,7 @@ public: @@ -270,7 +269,7 @@ public:
270 if( button == mStyleButtons[ StyleType::TEXT_COLOR ] ) 269 if( button == mStyleButtons[ StyleType::TEXT_COLOR ] )
271 { 270 {
272 Animation animation = Animation::New( 2.f ); 271 Animation animation = Animation::New( 2.f );
273 - animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), mSelectedColor, AlphaFunction::LINEAR ); 272 + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), mSelectedColor, AlphaFunction::LINEAR );
274 animation.Play(); 273 animation.Play();
275 } 274 }
276 else if( button == mStyleButtons[ StyleType::OUTLINE ] ) 275 else if( button == mStyleButtons[ StyleType::OUTLINE ] )
@@ -343,7 +342,7 @@ public: @@ -343,7 +342,7 @@ public:
343 mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap ); 342 mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap );
344 343
345 mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL, 344 mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL,
346 - Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) 345 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
347 .Add( BorderVisual::Property::COLOR, Color::WHITE ) 346 .Add( BorderVisual::Property::COLOR, Color::WHITE )
348 .Add( BorderVisual::Property::SIZE, 2.0f ) 347 .Add( BorderVisual::Property::SIZE, 2.0f )
349 .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); 348 .Add( BorderVisual::Property::ANTI_ALIASING, true ) );
@@ -463,7 +462,7 @@ public: @@ -463,7 +462,7 @@ public:
463 case KEY_A: // Animate text colour 462 case KEY_A: // Animate text colour
464 { 463 {
465 Animation animation = Animation::New( 2.f ); 464 Animation animation = Animation::New( 2.f );
466 - animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::RED, AlphaFunction::SIN ); 465 + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), Color::RED, AlphaFunction::SIN );
467 animation.SetLoopCount( 3 ); 466 animation.SetLoopCount( 3 );
468 animation.Play(); 467 animation.Play();
469 break; 468 break;
examples/text-memory-profiling/text-memory-profiling-example.cpp 0 → 100644
  View file @8b8df4b
  1 +/*
  2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +/**
  19 + * @file text-memory-profiling-example.cpp
  20 + * @brief Memory consumption profiling for TextLabel
  21 + */
  22 +
  23 +// EXTERNAL INCLUDES
  24 +#include <dali/dali.h>
  25 +#include <dali-toolkit/dali-toolkit.h>
  26 +#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
  27 +#include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h>
  28 +
  29 +// INTERNAL INCLUDES
  30 +#include "shared/view.h"
  31 +
  32 +using namespace Dali;
  33 +using namespace Dali::Toolkit;
  34 +
  35 +namespace
  36 +{
  37 +
  38 +enum TextType
  39 +{
  40 + SINGLE_COLOR_TEXT,
  41 + SINGLE_COLOR_TEXT_WITH_STYLE,
  42 + SINGLE_COLOR_TEXT_WITH_EMOJI,
  43 + SINGLE_COLOR_TEXT_WITH_STYLE_EMOJI,
  44 + MULTI_COLOR_TEXT,
  45 + MULTI_COLOR_TEXT_WITH_STYLE,
  46 + MULTI_COLOR_TEXT_WITH_EMOJI,
  47 + MULTI_COLOR_TEXT_WITH_STYLE_EMOJI,
  48 + NUMBER_OF_TYPES
  49 +};
  50 +
  51 +std::string TEXT_TYPE_STRING[ NUMBER_OF_TYPES ] =
  52 +{
  53 + "Single color text",
  54 + "Single color text with style",
  55 + "Single color text with emoji",
  56 + "Single color text with style and emoji",
  57 + "Multi color text",
  58 + "Multi color text with style",
  59 + "Multi color text with emoji",
  60 + "Multi color text with style and emoji"
  61 +};
  62 +
  63 +const int NUMBER_OF_LABELS = 500;
  64 +
  65 +const char* BACKGROUND_IMAGE( "" );
  66 +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
  67 +const char* BACK_IMAGE( DEMO_IMAGE_DIR "icon-change.png" );
  68 +const char* BACK_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" );
  69 +const char* INDICATOR_IMAGE( DEMO_IMAGE_DIR "loading.png" );
  70 +
  71 +} // anonymous namespace
  72 +
  73 +/**
  74 + * @brief The main class of the demo.
  75 + */
  76 +class TextMemoryProfilingExample : public ConnectionTracker, public Toolkit::ItemFactory
  77 +{
  78 +public:
  79 +
  80 + TextMemoryProfilingExample( Application& application )
  81 + : mApplication( application ),
  82 + mCurrentTextStyle( SINGLE_COLOR_TEXT )
  83 + {
  84 + // Connect to the Application's Init signal
  85 + mApplication.InitSignal().Connect( this, &TextMemoryProfilingExample::Create );
  86 + }
  87 +
  88 + ~TextMemoryProfilingExample()
  89 + {
  90 + // Nothing to do here.
  91 + }
  92 +
  93 + /**
  94 + * @brief Create a text label in the given type
  95 + */
  96 + TextLabel SetupTextLabel( int type )
  97 + {
  98 + TextLabel label = TextLabel::New();
  99 + label.SetAnchorPoint( ParentOrigin::TOP_LEFT );
  100 + label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
  101 + label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLACK );
  102 + label.SetProperty( TextLabel::Property::POINT_SIZE, 12.0f );
  103 + label.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::YELLOW );
  104 + label.SetProperty( TextLabel::Property::ENABLE_MARKUP, true );
  105 +
  106 + Vector2 stageSize = Stage::GetCurrent().GetSize();
  107 + label.SetPosition( Vector3( Random::Range( 0.0f, stageSize.x ), Random::Range( 0.0f, stageSize.y ), 0.0f) );
  108 +
  109 + switch ( type )
  110 + {
  111 + case SINGLE_COLOR_TEXT:
  112 + {
  113 + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" );
  114 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) );
  115 + break;
  116 + }
  117 + case SINGLE_COLOR_TEXT_WITH_STYLE:
  118 + {
  119 + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" );
  120 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) );
  121 + break;
  122 + }
  123 + case SINGLE_COLOR_TEXT_WITH_EMOJI:
  124 + {
  125 + label.SetProperty( TextLabel::Property::TEXT, "\xF0\x9F\x98\x81 A Quick Brown Fox Jumps Over The Lazy Dog" );
  126 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) );
  127 + break;
  128 + }
  129 + case SINGLE_COLOR_TEXT_WITH_STYLE_EMOJI:
  130 + {
  131 + label.SetProperty( TextLabel::Property::TEXT, "\xF0\x9F\x98\x81 A Quick Brown Fox Jumps Over The Lazy Dog" );
  132 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) );
  133 + break;
  134 + }
  135 + case MULTI_COLOR_TEXT:
  136 + {
  137 + label.SetProperty( TextLabel::Property::TEXT, "A <color value='cyan'>Quick Brown Fox</color> Jumps Over The <color value='yellow'>Lazy Dog</color>" );
  138 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) );
  139 + break;
  140 + }
  141 + case MULTI_COLOR_TEXT_WITH_STYLE:
  142 + {
  143 + label.SetProperty( TextLabel::Property::TEXT, "A <color value='cyan'>Quick Brown Fox</color> Jumps Over The <color value='yellow'>Lazy Dog</color>" );
  144 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) );
  145 + break;
  146 + }
  147 + case MULTI_COLOR_TEXT_WITH_EMOJI:
  148 + {
  149 + label.SetProperty( TextLabel::Property::TEXT, " \xF0\x9F\x98\x81 A <color value='cyan'>Quick Brown Fox</color> Jumps Over The <color value='yellow'>Lazy Dog</color>" );
  150 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) );
  151 + break;
  152 + }
  153 + case MULTI_COLOR_TEXT_WITH_STYLE_EMOJI:
  154 + {
  155 + label.SetProperty( TextLabel::Property::TEXT, " \xF0\x9F\x98\x81 A <color value='cyan'>Quick Brown Fox</color> Jumps Over The <color value='yellow'>Lazy Dog</color>" );
  156 + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) );
  157 + break;
  158 + }
  159 + default:
  160 + break;
  161 + }
  162 +
  163 + return label;
  164 + }
  165 +
  166 + /**
  167 + * @brief Create the main menu
  168 + */
  169 + void CreateMainMenu()
  170 + {
  171 + Stage stage = Stage::GetCurrent();
  172 + Vector2 stageSize = stage.GetSize();
  173 +
  174 + mTapDetector = TapGestureDetector::New();
  175 + mTapDetector.DetectedSignal().Connect( this, &TextMemoryProfilingExample::OnTap );
  176 +
  177 + // Create an item view for the main menu
  178 + mItemView = ItemView::New( *this );
  179 +
  180 + mItemView.SetParentOrigin( ParentOrigin::CENTER );
  181 + mItemView.SetAnchorPoint( AnchorPoint::CENTER );
  182 +
  183 + mLayout = DefaultItemLayout::New( DefaultItemLayout::LIST );
  184 + mLayout->SetItemSize( Vector3( stageSize.width, 60.0f, 0.0f ) );
  185 +
  186 + mItemView.AddLayout( *mLayout );
  187 +
  188 + // Activate the layout
  189 + mItemView.ActivateLayout( 0, Vector3( stageSize ), 0.0f );
  190 + }
  191 +
  192 + /**
  193 + * @brief Return the number of items in the main menu
  194 + */
  195 + virtual unsigned int GetNumberOfItems()
  196 + {
  197 + return NUMBER_OF_TYPES;
  198 + }
  199 +
  200 + /**
  201 + * @brief Create new item for the main menu
  202 + */
  203 + virtual Actor NewItem( unsigned int itemId )
  204 + {
  205 + TextLabel label = TextLabel::New( TEXT_TYPE_STRING[itemId] );
  206 + label.SetStyleName( "BuilderLabel" );
  207 + label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
  208 +
  209 + // Hook up tap detector
  210 + mTapDetector.Attach( label );
  211 +
  212 + return label;
  213 + }
  214 +
  215 + /**
  216 + * @brief Create text labels for memory profiling
  217 + */
  218 + void CreateTextLabels( int type )
  219 + {
  220 + Stage stage = Stage::GetCurrent();
  221 +
  222 + // Render tasks may have been setup last load so remove them
  223 + RenderTaskList taskList = stage.GetRenderTaskList();
  224 + if( taskList.GetTaskCount() > 1 )
  225 + {
  226 + typedef std::vector<RenderTask> Collection;
  227 + typedef Collection::iterator ColIter;
  228 + Collection tasks;
  229 +
  230 + for( unsigned int i = 1; i < taskList.GetTaskCount(); ++i )
  231 + {
  232 + tasks.push_back( taskList.GetTask(i) );
  233 + }
  234 +
  235 + for( ColIter iter = tasks.begin(); iter != tasks.end(); ++iter )
  236 + {
  237 + taskList.RemoveTask(*iter);
  238 + }
  239 +
  240 + RenderTask defaultTask = taskList.GetTask( 0 );
  241 + defaultTask.SetSourceActor( stage.GetRootLayer() );
  242 + defaultTask.SetTargetFrameBuffer( FrameBufferImage() );
  243 + }
  244 +
  245 + // Delete any existing text labels
  246 + unsigned int numChildren = mLayer.GetChildCount();
  247 +
  248 + for( unsigned int i = 0; i < numChildren; ++i )
  249 + {
  250 + mLayer.Remove( mLayer.GetChildAt( 0 ) );
  251 + }
  252 +
  253 + mLayer.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
  254 + mLayer.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
  255 + mLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
  256 + mLayer.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::HEIGHT );
  257 + mLayer.SetSizeModeFactor( Vector3( 0.0f, -DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight, 0.0f ) );
  258 +
  259 + mNavigationView.Push( mLayer );
  260 +
  261 + // Create new text labels
  262 + for ( int i = 0; i < NUMBER_OF_LABELS; i++ )
  263 + {
  264 + TextLabel label = SetupTextLabel( type );
  265 + mLayer.Add( label );
  266 + }
  267 +
  268 + mTitle.SetProperty( TextLabel::Property::TEXT, "Run memps on target" );
  269 + }
  270 +
  271 + /**
  272 + * @brief One-time setup in response to Application InitSignal.
  273 + */
  274 + void Create( Application& application )
  275 + {
  276 + Stage stage = Stage::GetCurrent();
  277 +
  278 + stage.KeyEventSignal().Connect(this, &TextMemoryProfilingExample::OnKeyEvent);
  279 +
  280 + Layer contents = DemoHelper::CreateView( mApplication,
  281 + mView,
  282 + mToolBar,
  283 + BACKGROUND_IMAGE,
  284 + TOOLBAR_IMAGE,
  285 + "" );
  286 +
  287 + mTitle = DemoHelper::CreateToolBarLabel( "" );
  288 + mTitle.SetProperty( TextLabel::Property::TEXT, "Select the type of text" );
  289 +
  290 + // Add title to the tool bar.
  291 + mToolBar.AddControl( mTitle, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  292 +
  293 + // Create a layer to contain dynamically created text labels
  294 + mLayer = Layer::New();
  295 +
  296 + mIndicator = Toolkit::ImageView::New(INDICATOR_IMAGE);
  297 + mIndicator.SetParentOrigin( ParentOrigin::CENTER );
  298 + mIndicator.SetAnchorPoint( AnchorPoint::CENTER );
  299 + mIndicator.SetProperty( Actor::Property::VISIBLE, false );
  300 +
  301 + // Create a back button in the left of toolbar
  302 + PushButton backButton = PushButton::New();
  303 + backButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BACK_IMAGE );
  304 + backButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BACK_IMAGE_SELECTED );
  305 + backButton.ClickedSignal().Connect( this, &TextMemoryProfilingExample::OnBackButtonPressed );
  306 + backButton.SetLeaveRequired( true );
  307 + mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  308 +
  309 + // Create a navigation view to navigate different types of text labels
  310 + mNavigationView = NavigationView::New();
  311 + mNavigationView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
  312 + mNavigationView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
  313 + mNavigationView.SetBackgroundColor( Color::WHITE );
  314 + stage.Add( mNavigationView );
  315 +
  316 + CreateMainMenu();
  317 + mNavigationView.Push( mItemView );
  318 +
  319 + mItemView.Add(mIndicator);
  320 +
  321 + PropertyNotification notification = mIndicator.AddPropertyNotification( Actor::Property::VISIBLE, GreaterThanCondition(0.01f) );
  322 + notification.NotifySignal().Connect( this, &TextMemoryProfilingExample::OnIndicatorVisible );
  323 + }
  324 +
  325 + /**
  326 + * @brief Main key event handler
  327 + */
  328 + void OnKeyEvent( const KeyEvent& event )
  329 + {
  330 + if( event.state == KeyEvent::Down )
  331 + {
  332 + if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
  333 + {
  334 + ReturnToPreviousScreen();
  335 + }
  336 + }
  337 + }
  338 +
  339 + /**
  340 + * @brief Tap gesture handler
  341 + */
  342 + void OnTap( Actor actor, const TapGesture& tap )
  343 + {
  344 + mCurrentTextStyle = mItemView.GetItemId( actor );
  345 +
  346 + // Show the loading indicator
  347 + mIndicator.SetProperty( Actor::Property::VISIBLE, true );
  348 +
  349 + if ( mAnimation )
  350 + {
  351 + mAnimation.Clear();
  352 + mAnimation.Reset();
  353 + }
  354 +
  355 + mAnimation = Animation::New( 0.8f );
  356 + mAnimation.AnimateBy( Property( mIndicator, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(180.0f) ), Vector3::ZAXIS ) );
  357 + mAnimation.SetLooping( true );
  358 + mAnimation.Play();
  359 + }
  360 +
  361 + /**
  362 + * @brief Property notification handler
  363 + */
  364 + void OnIndicatorVisible( PropertyNotification& source )
  365 + {
  366 + CreateTextLabels( mCurrentTextStyle );
  367 +
  368 + // Hide the loading indicator
  369 + mAnimation.Stop();
  370 + mIndicator.SetProperty( Actor::Property::VISIBLE, false );
  371 + }
  372 +
  373 + /**
  374 + * @brief Button signal handler
  375 + */
  376 + bool OnBackButtonPressed( Toolkit::Button button )
  377 + {
  378 + ReturnToPreviousScreen();
  379 + return true;
  380 + }
  381 +
  382 + /**
  383 + * @brief Returns to the previous screen
  384 + */
  385 + void ReturnToPreviousScreen()
  386 + {
  387 + if ( mItemView.OnStage() )
  388 + {
  389 + // Quit the application if it is in the main menu
  390 + mApplication.Quit();
  391 + }
  392 + else
  393 + {
  394 + // Return to the main menu
  395 + mNavigationView.Pop();
  396 +
  397 + mTitle.SetProperty( TextLabel::Property::TEXT, "Select type of text to test" );
  398 + }
  399 + }
  400 +
  401 +private:
  402 +
  403 + Application& mApplication;
  404 +
  405 + ItemLayoutPtr mLayout;
  406 + ItemView mItemView;
  407 + NavigationView mNavigationView;
  408 +
  409 + Control mView;
  410 + ToolBar mToolBar;
  411 + TextLabel mTitle;
  412 + ImageView mIndicator;
  413 + Animation mAnimation;
  414 +
  415 + Layer mLayer;
  416 +
  417 + TapGestureDetector mTapDetector;
  418 +
  419 + unsigned int mCurrentTextStyle;
  420 +};
  421 +
  422 +void RunTest( Application& application )
  423 +{
  424 + TextMemoryProfilingExample test( application );
  425 +
  426 + application.MainLoop();
  427 +}
  428 +
  429 +/** Entry point for Linux & Tizen applications */
  430 +int DALI_EXPORT_API main( int argc, char **argv )
  431 +{
  432 + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
  433 + RunTest( application );
  434 +
  435 + return 0;
  436 +}
examples/text-overlap/text-overlap-example.cpp
  View file @8b8df4b
@@ -113,7 +113,7 @@ void TextOverlapController::Destroy( Application&amp; app ) @@ -113,7 +113,7 @@ void TextOverlapController::Destroy( Application&amp; app )
113 bool TextOverlapController::OnClicked( Button button ) 113 bool TextOverlapController::OnClicked( Button button )
114 { 114 {
115 mTopmostLabel = 1-mTopmostLabel; // toggles between 0 and 1 115 mTopmostLabel = 1-mTopmostLabel; // toggles between 0 and 1
116 - DevelActor::RaiseToTop(mLabels[mTopmostLabel]); 116 + mLabels[mTopmostLabel].RaiseToTop();
117 return false; 117 return false;
118 } 118 }
119 119
examples/text-scrolling/text-scrolling-example.cpp
  View file @8b8df4b
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
25 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> 25 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
26 -#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>  
27 26
28 using namespace Dali; 27 using namespace Dali;
29 using namespace Dali::Toolkit; 28 using namespace Dali::Toolkit;
@@ -87,7 +86,7 @@ public: @@ -87,7 +86,7 @@ public:
87 parent.Add( box ); 86 parent.Add( box );
88 87
89 Dali::Property::Map border; 88 Dali::Property::Map border;
90 - border.Insert( Visual::Property::TYPE, Visual::BORDER ); 89 + border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
91 border.Insert( BorderVisual::Property::COLOR, Color::BLUE ); 90 border.Insert( BorderVisual::Property::COLOR, Color::BLUE );
92 border.Insert( BorderVisual::Property::SIZE, 1.f ); 91 border.Insert( BorderVisual::Property::SIZE, 1.f );
93 box.SetProperty( Control::Property::BACKGROUND, border ); 92 box.SetProperty( Control::Property::BACKGROUND, border );
@@ -190,8 +189,8 @@ public: @@ -190,8 +189,8 @@ public:
190 Toolkit::PushButton scrollRtlButton = Toolkit::PushButton::New(); 189 Toolkit::PushButton scrollRtlButton = Toolkit::PushButton::New();
191 scrollRtlButton.ClickedSignal().Connect( this, &TextScrollingExample::OnButtonClickedRtl ); 190 scrollRtlButton.ClickedSignal().Connect( this, &TextScrollingExample::OnButtonClickedRtl );
192 CreateLabel( mRtlLabel, "مرحبا بالعالم", boxD , true, scrollRtlButton ); 191 CreateLabel( mRtlLabel, "مرحبا بالعالم", boxD , true, scrollRtlButton );
193 - mRtlLabel.SetProperty(DevelTextLabel::Property::AUTO_SCROLL_STOP_MODE, DevelTextLabel::AutoScrollStopMode::IMMEDIATE );  
194 - mRtlLabel.SetProperty(DevelTextLabel::Property::AUTO_SCROLL_LOOP_DELAY, 0.3f ); 192 + mRtlLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::IMMEDIATE );
  193 + mRtlLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_DELAY, 0.3f );
195 194
196 CreateBox( "boxE", boxE, desktop, SCROLLING_BOX_SIZE ); 195 CreateBox( "boxE", boxE, desktop, SCROLLING_BOX_SIZE );
197 boxE.SetPosition( 0.0f, -100.0f, 1.0f ); 196 boxE.SetPosition( 0.0f, -100.0f, 1.0f );
@@ -201,7 +200,7 @@ public: @@ -201,7 +200,7 @@ public:
201 mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 500); 200 mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_SPEED, 500);
202 mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 500); 201 mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_GAP, 500);
203 mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3); 202 mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_LOOP_COUNT, 3);
204 - mRtlLongLabel.SetProperty(DevelTextLabel::Property::AUTO_SCROLL_STOP_MODE, DevelTextLabel::AutoScrollStopMode::FINISH_LOOP ); 203 + mRtlLongLabel.SetProperty(TextLabel::Property::AUTO_SCROLL_STOP_MODE, TextLabel::AutoScrollStopMode::FINISH_LOOP );
205 204
206 mPanGestureDetector = PanGestureDetector::New(); 205 mPanGestureDetector = PanGestureDetector::New();
207 mPanGestureDetector.DetectedSignal().Connect(this, &TextScrollingExample::OnPanGesture ); 206 mPanGestureDetector.DetectedSignal().Connect(this, &TextScrollingExample::OnPanGesture );
@@ -209,8 +208,8 @@ public: @@ -209,8 +208,8 @@ public:
209 208
210 Toolkit::PushButton colorButton = Toolkit::PushButton::New(); 209 Toolkit::PushButton colorButton = Toolkit::PushButton::New();
211 colorButton.SetProperty( Button::Property::TOGGLABLE, true ); 210 colorButton.SetProperty( Button::Property::TOGGLABLE, true );
212 - colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );  
213 - colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) ); 211 + colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
  212 + colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) );
214 colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); 213 colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
215 colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); 214 colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
216 colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); 215 colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
examples/textured-mesh/textured-mesh-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 -#include <dali/public-api/rendering/renderer.h>  
20 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
21 20
22 // INTERNAL INCLUDES 21 // INTERNAL INCLUDES
examples/tooltip/tooltip-example.cpp
  View file @8b8df4b
1 /* 1 /*
2 - * Copyright (c) 2016 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2017 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@ @@ -18,8 +18,6 @@
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 #include <dali-toolkit/devel-api/controls/control-devel.h> 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
20 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h> 20 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>
21 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
22 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
23 21
24 using namespace Dali; 22 using namespace Dali;
25 using namespace Dali::Toolkit; 23 using namespace Dali::Toolkit;
@@ -97,9 +95,9 @@ private: @@ -97,9 +95,9 @@ private:
97 Layout( customFromCode, stageSize ); 95 Layout( customFromCode, stageSize );
98 customFromCode.SetProperty( DevelControl::Property::TOOLTIP, 96 customFromCode.SetProperty( DevelControl::Property::TOOLTIP,
99 Property::Map().Add( Tooltip::Property::CONTENT, 97 Property::Map().Add( Tooltip::Property::CONTENT,
100 - Property::Array().Add( Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE ) 98 + Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
101 .Add( ImageVisual::Property::URL, DEMO_IMAGE_DIR "Logo-for-demo.png" ) ) 99 .Add( ImageVisual::Property::URL, DEMO_IMAGE_DIR "Logo-for-demo.png" ) )
102 - .Add( Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT ) 100 + .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
103 .Add( TextVisual::Property::TEXT_COLOR, Color::WHITE ) 101 .Add( TextVisual::Property::TEXT_COLOR, Color::WHITE )
104 .Add( TextVisual::Property::TEXT, "Custom coded style\nat hover point" ) 102 .Add( TextVisual::Property::TEXT, "Custom coded style\nat hover point" )
105 .Add( TextVisual::Property::MULTI_LINE, true ) 103 .Add( TextVisual::Property::MULTI_LINE, true )
@@ -140,7 +138,7 @@ private: @@ -140,7 +138,7 @@ private:
140 if( control ) 138 if( control )
141 { 139 {
142 control.SetProperty( Button::Property::LABEL, 140 control.SetProperty( Button::Property::LABEL,
143 - Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT ) 141 + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
144 .Add( TextVisual::Property::TEXT, label ) ); 142 .Add( TextVisual::Property::TEXT, label ) );
145 } 143 }
146 } 144 }
examples/transitions/shadow-button-impl.cpp
  View file @8b8df4b
@@ -16,11 +16,8 @@ @@ -16,11 +16,8 @@
16 16
17 #include "shadow-button-impl.h" 17 #include "shadow-button-impl.h"
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali/public-api/object/type-registry-helper.h>  
20 #include <dali/devel-api/scripting/enum-helper.h> 19 #include <dali/devel-api/scripting/enum-helper.h>
21 -#include <dali-toolkit/devel-api/align-enums.h>  
22 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
23 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
24 #include <dali-toolkit/devel-api/controls/control-devel.h> 21 #include <dali-toolkit/devel-api/controls/control-devel.h>
25 22
26 #include <cstdio> 23 #include <cstdio>
@@ -374,7 +371,7 @@ void ShadowButton::ResetVisual( @@ -374,7 +371,7 @@ void ShadowButton::ResetVisual(
374 } 371 }
375 372
376 // Extract transform maps out of the visual definition and store them 373 // Extract transform maps out of the visual definition and store them
377 - Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform"); 374 + Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform");
378 if( value ) 375 if( value )
379 { 376 {
380 Property::Map* transformMap = value->GetMap(); 377 Property::Map* transformMap = value->GetMap();
examples/transitions/transition-application.cpp
  View file @8b8df4b
@@ -25,8 +25,6 @@ @@ -25,8 +25,6 @@
25 // External includes 25 // External includes
26 #include <dali-toolkit/dali-toolkit.h> 26 #include <dali-toolkit/dali-toolkit.h>
27 #include <dali-toolkit/devel-api/controls/control-devel.h> 27 #include <dali-toolkit/devel-api/controls/control-devel.h>
28 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
29 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
30 #include "shadow-button.h" 28 #include "shadow-button.h"
31 #include <cstdio> 29 #include <cstdio>
32 #include <sstream> 30 #include <sstream>
examples/visual-transitions/beat-control-impl.cpp
  View file @8b8df4b
@@ -16,10 +16,8 @@ @@ -16,10 +16,8 @@
16 16
17 #include "beat-control-impl.h" 17 #include "beat-control-impl.h"
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali/public-api/object/type-registry-helper.h>  
20 #include <dali-toolkit/devel-api/controls/control-devel.h> 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
21 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
22 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
23 21
24 using namespace Dali; // Needed for macros 22 using namespace Dali; // Needed for macros
25 using namespace Dali::Toolkit; 23 using namespace Dali::Toolkit;
@@ -212,9 +210,9 @@ void BeatControl::RelayoutVisuals( const Vector2&amp; targetSize ) @@ -212,9 +210,9 @@ void BeatControl::RelayoutVisuals( const Vector2&amp; targetSize )
212 Property::Map transformMap; 210 Property::Map transformMap;
213 // Make the visual half the size of the control, but leave 211 // Make the visual half the size of the control, but leave
214 // origin and anchor point at center, position is relative, but Zer0 212 // origin and anchor point at center, position is relative, but Zer0
215 - transformMap[ DevelVisual::Transform::Property::SIZE ] = mTransformSize;  
216 - transformMap[ DevelVisual::Transform::Property::ORIGIN ] = mTransformOrigin;  
217 - transformMap[ DevelVisual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint; 213 + transformMap[ Visual::Transform::Property::SIZE ] = mTransformSize;
  214 + transformMap[ Visual::Transform::Property::ORIGIN ] = mTransformOrigin;
  215 + transformMap[ Visual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint;
218 mVisual.SetTransformAndSize( transformMap, size ); 216 mVisual.SetTransformAndSize( transformMap, size );
219 } 217 }
220 } 218 }
@@ -262,7 +260,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const @@ -262,7 +260,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
262 Property::Map* map = value.GetMap(); 260 Property::Map* map = value.GetMap();
263 if( map ) 261 if( map )
264 { 262 {
265 - Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform" ); 263 + Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform" );
266 if( value ) 264 if( value )
267 { 265 {
268 Property::Map* transformMap = value->GetMap(); 266 Property::Map* transformMap = value->GetMap();
@@ -272,14 +270,14 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const @@ -272,14 +270,14 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
272 // If there are more properties in the transform map, then we need to create a new visual 270 // If there are more properties in the transform map, then we need to create a new visual
273 unsigned int sizeAndPositionPropertyCount = 0; 271 unsigned int sizeAndPositionPropertyCount = 0;
274 272
275 - Property::Value* sizeValue = transformMap->Find( DevelVisual::Transform::Property::SIZE, "size" ); 273 + Property::Value* sizeValue = transformMap->Find( Visual::Transform::Property::SIZE, "size" );
276 if( sizeValue ) 274 if( sizeValue )
277 { 275 {
278 sizeValue->Get( impl.mTransformSize ); 276 sizeValue->Get( impl.mTransformSize );
279 ++sizeAndPositionPropertyCount; 277 ++sizeAndPositionPropertyCount;
280 } 278 }
281 279
282 - Property::Value* originValue = transformMap->Find( DevelVisual::Transform::Property::ORIGIN, "origin" ); 280 + Property::Value* originValue = transformMap->Find( Visual::Transform::Property::ORIGIN, "origin" );
283 if( originValue ) 281 if( originValue )
284 { 282 {
285 int intValue = 0; 283 int intValue = 0;
@@ -290,7 +288,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const @@ -290,7 +288,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
290 } 288 }
291 } 289 }
292 290
293 - Property::Value* anchorPointValue = transformMap->Find( DevelVisual::Transform::Property::ANCHOR_POINT, "anchorPoint" ); 291 + Property::Value* anchorPointValue = transformMap->Find( Visual::Transform::Property::ANCHOR_POINT, "anchorPoint" );
294 if( anchorPointValue ) 292 if( anchorPointValue )
295 { 293 {
296 int intValue = 0; 294 int intValue = 0;
examples/visual-transitions/beat-control-impl.h
  View file @8b8df4b
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
20 #include "beat-control.h" 20 #include "beat-control.h"
21 #include <dali/public-api/animation/animation.h> 21 #include <dali/public-api/animation/animation.h>
22 #include <dali-toolkit/public-api/controls/control-impl.h> 22 #include <dali-toolkit/public-api/controls/control-impl.h>
23 -#include <dali-toolkit/devel-api/align-enums.h>  
24 #include <dali-toolkit/devel-api/visual-factory/visual-base.h> 23 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
25 #include <dali-toolkit/devel-api/visual-factory/transition-data.h> 24 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
  25 +#include <dali-toolkit/public-api/align-enumerations.h>
26 26
27 namespace Demo 27 namespace Demo
28 { 28 {
examples/visual-transitions/transition-application.cpp
  View file @8b8df4b
@@ -24,8 +24,6 @@ @@ -24,8 +24,6 @@
24 24
25 // External includes 25 // External includes
26 #include <dali-toolkit/dali-toolkit.h> 26 #include <dali-toolkit/dali-toolkit.h>
27 -#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>  
28 -#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>  
29 #include "beat-control.h" 27 #include "beat-control.h"
30 #include <cstdio> 28 #include <cstdio>
31 #include <sstream> 29 #include <sstream>
@@ -101,8 +99,8 @@ void TransitionApplication::Create( Application&amp; application ) @@ -101,8 +99,8 @@ void TransitionApplication::Create( Application&amp; application )
101 mBeatControl = BeatControl::New(); 99 mBeatControl = BeatControl::New();
102 mBeatControl.SetName("BeatControl"); 100 mBeatControl.SetName("BeatControl");
103 mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map() 101 mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map()
104 - .Add( DevelVisual::Property::TRANSFORM, Property::Map()  
105 - .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) ); 102 + .Add( Visual::Property::TRANSFORM, Property::Map()
  103 + .Add( Visual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
106 104
107 mBeatControl.SetAnchorPoint( AnchorPoint::CENTER ); 105 mBeatControl.SetAnchorPoint( AnchorPoint::CENTER );
108 mBeatControl.SetParentOrigin( ParentOrigin::CENTER ); 106 mBeatControl.SetParentOrigin( ParentOrigin::CENTER );
@@ -123,8 +121,8 @@ void TransitionApplication::Create( Application&amp; application ) @@ -123,8 +121,8 @@ void TransitionApplication::Create( Application&amp; application )
123 { 121 {
124 Property::Map map; 122 Property::Map map;
125 CreateVisualMap( i, map ); 123 CreateVisualMap( i, map );
126 - map.Add( DevelVisual::Property::TRANSFORM, Property::Map()  
127 - .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) ); 124 + map.Add( Visual::Property::TRANSFORM, Property::Map()
  125 + .Add( Visual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) );
128 mVisualButtons[i] = BeatControl::New(); 126 mVisualButtons[i] = BeatControl::New();
129 mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map ); 127 mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map );
130 mVisualButtons[i].SetName("VisualButton"); 128 mVisualButtons[i].SetName("VisualButton");
@@ -176,20 +174,20 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map ) @@ -176,20 +174,20 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
176 { 174 {
177 case 0: 175 case 0:
178 { 176 {
179 - map[ Visual::Property::TYPE ] = Visual::COLOR; 177 + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
180 map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW; 178 map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW;
181 break; 179 break;
182 } 180 }
183 case 1: 181 case 1:
184 { 182 {
185 - map[ Visual::Property::TYPE ] = Visual::BORDER; 183 + map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
186 map[ BorderVisual::Property::COLOR ] = Color::GREEN; 184 map[ BorderVisual::Property::COLOR ] = Color::GREEN;
187 map[ BorderVisual::Property::SIZE ] = 5; 185 map[ BorderVisual::Property::SIZE ] = 5;
188 break; 186 break;
189 } 187 }
190 case 2: 188 case 2:
191 { 189 {
192 - map[ Visual::Property::TYPE ] = Visual::GRADIENT; 190 + map[ Toolkit::Visual::Property::TYPE ] = Visual::GRADIENT;
193 191
194 Property::Array stopOffsets; 192 Property::Array stopOffsets;
195 stopOffsets.PushBack( 0.0f ); 193 stopOffsets.PushBack( 0.0f );
@@ -212,21 +210,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map ) @@ -212,21 +210,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
212 } 210 }
213 case 3: 211 case 3:
214 { 212 {
215 - map[ Visual::Property::TYPE ] = Visual::IMAGE; 213 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
216 map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH; 214 map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH;
217 break; 215 break;
218 } 216 }
219 case 4: 217 case 4:
220 { 218 {
221 - map[ Visual::Property::TYPE ] = Visual::IMAGE; 219 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
222 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png"; 220 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png";
223 - map[ DevelVisual::Property::PREMULTIPLIED_ALPHA ] = true; 221 + map[ Visual::Property::PREMULTIPLIED_ALPHA ] = true;
224 break; 222 break;
225 } 223 }
226 224
227 case 5: 225 case 5:
228 { 226 {
229 - map[ Visual::Property::TYPE ] = Visual::MESH; 227 + map[ Toolkit::Visual::Property::TYPE ] = Visual::MESH;
230 map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH; 228 map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH;
231 map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH; 229 map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH;
232 map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR; 230 map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR;
@@ -236,7 +234,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map ) @@ -236,7 +234,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
236 234
237 case 6: 235 case 6:
238 { 236 {
239 - map[ Visual::Property::TYPE ] = Visual::PRIMITIVE; 237 + map[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
240 238
241 map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE; 239 map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE;
242 map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f; 240 map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f;
@@ -250,21 +248,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map ) @@ -250,21 +248,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
250 case 7: 248 case 7:
251 { 249 {
252 // NPatch 250 // NPatch
253 - map[ Visual::Property::TYPE ] = Visual::IMAGE; 251 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
254 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png"; 252 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png";
255 break; 253 break;
256 } 254 }
257 case 8: 255 case 8:
258 { 256 {
259 // SVG 257 // SVG
260 - map[ Visual::Property::TYPE ] = Visual::IMAGE; 258 + map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
261 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg"; 259 map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg";
262 break; 260 break;
263 } 261 }
264 262
265 case 9: 263 case 9:
266 { 264 {
267 - map[ Visual::Property::TYPE ] = DevelVisual::TEXT; 265 + map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
268 map[ TextVisual::Property::TEXT ] = "Text"; 266 map[ TextVisual::Property::TEXT ] = "Text";
269 map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN; 267 map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN;
270 map[ TextVisual::Property::POINT_SIZE ] = 10; 268 map[ TextVisual::Property::POINT_SIZE ] = 10;
@@ -273,7 +271,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map ) @@ -273,7 +271,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map&amp; map )
273 271
274 default: 272 default:
275 { 273 {
276 - map[ Visual::Property::TYPE ] = Visual::COLOR; 274 + map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
277 map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA; 275 map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA;
278 break; 276 break;
279 } 277 }
@@ -287,8 +285,8 @@ bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData&amp; @@ -287,8 +285,8 @@ bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData&amp;
287 int visual = actor.GetProperty<int>( mVisualIndex ); 285 int visual = actor.GetProperty<int>( mVisualIndex );
288 Property::Map map; 286 Property::Map map;
289 CreateVisualMap( visual, map ); 287 CreateVisualMap( visual, map );
290 - map.Add( DevelVisual::Property::TRANSFORM, Property::Map()  
291 - .Add( DevelVisual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) ); 288 + map.Add( Visual::Property::TRANSFORM, Property::Map()
  289 + .Add( Visual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
292 mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map ); 290 mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map );
293 } 291 }
294 return true; 292 return true;
packaging/com.samsung.dali-demo.spec
  View file @8b8df4b
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.2.59 5 +Version: 1.2.60
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
resources/images/loading.png 0 → 100644
View file @8b8df4b

4.88 KB
resources/po/en_GB.po
  View file @8b8df4b
@@ -151,6 +151,9 @@ msgstr &quot;Text Field&quot; @@ -151,6 +151,9 @@ msgstr &quot;Text Field&quot;
151 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 151 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
152 msgstr "Text Label" 152 msgstr "Text Label"
153 153
  154 +msgid "DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING"
  155 +msgstr "Text Memory Profiling"
  156 +
154 msgid "DALI_DEMO_STR_TITLE_TEXT_OVERLAP" 157 msgid "DALI_DEMO_STR_TITLE_TEXT_OVERLAP"
155 msgstr "Text Overlap" 158 msgstr "Text Overlap"
156 159
resources/po/en_US.po
  View file @8b8df4b
@@ -154,6 +154,9 @@ msgstr &quot;Text Field&quot; @@ -154,6 +154,9 @@ msgstr &quot;Text Field&quot;
154 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL" 154 msgid "DALI_DEMO_STR_TITLE_TEXT_LABEL"
155 msgstr "Text Label" 155 msgstr "Text Label"
156 156
  157 +msgid "DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING"
  158 +msgstr "Text Memory Profiling"
  159 +
157 msgid "DALI_DEMO_STR_TITLE_TEXT_OVERLAP" 160 msgid "DALI_DEMO_STR_TITLE_TEXT_OVERLAP"
158 msgstr "Text Overlap" 161 msgstr "Text Overlap"
159 162
shared/dali-demo-strings.h
  View file @8b8df4b
@@ -94,6 +94,7 @@ extern &quot;C&quot; @@ -94,6 +94,7 @@ extern &quot;C&quot;
94 #define DALI_DEMO_STR_TITLE_TEXT_EDITOR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_EDITOR") 94 #define DALI_DEMO_STR_TITLE_TEXT_EDITOR dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_EDITOR")
95 #define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD") 95 #define DALI_DEMO_STR_TITLE_TEXT_FIELD dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_FIELD")
96 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL") 96 #define DALI_DEMO_STR_TITLE_TEXT_LABEL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL")
  97 +#define DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING")
97 #define DALI_DEMO_STR_TITLE_TEXT_OVERLAP dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_OVERLAP") 98 #define DALI_DEMO_STR_TITLE_TEXT_OVERLAP dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_OVERLAP")
98 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE") 99 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE")
99 #define DALI_DEMO_STR_TITLE_TEXT_SCROLLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_SCROLLING") 100 #define DALI_DEMO_STR_TITLE_TEXT_SCROLLING dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_SCROLLING")
@@ -165,6 +166,7 @@ extern &quot;C&quot; @@ -165,6 +166,7 @@ extern &quot;C&quot;
165 #define DALI_DEMO_STR_TITLE_TEXT_EDITOR "Text Editor" 166 #define DALI_DEMO_STR_TITLE_TEXT_EDITOR "Text Editor"
166 #define DALI_DEMO_STR_TITLE_TEXT_FIELD "Text Field" 167 #define DALI_DEMO_STR_TITLE_TEXT_FIELD "Text Field"
167 #define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label" 168 #define DALI_DEMO_STR_TITLE_TEXT_LABEL "Text Label"
  169 +#define DALI_DEMO_STR_TITLE_TEXT_MEMORY_PROFILING "Text Memory Profiling"
168 #define DALI_DEMO_STR_TITLE_TEXT_OVERLAP "Text Overlap" 170 #define DALI_DEMO_STR_TITLE_TEXT_OVERLAP "Text Overlap"
169 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts" 171 #define DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE "Text Scripts"
170 #define DALI_DEMO_STR_TITLE_TEXT_SCROLLING "Text Scrolling" 172 #define DALI_DEMO_STR_TITLE_TEXT_SCROLLING "Text Scrolling"
shared/dali-table-view.cpp
  View file @8b8df4b
@@ -753,7 +753,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count ) @@ -753,7 +753,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count )
753 Dali::Property::Map effect = Toolkit::CreateDistanceFieldEffect(); 753 Dali::Property::Map effect = Toolkit::CreateDistanceFieldEffect();
754 Property::Map imageMap; 754 Property::Map imageMap;
755 imageMap.Add( ImageVisual::Property::URL, SHAPE_IMAGE_TABLE[ shapeType ] ); 755 imageMap.Add( ImageVisual::Property::URL, SHAPE_IMAGE_TABLE[ shapeType ] );
756 - imageMap.Add( Visual::Property::SHADER, effect ); 756 + imageMap.Add( Toolkit::Visual::Property::SHADER, effect );
757 dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap ); 757 dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
758 758
759 dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] ); 759 dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] );