Peter M. Groen / dali-demo

Commit ea430be2511b493fe7f8d3fa00f2e36c1809a02c

Authored by Adeel Kazmi
1 parent ac3c02ee

Updates after Renderer Type values changed 

Change-Id: I32c2aa4576413ba56bcdac4376b491125805b0f3
Inline Side-by-side
Showing 16 changed files with 48 additions and 48 deletions
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @ea430be
@@ -91,7 +91,7 @@ Toolkit::ImageView CreateStageFillingImageView( const char * const imagePath ) @@ -91,7 +91,7 @@ Toolkit::ImageView CreateStageFillingImageView( const char * const imagePath )
91 Size stageSize = Stage::GetCurrent().GetSize(); 91 Size stageSize = Stage::GetCurrent().GetSize();
92 Toolkit::ImageView imageView = Toolkit::ImageView::New(); 92 Toolkit::ImageView imageView = Toolkit::ImageView::New();
93 Property::Map map; 93 Property::Map map;
94 - map["rendererType"] = "image"; 94 + map["rendererType"] = "IMAGE";
95 map["url"] = imagePath; 95 map["url"] = imagePath;
96 map["desiredWidth"] = stageSize.x; 96 map["desiredWidth"] = stageSize.x;
97 map["desiredHeight"] = stageSize.y; 97 map["desiredHeight"] = stageSize.y;
examples/gradients/gradients-example.cpp
  View file @ea430be
@@ -79,7 +79,7 @@ public: @@ -79,7 +79,7 @@ public:
79 79
80 // ---- Gradient for background 80 // ---- Gradient for background
81 81
82 - mGradientMap.Insert("rendererType", "gradient"); 82 + mGradientMap.Insert("rendererType", "GRADIENT");
83 83
84 Property::Array stopOffsets; 84 Property::Array stopOffsets;
85 stopOffsets.PushBack( 0.0f ); 85 stopOffsets.PushBack( 0.0f );
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @ea430be
@@ -177,7 +177,7 @@ public: @@ -177,7 +177,7 @@ public:
177 177
178 // Background image: 178 // Background image:
179 Dali::Property::Map backgroundImage; 179 Dali::Property::Map backgroundImage;
180 - backgroundImage.Insert( "rendererType", "image" ); 180 + backgroundImage.Insert( "rendererType", "IMAGE" );
181 backgroundImage.Insert( "url", BACKGROUND_IMAGE ); 181 backgroundImage.Insert( "url", BACKGROUND_IMAGE );
182 backgroundImage.Insert( "desiredWidth", stage.GetSize().width ); 182 backgroundImage.Insert( "desiredWidth", stage.GetSize().width );
183 backgroundImage.Insert( "desiredHeight", stage.GetSize().height ); 183 backgroundImage.Insert( "desiredHeight", stage.GetSize().height );
examples/item-view/item-view-example.cpp
  View file @ea430be
@@ -878,7 +878,7 @@ public: // From ItemFactory @@ -878,7 +878,7 @@ public: // From ItemFactory
878 borderActor.SetColorMode( USE_PARENT_COLOR ); 878 borderActor.SetColorMode( USE_PARENT_COLOR );
879 879
880 Property::Map borderProperty; 880 Property::Map borderProperty;
881 - borderProperty.Insert( "rendererType", "border" ); 881 + borderProperty.Insert( "rendererType", "BORDER" );
882 borderProperty.Insert( "borderColor", Color::WHITE ); 882 borderProperty.Insert( "borderColor", Color::WHITE );
883 borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE ); 883 borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE );
884 borderProperty.Insert( "antiAliasing", true ); 884 borderProperty.Insert( "antiAliasing", true );
@@ -902,7 +902,7 @@ public: // From ItemFactory @@ -902,7 +902,7 @@ public: // From ItemFactory
902 checkbox.SetZ( 0.1f ); 902 checkbox.SetZ( 0.1f );
903 903
904 Property::Map solidColorProperty; 904 Property::Map solidColorProperty;
905 - solidColorProperty.Insert( "rendererType", "color" ); 905 + solidColorProperty.Insert( "rendererType", "COLOR" );
906 solidColorProperty.Insert( "mixColor", Vector4(0.f, 0.f, 0.f, 0.6f) ); 906 solidColorProperty.Insert( "mixColor", Vector4(0.f, 0.f, 0.f, 0.6f) );
907 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); 907 checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
908 908
examples/mesh-renderer/mesh-renderer-example.cpp
  View file @ea430be
@@ -189,7 +189,7 @@ public: @@ -189,7 +189,7 @@ public:
189 { 189 {
190 //Create mesh property map 190 //Create mesh property map
191 Property::Map map; 191 Property::Map map;
192 - map.Insert( "rendererType", "mesh" ); 192 + map.Insert( "rendererType", "MESH" );
193 map.Insert( "objectUrl", MODEL_FILE[mModelIndex] ); 193 map.Insert( "objectUrl", MODEL_FILE[mModelIndex] );
194 map.Insert( "materialUrl", MATERIAL_FILE[mModelIndex] ); 194 map.Insert( "materialUrl", MATERIAL_FILE[mModelIndex] );
195 map.Insert( "texturesPath", TEXTURES_PATH ); 195 map.Insert( "texturesPath", TEXTURES_PATH );
examples/motion-blur/motion-blur-example.cpp
  View file @ea430be
@@ -103,7 +103,7 @@ const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to @@ -103,7 +103,7 @@ const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to
103 void SetImageFittedInBox( ImageView& imageView, Property::Map& shaderEffect, const char * const imagePath, int maxWidth, int maxHeight ) 103 void SetImageFittedInBox( ImageView& imageView, Property::Map& shaderEffect, const char * const imagePath, int maxWidth, int maxHeight )
104 { 104 {
105 Property::Map map; 105 Property::Map map;
106 - map["rendererType"] = "image"; 106 + map["rendererType"] = "IMAGE";
107 map["url"] = imagePath; 107 map["url"] = imagePath;
108 // Load the image nicely scaled-down to fit within the specified max width and height: 108 // Load the image nicely scaled-down to fit within the specified max width and height:
109 map["desiredWidth"] = maxWidth; 109 map["desiredWidth"] = maxWidth;
examples/scroll-view/scroll-view-example.cpp
  View file @ea430be
@@ -454,7 +454,7 @@ private: @@ -454,7 +454,7 @@ private:
454 { 454 {
455 ImageView actor = ImageView::New(); 455 ImageView actor = ImageView::New();
456 Property::Map map; 456 Property::Map map;
457 - map["rendererType"] = "image"; 457 + map["rendererType"] = "IMAGE";
458 map["url"] = filename; 458 map["url"] = filename;
459 map["desiredWidth"] = width; 459 map["desiredWidth"] = width;
460 map["desiredHeight"] = height; 460 map["desiredHeight"] = height;
examples/text-scrolling/text-scrolling-example.cpp
  View file @ea430be
@@ -77,7 +77,7 @@ public: @@ -77,7 +77,7 @@ public:
77 parent.Add( box ); 77 parent.Add( box );
78 78
79 Dali::Property::Map border; 79 Dali::Property::Map border;
80 - border.Insert( "rendererType", "border" ); 80 + border.Insert( "rendererType", "BORDER" );
81 border.Insert( "borderColor", Color::WHITE ); 81 border.Insert( "borderColor", Color::WHITE );
82 border.Insert( "borderSize", 1.f ); 82 border.Insert( "borderSize", 1.f );
83 box.SetProperty( Control::Property::BACKGROUND, border ); 83 box.SetProperty( Control::Property::BACKGROUND, border );
examples/video-view/video-view-example.cpp
  View file @ea430be
@@ -211,12 +211,12 @@ class VideoViewController: public ConnectionTracker @@ -211,12 +211,12 @@ class VideoViewController: public ConnectionTracker
211 211
212 Property::Map customShader; 212 Property::Map customShader;
213 customShader.Insert( "fragmentShader", FRAGMENT_SHADER ); 213 customShader.Insert( "fragmentShader", FRAGMENT_SHADER );
214 - mCustomShader.Insert( "rendererType", "image" ); 214 + mCustomShader.Insert( "rendererType", "IMAGE" );
215 mCustomShader.Insert( "shader", customShader ); 215 mCustomShader.Insert( "shader", customShader );
216 216
217 Property::Map defaultShader; 217 Property::Map defaultShader;
218 customShader.Insert( "fragmentShader", DEFAULT_FRAGMENT_SHADER ); 218 customShader.Insert( "fragmentShader", DEFAULT_FRAGMENT_SHADER );
219 - mDefaultShader.Insert( "rendererType", "image" ); 219 + mDefaultShader.Insert( "rendererType", "IMAGE" );
220 mDefaultShader.Insert( "shader", defaultShader ); 220 mDefaultShader.Insert( "shader", defaultShader );
221 221
222 mWindowSurfaceTarget.Insert( "RENDERING_TARGET", "windowSurfaceTarget" ); 222 mWindowSurfaceTarget.Insert( "RENDERING_TARGET", "windowSurfaceTarget" );
resources/scripts/animated-colors.json
  View file @ea430be
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 "heightResizePolicy":"FILL_TO_PARENT", 42 "heightResizePolicy":"FILL_TO_PARENT",
43 "sizeAspectRatio": false, 43 "sizeAspectRatio": false,
44 "background": { 44 "background": {
45 - "rendererType": "color", 45 + "rendererType": "COLOR",
46 "mixColor": [1,1,1,1] 46 "mixColor": [1,1,1,1]
47 }, 47 },
48 "color": [ 48 "color": [
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 "heightResizePolicy":"FILL_TO_PARENT", 78 "heightResizePolicy":"FILL_TO_PARENT",
79 "sizeAspectRatio": false, 79 "sizeAspectRatio": false,
80 "background": { 80 "background": {
81 - "rendererType": "color", 81 + "rendererType": "COLOR",
82 "mixColor": [1,1,1,1] 82 "mixColor": [1,1,1,1]
83 }, 83 },
84 "color": [ 84 "color": [
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 "heightResizePolicy":"FILL_TO_PARENT", 114 "heightResizePolicy":"FILL_TO_PARENT",
115 "sizeAspectRatio": false, 115 "sizeAspectRatio": false,
116 "background": { 116 "background": {
117 - "rendererType": "color", 117 + "rendererType": "COLOR",
118 "mixColor": [1,1,1,1] 118 "mixColor": [1,1,1,1]
119 }, 119 },
120 "color": [ 120 "color": [
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
146 "heightResizePolicy":"FILL_TO_PARENT", 146 "heightResizePolicy":"FILL_TO_PARENT",
147 "sizeAspectRatio": false, 147 "sizeAspectRatio": false,
148 "background": { 148 "background": {
149 - "rendererType": "color", 149 + "rendererType": "COLOR",
150 "mixColor": [1,1,1,1] 150 "mixColor": [1,1,1,1]
151 }, 151 },
152 "color": [ 152 "color": [
@@ -182,7 +182,7 @@ @@ -182,7 +182,7 @@
182 "heightResizePolicy":"FILL_TO_PARENT", 182 "heightResizePolicy":"FILL_TO_PARENT",
183 "sizeAspectRatio": false, 183 "sizeAspectRatio": false,
184 "background": { 184 "background": {
185 - "rendererType": "color", 185 + "rendererType": "COLOR",
186 "mixColor": [1,1,1,1] 186 "mixColor": [1,1,1,1]
187 }, 187 },
188 "color": [ 188 "color": [
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
218 "heightResizePolicy":"FILL_TO_PARENT", 218 "heightResizePolicy":"FILL_TO_PARENT",
219 "sizeAspectRatio": false, 219 "sizeAspectRatio": false,
220 "background": { 220 "background": {
221 - "rendererType": "color", 221 + "rendererType": "COLOR",
222 "mixColor": [1,1,1,1] 222 "mixColor": [1,1,1,1]
223 }, 223 },
224 "color": [ 224 "color": [
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
250 "heightResizePolicy":"FILL_TO_PARENT", 250 "heightResizePolicy":"FILL_TO_PARENT",
251 "sizeAspectRatio": false, 251 "sizeAspectRatio": false,
252 "background": { 252 "background": {
253 - "rendererType": "color", 253 + "rendererType": "COLOR",
254 "mixColor": [1,1,1,1] 254 "mixColor": [1,1,1,1]
255 }, 255 },
256 "color": [ 256 "color": [
@@ -286,7 +286,7 @@ @@ -286,7 +286,7 @@
286 "heightResizePolicy":"FILL_TO_PARENT", 286 "heightResizePolicy":"FILL_TO_PARENT",
287 "sizeAspectRatio": false, 287 "sizeAspectRatio": false,
288 "background": { 288 "background": {
289 - "rendererType": "color", 289 + "rendererType": "COLOR",
290 "mixColor": [1,1,1,1] 290 "mixColor": [1,1,1,1]
291 }, 291 },
292 "color": [ 292 "color": [
@@ -322,7 +322,7 @@ @@ -322,7 +322,7 @@
322 "heightResizePolicy":"FILL_TO_PARENT", 322 "heightResizePolicy":"FILL_TO_PARENT",
323 "sizeAspectRatio": false, 323 "sizeAspectRatio": false,
324 "background": { 324 "background": {
325 - "rendererType": "color", 325 + "rendererType": "COLOR",
326 "mixColor": [1,1,1,1] 326 "mixColor": [1,1,1,1]
327 }, 327 },
328 "color": [ 328 "color": [
@@ -354,7 +354,7 @@ @@ -354,7 +354,7 @@
354 "heightResizePolicy":"FILL_TO_PARENT", 354 "heightResizePolicy":"FILL_TO_PARENT",
355 "sizeAspectRatio": false, 355 "sizeAspectRatio": false,
356 "background": { 356 "background": {
357 - "rendererType": "color", 357 + "rendererType": "COLOR",
358 "mixColor": [1,1,1,1] 358 "mixColor": [1,1,1,1]
359 }, 359 },
360 "color": [ 360 "color": [
@@ -386,7 +386,7 @@ @@ -386,7 +386,7 @@
386 "heightResizePolicy":"FILL_TO_PARENT", 386 "heightResizePolicy":"FILL_TO_PARENT",
387 "sizeAspectRatio": false, 387 "sizeAspectRatio": false,
388 "background": { 388 "background": {
389 - "rendererType": "color", 389 + "rendererType": "COLOR",
390 "mixColor": [1,1,1,1] 390 "mixColor": [1,1,1,1]
391 }, 391 },
392 "color": [ 392 "color": [
@@ -418,7 +418,7 @@ @@ -418,7 +418,7 @@
418 "heightResizePolicy":"FILL_TO_PARENT", 418 "heightResizePolicy":"FILL_TO_PARENT",
419 "sizeAspectRatio": false, 419 "sizeAspectRatio": false,
420 "background": { 420 "background": {
421 - "rendererType": "color", 421 + "rendererType": "COLOR",
422 "mixColor": [1,1,1,1] 422 "mixColor": [1,1,1,1]
423 }, 423 },
424 "color": [ 424 "color": [
@@ -450,7 +450,7 @@ @@ -450,7 +450,7 @@
450 "heightResizePolicy":"FILL_TO_PARENT", 450 "heightResizePolicy":"FILL_TO_PARENT",
451 "sizeAspectRatio": false, 451 "sizeAspectRatio": false,
452 "background": { 452 "background": {
453 - "rendererType": "color", 453 + "rendererType": "COLOR",
454 "mixColor": [1,1,1,1] 454 "mixColor": [1,1,1,1]
455 }, 455 },
456 "color": [ 456 "color": [
@@ -486,7 +486,7 @@ @@ -486,7 +486,7 @@
486 "heightResizePolicy":"FILL_TO_PARENT", 486 "heightResizePolicy":"FILL_TO_PARENT",
487 "sizeAspectRatio": false, 487 "sizeAspectRatio": false,
488 "background": { 488 "background": {
489 - "rendererType": "color", 489 + "rendererType": "COLOR",
490 "mixColor": [1,1,1,1] 490 "mixColor": [1,1,1,1]
491 }, 491 },
492 "color": [ 492 "color": [
@@ -518,7 +518,7 @@ @@ -518,7 +518,7 @@
518 "heightResizePolicy":"FILL_TO_PARENT", 518 "heightResizePolicy":"FILL_TO_PARENT",
519 "sizeAspectRatio": false, 519 "sizeAspectRatio": false,
520 "background": { 520 "background": {
521 - "rendererType": "color", 521 + "rendererType": "COLOR",
522 "mixColor": [1,1,1,1] 522 "mixColor": [1,1,1,1]
523 }, 523 },
524 "color": [ 524 "color": [
@@ -557,7 +557,7 @@ @@ -557,7 +557,7 @@
557 "heightResizePolicy":"FILL_TO_PARENT", 557 "heightResizePolicy":"FILL_TO_PARENT",
558 "sizeAspectRatio": false, 558 "sizeAspectRatio": false,
559 "background": { 559 "background": {
560 - "rendererType": "color", 560 + "rendererType": "COLOR",
561 "mixColor": [1,1,1,1] 561 "mixColor": [1,1,1,1]
562 }, 562 },
563 "color": [ 563 "color": [
@@ -589,7 +589,7 @@ @@ -589,7 +589,7 @@
589 "heightResizePolicy":"FILL_TO_PARENT", 589 "heightResizePolicy":"FILL_TO_PARENT",
590 "sizeAspectRatio": false, 590 "sizeAspectRatio": false,
591 "background": { 591 "background": {
592 - "rendererType": "color", 592 + "rendererType": "COLOR",
593 "mixColor": [1,1,1,1] 593 "mixColor": [1,1,1,1]
594 }, 594 },
595 "color": [ 595 "color": [
@@ -622,7 +622,7 @@ @@ -622,7 +622,7 @@
622 "heightResizePolicy":"FILL_TO_PARENT", 622 "heightResizePolicy":"FILL_TO_PARENT",
623 "sizeAspectRatio": false, 623 "sizeAspectRatio": false,
624 "background": { 624 "background": {
625 - "rendererType": "color", 625 + "rendererType": "COLOR",
626 "mixColor": [1,1,1,1] 626 "mixColor": [1,1,1,1]
627 }, 627 },
628 "color": [ 628 "color": [
@@ -661,7 +661,7 @@ @@ -661,7 +661,7 @@
661 "heightResizePolicy":"FILL_TO_PARENT", 661 "heightResizePolicy":"FILL_TO_PARENT",
662 "sizeAspectRatio": false, 662 "sizeAspectRatio": false,
663 "background": { 663 "background": {
664 - "rendererType": "color", 664 + "rendererType": "COLOR",
665 "mixColor": [1,1,1,1] 665 "mixColor": [1,1,1,1]
666 }, 666 },
667 "color": [ 667 "color": [
@@ -693,7 +693,7 @@ @@ -693,7 +693,7 @@
693 "heightResizePolicy":"FILL_TO_PARENT", 693 "heightResizePolicy":"FILL_TO_PARENT",
694 "sizeAspectRatio": false, 694 "sizeAspectRatio": false,
695 "background": { 695 "background": {
696 - "rendererType": "color", 696 + "rendererType": "COLOR",
697 "mixColor": [1,1,1,1] 697 "mixColor": [1,1,1,1]
698 }, 698 },
699 "color": [ 699 "color": [
@@ -726,7 +726,7 @@ @@ -726,7 +726,7 @@
726 "heightResizePolicy":"FILL_TO_PARENT", 726 "heightResizePolicy":"FILL_TO_PARENT",
727 "sizeAspectRatio": false, 727 "sizeAspectRatio": false,
728 "background": { 728 "background": {
729 - "rendererType": "color", 729 + "rendererType": "COLOR",
730 "mixColor": [1,1,1,1] 730 "mixColor": [1,1,1,1]
731 }, 731 },
732 "color": [ 732 "color": [
@@ -758,7 +758,7 @@ @@ -758,7 +758,7 @@
758 "heightResizePolicy":"FILL_TO_PARENT", 758 "heightResizePolicy":"FILL_TO_PARENT",
759 "sizeAspectRatio": false, 759 "sizeAspectRatio": false,
760 "background": { 760 "background": {
761 - "rendererType": "color", 761 + "rendererType": "COLOR",
762 "mixColor": [1,1,1,1] 762 "mixColor": [1,1,1,1]
763 }, 763 },
764 "color": [ 764 "color": [
@@ -790,7 +790,7 @@ @@ -790,7 +790,7 @@
790 "heightResizePolicy":"FILL_TO_PARENT", 790 "heightResizePolicy":"FILL_TO_PARENT",
791 "sizeAspectRatio": false, 791 "sizeAspectRatio": false,
792 "background": { 792 "background": {
793 - "rendererType": "color", 793 + "rendererType": "COLOR",
794 "mixColor": [1,1,1,1] 794 "mixColor": [1,1,1,1]
795 }, 795 },
796 "color": [ 796 "color": [
@@ -823,7 +823,7 @@ @@ -823,7 +823,7 @@
823 "sizeModeFactor": [0.25,0.166667,1], 823 "sizeModeFactor": [0.25,0.166667,1],
824 "sizeAspectRatio": false, 824 "sizeAspectRatio": false,
825 "background": { 825 "background": {
826 - "rendererType": "color", 826 + "rendererType": "COLOR",
827 "mixColor": [1,1,1,1] 827 "mixColor": [1,1,1,1]
828 }, 828 },
829 "color": [ 829 "color": [
resources/scripts/background.json
  View file @ea430be
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 30 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
31 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 31 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
32 "background":{ 32 "background":{
33 - "rendererType": "color", 33 + "rendererType": "COLOR",
34 "mixColor": [ 0.8, 0, 0.2, 1 ] 34 "mixColor": [ 0.8, 0, 0.2, 1 ]
35 } 35 }
36 }, 36 },
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 45 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
46 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 46 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
47 "background": { 47 "background": {
48 - "rendererType": "image", 48 + "rendererType": "IMAGE",
49 "url": "{DEMO_IMAGE_DIR}Kid1.svg" 49 "url": "{DEMO_IMAGE_DIR}Kid1.svg"
50 } 50 }
51 }, 51 },
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 60 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
61 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 61 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
62 "background": { 62 "background": {
63 - "rendererType" : "border", 63 + "rendererType" : "BORDER",
64 "borderColor" : [ 0.5, 0.5, 0.5, 1 ], 64 "borderColor" : [ 0.5, 0.5, 0.5, 1 ],
65 "borderSize" : 15.0 65 "borderSize" : 15.0
66 } 66 }
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 76 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
77 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 77 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
78 "background": { 78 "background": {
79 - "rendererType": "image", 79 + "rendererType": "IMAGE",
80 "url": "{DEMO_IMAGE_DIR}gallery-large-9.jpg" 80 "url": "{DEMO_IMAGE_DIR}gallery-large-9.jpg"
81 } 81 }
82 }, 82 },
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 91 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
92 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 92 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
93 "background":{ 93 "background":{
94 - "rendererType": "color", 94 + "rendererType": "COLOR",
95 "mixColor": [ 1, 1, 0, 1 ] 95 "mixColor": [ 1, 1, 0, 1 ]
96 } 96 }
97 }, 97 },
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 106 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
107 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ], 107 "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
108 "background": { 108 "background": {
109 - "rendererType" : "gradient", 109 + "rendererType" : "GRADIENT",
110 "startPosition" : [ -0.5, -0.5 ], 110 "startPosition" : [ -0.5, -0.5 ],
111 "endPosition": [ 0.5, 0.5 ], 111 "endPosition": [ 0.5, 0.5 ],
112 "stopColor" : [ 112 "stopColor" : [
resources/scripts/clock.json
  View file @ea430be
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 "parentOrigin": [0.5, 0.5, 0.5], 8 "parentOrigin": [0.5, 0.5, 0.5],
9 "anchorPoint": [0.5, 1, 0.5], 9 "anchorPoint": [0.5, 1, 0.5],
10 "background": { 10 "background": {
11 - "rendererType": "color", 11 + "rendererType": "COLOR",
12 "mixColor": [0.71, 0, 0, 1] 12 "mixColor": [0.71, 0, 0, 1]
13 }, 13 },
14 "selected": false, 14 "selected": false,
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 "parentOrigin": [0.5, 0.5, 0.5], 27 "parentOrigin": [0.5, 0.5, 0.5],
28 "anchorPoint": [0.5, 1, 0.5], 28 "anchorPoint": [0.5, 1, 0.5],
29 "background": { 29 "background": {
30 - "rendererType": "color", 30 + "rendererType": "COLOR",
31 "mixColor": [0, 0.14200000000000013, 0.71, 0.7] 31 "mixColor": [0, 0.14200000000000013, 0.71, 0.7]
32 }, 32 },
33 "signals": [ 33 "signals": [
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 "parentOrigin": [0.5, 0.5, 0.5], 45 "parentOrigin": [0.5, 0.5, 0.5],
46 "anchorPoint": [0.5, 1, 0.5], 46 "anchorPoint": [0.5, 1, 0.5],
47 "background": { 47 "background": {
48 - "rendererType": "color", 48 + "rendererType": "COLOR",
49 "mixColor": [0.057450000000000064, 0.3, 0.0030000000000000027, 0.7] 49 "mixColor": [0.057450000000000064, 0.3, 0.0030000000000000027, 0.7]
50 }, 50 },
51 "signals": [ 51 "signals": [
resources/scripts/table-view.json
  View file @ea430be
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 "name":"simpleTable", 43 "name":"simpleTable",
44 "type":"TableView", 44 "type":"TableView",
45 "background":{ 45 "background":{
46 - "rendererType": "color", 46 + "rendererType": "COLOR",
47 "mixColor": [0.5,0.5,0,1] 47 "mixColor": [0.5,0.5,0,1]
48 }, 48 },
49 "parentOrigin": "CENTER", 49 "parentOrigin": "CENTER",
resources/style/demo-theme.json.in
  View file @ea430be
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 { 69 {
70 "background": 70 "background":
71 { 71 {
72 - "rendererType": "gradient", 72 + "rendererType": "GRADIENT",
73 "center": [240, 400], 73 "center": [240, 400],
74 "radius": 932, 74 "radius": 932,
75 "units": "USER_SPACE", 75 "units": "USER_SPACE",
resources/style/mobile/demo-theme.json.in
  View file @ea430be
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 { 82 {
83 "background": 83 "background":
84 { 84 {
85 - "rendererType": "gradient", 85 + "rendererType": "GRADIENT",
86 "center": [360, 640], 86 "center": [360, 640],
87 "radius": 1468, 87 "radius": 1468,
88 "units": "USER_SPACE", 88 "units": "USER_SPACE",
shared/view.h
  View file @ea430be
@@ -131,7 +131,7 @@ Dali::Layer CreateView( Dali::Application& application, @@ -131,7 +131,7 @@ Dali::Layer CreateView( Dali::Application& application,
131 if ( !backgroundImagePath.empty() ) 131 if ( !backgroundImagePath.empty() )
132 { 132 {
133 Dali::Property::Map map; 133 Dali::Property::Map map;
134 - map["rendererType"] = "image"; 134 + map["rendererType"] = "IMAGE";
135 map["url"] = backgroundImagePath; 135 map["url"] = backgroundImagePath;
136 map["desiredWidth"] = stage.GetSize().x; 136 map["desiredWidth"] = stage.GetSize().x;
137 map["desiredHeight"] = stage.GetSize().y; 137 map["desiredHeight"] = stage.GetSize().y;