Peter M. Groen / dali-demo

  • Changed DALI_*_DIR to DEMO_*_DIR ...
    46e6a0e9 
    Scripts, examples and demo code should not use defines from other
parts of DALi. DALI_IMAGE_DIR is defined in Dali toolkit to specify
where the toolkit images are. This is used in the default toolkit
style file to specify the locations of the toolkit images.

It must not be overridden by applications.

Updated the demo style file to utilize a configured variable to point
at the installed demo style's images.

Added an example of a demo-specific image (confirmation popup background)

Updated dali-builder to load the demo theme (Scripting example within demo
already loads it)

Change-Id: Ie43a6611a8db3fc0afc6a1cd4d9d6e48afef75e7
Signed-off-by: David Steele <david.steele@samsung.com>
    David Steele authored
     
    Browse File »
  • Merge remote-tracking branch 'origin/tizen' into new_text ...
    6ebeb640 
    Conflicts:
	demo/dali-demo.cpp
	demo/dali-table-view.cpp
	examples/builder/examples.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp
	examples/text-view/text-view-example.cpp
	shared/view.h

Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0
    Paul Wisbey authored
     
    Browse File »