Peter M. Groen / dali-demo

Commit a0be05c8cba87108ec53fb8a14e7e57f91b27f1f

Authored by Yoonsang Lee
1 parent b5e043d0

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
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
resources/scripts/background-color.json
  View file @a0be05c
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 "parent-origin": "CENTER", 41 "parent-origin": "CENTER",
42 "anchor-point": "TOP_CENTER", 42 "anchor-point": "TOP_CENTER",
43 "size": [400, 150, 1], 43 "size": [400, 150, 1],
44 - "background": { 44 + "background-image": {
45 "image": { 45 "image": {
46 "filename": "{DALI_IMAGE_DIR}button-background.png" 46 "filename": "{DALI_IMAGE_DIR}button-background.png"
47 } 47 }
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 "anchor-point": "BOTTOM_CENTER", 55 "anchor-point": "BOTTOM_CENTER",
56 "size": [400, 150, 1], 56 "size": [400, 150, 1],
57 "background-color": [0, 0, 1, 1], 57 "background-color": [0, 0, 1, 1],
58 - "background": { 58 + "background-image": {
59 "image": { 59 "image": {
60 "filename": "{DALI_IMAGE_DIR}button-background.png" 60 "filename": "{DALI_IMAGE_DIR}button-background.png"
61 } 61 }