-
Change-Id: Ic8bf6bcc2c19c7d919fea0de9120b0f991523f3e
-
Change-Id: I192e15bd0127e9b637234eb5525550183abfcf55
-
Change-Id: Iaaea70d0620aa122139ab40f8a00f94493677ac3
-
Fix buttons and logging examples Change-Id: I21699757ea591f73d5a09393caa01fd2b621726c
-
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: I2844fd73a4bb49389d3df8dc287785ed415d2823
-
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
-
* In both demos: set the size of the text-label control, otherwise the size negotiation sets the natural size. * In the multilanguage demo: change the parent origin and anchor point of the labels. Change-Id: I38ccd60fff826e293ee83f4aae88ab615feab1cf Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
-
Conflicts: examples/item-view/item-view-example.cpp examples/path-animation/path-animation.cpp Change-Id: I6a266274f476748bf34a97652964f501f44fe00c
-
Change-Id: I680700e541ac44ef0695250ba4083f7770361a3e
-
Conflicts: build/tizen/examples/CMakeLists.txt demo/dali-demo.cpp examples/buttons/buttons-example.cpp examples/item-view/item-view-example.cpp examples/text-view/text-view-example.cpp Change-Id: I8816d065edca8e2a3fd37cdcedda4b02735f5007