Peter M. Groen / dali-demo

Commit efe1e8cade9141c629665078e5da2dc97a0e80e0

Authored by Xiangyin Ma
1 parent a6f263a7

update following the changes of the ControlRenderer property names 

Change-Id: I2aea5bcde8b3a1a4b2bebdcb9ad525ed87a9847a
Inline Side-by-side
Showing 2 changed files with 8 additions and 8 deletions
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @efe1e8c
@@ -178,11 +178,11 @@ public: @@ -178,11 +178,11 @@ public:
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( "imageUrl", BACKGROUND_IMAGE );  
182 - backgroundImage.Insert( "imageDesiredWidth", stage.GetSize().width );  
183 - backgroundImage.Insert( "imageDesiredHeight", stage.GetSize().height );  
184 - backgroundImage.Insert( "imageFittingMode", "scaleToFill" );  
185 - backgroundImage.Insert( "imageSamplingMode", "boxThenNearest" ); 181 + backgroundImage.Insert( "url", BACKGROUND_IMAGE );
  182 + backgroundImage.Insert( "desiredWidth", stage.GetSize().width );
  183 + backgroundImage.Insert( "desiredHeight", stage.GetSize().height );
  184 + backgroundImage.Insert( "fittingMode", "SCALE_TO_FILL" );
  185 + backgroundImage.Insert( "samplingMode", "BOX_THEN_NEAREST" );
186 186
187 Toolkit::ImageView background = Toolkit::ImageView::New(); 187 Toolkit::ImageView background = Toolkit::ImageView::New();
188 background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage ); 188 background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage );
resources/scripts/background.json
  View file @efe1e8c
@@ -45,8 +45,8 @@ @@ -45,8 +45,8 @@
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": "svg",  
49 - "imageUrl": "{DEMO_IMAGE_DIR}Kid1.svg" 48 + "rendererType": "image",
  49 + "url": "{DEMO_IMAGE_DIR}Kid1.svg"
50 } 50 }
51 }, 51 },
52 52
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
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 - "imageUrl": "{DEMO_IMAGE_DIR}gallery-large-9.jpg" 80 + "url": "{DEMO_IMAGE_DIR}gallery-large-9.jpg"
81 } 81 }
82 }, 82 },
83 83