From a0be05c8cba87108ec53fb8a14e7e57f91b27f1f Mon Sep 17 00:00:00 2001 From: Yoonsang Lee Date: Tue, 24 Mar 2015 09:43:02 +0900 Subject: [PATCH] Rename property & function for background image of Control Update for following changes in dali-toolkit: Control::Property::BACKGROUND -> Control::Property::BACKGROUND_IMAGE Control::SetBackground() -> Control::SetBackgroundImage() "background" -> "background-image" Change-Id: I4fd1f14509fd14112bfeb38d0f18128b0f61ab2b --- resources/scripts/background-color.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json index d8d97b8..30be044 100644 --- a/resources/scripts/background-color.json +++ b/resources/scripts/background-color.json @@ -41,7 +41,7 @@ "parent-origin": "CENTER", "anchor-point": "TOP_CENTER", "size": [400, 150, 1], - "background": { + "background-image": { "image": { "filename": "{DALI_IMAGE_DIR}button-background.png" } @@ -55,7 +55,7 @@ "anchor-point": "BOTTOM_CENTER", "size": [400, 150, 1], "background-color": [0, 0, 1, 1], - "background": { + "background-image": { "image": { "filename": "{DALI_IMAGE_DIR}button-background.png" } -- 2.7.4