Peter M. Groen / dali-demo

Commit 374a5a604d448969b042a31cfb6bc22dbe7a0b32

Authored by Adeel Kazmi
1 parent 9cfb6b89

Updates after removal of experimental API 

Change-Id: Iab968536d94de562cce7fe04940a6a327eeae803
Inline Side-by-side
Showing 4 changed files with 53 additions and 65 deletions
examples/benchmark/benchmark.cpp
  View file @374a5a6
... ... @@ -184,7 +184,6 @@ const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER(
184 184 );
185 185  
186 186 bool gUseMesh(false);
187   -bool gUseImageActor(false);
188 187 bool gNinePatch(false);
189 188 unsigned int gRowsPerPage(25);
190 189 unsigned int gColumnsPerPage( 25 );
... ... @@ -203,12 +202,11 @@ Renderer CreateRenderer( unsigned int index, Geometry geometry, Shader shader )
203 202 }
204 203  
205 204 }
206   -// Test application to compare performance between ImageActor and ImageView
  205 +// Test application to compare performance between using a mesh and ImageView
207 206 // By default, the application consist of 10 pages of 25x25 Image views, this can be modified using the following command line arguments:
208 207 // -r NumberOfRows (Modifies the number of rows per page)
209 208 // -c NumberOfColumns (Modifies the number of columns per page)
210 209 // -p NumberOfPages (Modifies the nimber of pages )
211   -// --use-image-actor ( Use ImageActor instead of ImageView )
212 210 // --use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )
213 211 // --nine-patch ( Use nine patch images )
214 212  
... ... @@ -251,10 +249,6 @@ public:
251 249 {
252 250 CreateMeshActors();
253 251 }
254   - else if( gUseImageActor )
255   - {
256   - CreateImageActors();
257   - }
258 252 else
259 253 {
260 254 CreateImageViews();
... ... @@ -275,22 +269,6 @@ public:
275 269 return !gNinePatch ? IMAGE_PATH[i % NUM_IMAGES] : NINEPATCH_IMAGE_PATH[i % NUM_NINEPATCH_IMAGES];
276 270 }
277 271  
278   - void CreateImageActors()
279   - {
280   - Stage stage = Stage::GetCurrent();
281   - unsigned int actorCount(mRowsPerPage*mColumnsPerPage * mPageCount);
282   - mActor.resize(actorCount);
283   -
284   - for( size_t i(0); i<actorCount; ++i )
285   - {
286   - Image image = ResourceImage::New(ImagePath(i));
287   - mActor[i] = ImageActor::New(image);
288   - mActor[i].SetSize(Vector3(0.0f,0.0f,0.0f));
289   - mActor[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
290   - stage.Add(mActor[i]);
291   - }
292   - }
293   -
294 272 void CreateImageViews()
295 273 {
296 274 Stage stage = Stage::GetCurrent();
... ... @@ -378,7 +356,7 @@ public:
378 356 duration = durationPerActor;
379 357 delay = delayBetweenActors * count;
380 358 }
381   - if( gUseImageActor || gUseMesh )
  359 + if( gUseMesh )
382 360 {
383 361 mActor[count].SetPosition( initialPosition );
384 362 mActor[count].SetSize( Vector3(0.0f,0.0f,0.0f) );
... ... @@ -410,7 +388,7 @@ public:
410 388 size_t actorCount( mRowsPerPage*mColumnsPerPage*mPageCount);
411 389 for( size_t i(0); i<actorCount; ++i )
412 390 {
413   - if( gUseImageActor || gUseMesh )
  391 + if( gUseMesh )
414 392 {
415 393 mScroll.AnimateBy( Property( mActor[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(0.0f,3.0f));
416 394 mScroll.AnimateBy( Property( mActor[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(3.0f,3.0f));
... ... @@ -453,7 +431,7 @@ public:
453 431 delay = delayBetweenActors * count;
454 432 }
455 433  
456   - if( gUseImageActor || gUseMesh )
  434 + if( gUseMesh )
457 435 {
458 436 mHide.AnimateTo( Property( mActor[count], Actor::Property::ORIENTATION), Quaternion( Radian( Degree( 70.0f ) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT, TimePeriod( delay, duration ));
459 437 mHide.AnimateBy( Property( mActor[count], Actor::Property::POSITION_Z), finalZ, AlphaFunction::EASE_OUT_BACK, TimePeriod( delay +delayBetweenActors*actorsPerPage + duration, duration ));
... ... @@ -507,10 +485,6 @@ int DALI_EXPORT_API main( int argc, char **argv )
507 485 {
508 486 gUseMesh = true;
509 487 }
510   - else if( arg.compare("--use-image-actor") == 0)
511   - {
512   - gUseImageActor = true;
513   - }
514 488 else if( arg.compare("--nine-patch" ) == 0)
515 489 {
516 490 gNinePatch = true;
... ...
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @374a5a6
... ... @@ -18,13 +18,13 @@
18 18 // EXTERNAL INCLUDES
19 19 #include <cstdio>
20 20 #include <string>
21   -
22   -// INTERNAL INCLUDES
23 21 #include <dali/dali.h>
24 22 #include <dali/devel-api/images/texture-set-image.h>
25 23 #include <dali/public-api/rendering/renderer.h>
26 24 #include <dali-toolkit/dali-toolkit.h>
  25 +#include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
27 26  
  27 +// INTERNAL INCLUDES
28 28 #include "shared/view.h"
29 29 #include "shared/utility.h"
30 30  
... ...
examples/new-window/new-window-example.cpp
  View file @374a5a6
... ... @@ -19,6 +19,7 @@
19 19 #include <dali/public-api/rendering/renderer.h>
20 20 #include <dali-toolkit/dali-toolkit.h>
21 21 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
  22 +#include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
22 23  
23 24 #include <cstdio>
24 25 #include <iostream>
... ...
examples/size-negotiation/size-negotiation-example.cpp
  View file @374a5a6
1 1 /*
2   - * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2016 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -72,6 +72,19 @@ const ButtonItem TABLEVIEW_BUTTON_ITEMS[] = {
72 72  
73 73 const unsigned int TABLEVIEW_BUTTON_ITEMS_COUNT = sizeof( TABLEVIEW_BUTTON_ITEMS ) / sizeof( TABLEVIEW_BUTTON_ITEMS[0] );
74 74  
  75 +
  76 +Actor CreateSolidColor( Vector4 color )
  77 +{
  78 + Toolkit::Control control = Toolkit::Control::New();
  79 +
  80 + Property::Map map;
  81 + map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR;
  82 + map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color;
  83 + control.SetProperty( Toolkit::Control::Property::BACKGROUND, map );
  84 +
  85 + return control;
  86 +}
  87 +
75 88 } // anonymous namespace
76 89  
77 90  
... ... @@ -190,7 +203,7 @@ public:
190 203 table.SetName( "TABLEVIEW_BUTTON_1CELL_ID" );
191 204 table.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
192 205  
193   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  206 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
194 207 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
195 208 table.Add( backing );
196 209  
... ... @@ -208,17 +221,17 @@ public:
208 221 table.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
209 222  
210 223 {
211   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  224 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
212 225 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
213 226 table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 0 ) );
214 227 }
215 228 {
216   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  229 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
217 230 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
218 231 table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 0 ) );
219 232 }
220 233 {
221   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  234 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
222 235 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
223 236 table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 0 ) );
224 237 }
... ... @@ -238,51 +251,51 @@ public:
238 251  
239 252 // Column 0
240 253 {
241   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  254 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
242 255 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
243 256 table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 0 ) );
244 257 }
245 258 {
246   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  259 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
247 260 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
248 261 table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 0 ) );
249 262 }
250 263 {
251   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  264 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
252 265 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
253 266 table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 0 ) );
254 267 }
255 268  
256 269 // Column 1
257 270 {
258   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) );
  271 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) );
259 272 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
260 273 table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 1 ) );
261 274 }
262 275 {
263   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
  276 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
264 277 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
265 278 table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 1 ) );
266 279 }
267 280 {
268   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 0.0f, 1.0f, 1.0f ) );
  281 + Actor backing = CreateSolidColor( Vector4( 0.0f, 0.0f, 1.0f, 1.0f ) );
269 282 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
270 283 table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 1 ) );
271 284 }
272 285  
273 286 // Column 2
274 287 {
275   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 0.0f, 0.0f, 1.0f ) );
  288 + Actor backing = CreateSolidColor( Vector4( 0.0f, 0.0f, 0.0f, 1.0f ) );
276 289 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
277 290 table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 2 ) );
278 291 }
279 292 {
280   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.5f, 0.5f, 0.5f, 1.0f ) );
  293 + Actor backing = CreateSolidColor( Vector4( 0.5f, 0.5f, 0.5f, 1.0f ) );
281 294 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
282 295 table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 2 ) );
283 296 }
284 297 {
285   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.5f, 0.0f, 1.0f ) );
  298 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.5f, 0.0f, 1.0f ) );
286 299 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
287 300 table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 2 ) );
288 301 }
... ... @@ -302,7 +315,7 @@ public:
302 315 table.SetFixedHeight( 0, 50.0f );
303 316  
304 317 {
305   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  318 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
306 319 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
307 320 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
308 321 text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
... ... @@ -314,7 +327,7 @@ public:
314 327 table.Add( backing );
315 328 }
316 329 {
317   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  330 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
318 331 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
319 332 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
320 333 text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
... ... @@ -326,7 +339,7 @@ public:
326 339 table.Add( backing );
327 340 }
328 341 {
329   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  342 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
330 343 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
331 344 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
332 345 text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
... ... @@ -354,7 +367,7 @@ public:
354 367 table.SetFixedHeight( 2, 50.0f );
355 368  
356 369 {
357   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  370 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
358 371 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
359 372 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
360 373 text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
... ... @@ -368,7 +381,7 @@ public:
368 381 table.Add( backing );
369 382 }
370 383 {
371   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  384 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
372 385 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
373 386 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
374 387 text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
... ... @@ -382,7 +395,7 @@ public:
382 395 table.Add( backing );
383 396 }
384 397 {
385   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  398 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
386 399 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
387 400 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
388 401 text.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
... ... @@ -412,7 +425,7 @@ public:
412 425 table.SetFitHeight( 2 );
413 426  
414 427 {
415   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  428 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
416 429 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
417 430 backing.SetSize( 0.0f, 100.0f );
418 431  
... ... @@ -429,7 +442,7 @@ public:
429 442 table.Add( backing );
430 443 }
431 444 {
432   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  445 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
433 446 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
434 447  
435 448 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
... ... @@ -445,7 +458,7 @@ public:
445 458 table.Add( backing );
446 459 }
447 460 {
448   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  461 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
449 462 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
450 463 backing.SetSize( 0.0f, 100.0f );
451 464  
... ... @@ -477,7 +490,7 @@ public:
477 490 table.SetFitHeight( 1 );
478 491  
479 492 {
480   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  493 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
481 494 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
482 495  
483 496 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
... ... @@ -493,7 +506,7 @@ public:
493 506 table.Add( backing );
494 507 }
495 508 {
496   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  509 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
497 510 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
498 511 backing.SetSize( 0.0f, 200.0f );
499 512  
... ... @@ -510,7 +523,7 @@ public:
510 523 table.Add( backing );
511 524 }
512 525 {
513   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  526 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
514 527 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
515 528  
516 529 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
... ... @@ -545,7 +558,7 @@ public:
545 558 table.SetFitHeight( 2 );
546 559  
547 560 {
548   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  561 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
549 562 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
550 563 backing.SetSize( 0.0f, 100.0f );
551 564  
... ... @@ -562,7 +575,7 @@ public:
562 575 table.Add( backing );
563 576 }
564 577 {
565   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
  578 + Actor backing = CreateSolidColor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
566 579 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
567 580 backing.SetSize( 0.0f, 200.0f );
568 581  
... ... @@ -579,7 +592,7 @@ public:
579 592 table.Add( backing );
580 593 }
581 594 {
582   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  595 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
583 596 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
584 597 backing.SetSize( 0.0f, 300.0f );
585 598  
... ... @@ -614,7 +627,7 @@ public:
614 627 table.SetFitHeight( 1 );
615 628  
616 629 {
617   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  630 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
618 631 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
619 632 backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
620 633 backing.SetSize( 0.0f, 100.0f );
... ... @@ -632,7 +645,7 @@ public:
632 645 table.Add( backing );
633 646 }
634 647 {
635   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  648 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
636 649 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
637 650 backing.SetSize( 0.0f, 200.0f );
638 651  
... ... @@ -667,7 +680,7 @@ public:
667 680 table.SetFitHeight( 1 );
668 681  
669 682 {
670   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
  683 + Actor backing = CreateSolidColor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
671 684 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
672 685  
673 686 Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
... ... @@ -683,7 +696,7 @@ public:
683 696 table.Add( backing );
684 697 }
685 698 {
686   - Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
  699 + Actor backing = CreateSolidColor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
687 700 backing.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
688 701 backing.SetSize( 0.0f, 200.0f );
689 702  
... ...