Peter M. Groen / dali-demo

Change-Id: Ib2dd9aba0fc63a0607c2d0da1c095650fd9ea9d4

Change-Id: I166b928a4b12881dd2a21a753151bf7dfe6ef73e

Change-Id: Ifb875f21344436e3a3f210388445af1a00eded08
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Change-Id: I399401a09e722fd85a026ffc2189e6bd090147f9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Conflicts:
	demo/dali-table-view.cpp
	examples/item-view/item-view-example.cpp
	examples/size-negotiation/size-negotiation-example.cpp
	examples/text-view/text-view-example.cpp

Change-Id: I4b9a9eb30ad190b329115ff093120ac06343e26d

Change-Id: I922f38428990ae202109a65bd711629817574d30

Change-Id: Ib6ce7c0a390be1d65546b2802da57c0042ec043c

Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823

Change-Id: I33d4a33a2b50e1d5a5debf1a2f5be5f24c97dd0a

Change-Id: I289af8a59b4b1f67fc1dbea92b0457194da6847a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I60fcc4e9a85e889fb0fe988859a42a87d83acb87

Change-Id: I8ac0787692b34882c2d98717ab778574dbdab7a0

Change-Id: I0773bbe89cca6acc654059af25897b52e3c58f9c

Change-Id: I52f3b59064ae8c1e6951132b2e3a4c38e7d4b759
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b

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

Change-Id: Idc8fc2369f01eb7cb96635d15c1600fa3c368934

Change-Id: Ie7dcdc64bf70fea8ab68af85b729fa5a9de0b652
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Usage:
Will load both JSON and JavaScript file from command line
scripting.example my-scene.json my-script.js

Change-Id: I36330b8bae84a532f57989b4087843d178d03e0b

Change-Id: Iffcdd6753c39fa83e7f68ef927339374bc0061a2

Change-Id: I8609692959d95f0ee58213d9271a014ba85fb49d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I05a17ea530a14e94040f24db332178335ce3ce52

It caused a reordering issue.

Change-Id: I79a098f31873d55cc0e2d669e88d1e4adc547704
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I2c5814f4c364e7fe1baf8da352c100529fc074ab

Change-Id: I05e4ec4191816dc247d6536d4c85b3dbe43599ef

Update for following changes in dali-toolkit:
Control::Property::BACKGROUND -> Control::Property::BACKGROUND_IMAGE
Control::SetBackground()      -> Control::SetBackgroundImage()
"background"                  -> "background-image"

Change-Id: I4fd1f14509fd14112bfeb38d0f18128b0f61ab2b

Change-Id: Ib490798b013cf1847fb867dd478a571d28e6fc73

(Until it's working on mobile)

Change-Id: I25cf304797046b68bf56a71357fedc406e08cd21

This reverts commit a6f2bba05b6db85066145ed10d882e9514f267da.

Change-Id: I7c0993c884a61cf7d906f2da64fab0677d92774b

Change-Id: Ica4f357358704c12dd69e882efcb49c6dffd233e

Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f

Change-Id: I4d107d2611cb03b218ea03e9b7e2d26b9b403127

Change-Id: Ia5d8582b8eec61517443f24e191e01662ba4a26d

Change-Id: I5f0e4ad2e2b52cd25aa8661dd95f688ac6c41a8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Conflicts:
	examples/text-view/text-view-example.cpp

Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a