projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Button Upgrade to use Text Visual
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
styles
/
720x1280
/
dali-toolkit-default-theme.json
diff --git
a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index
d4598f9
..
5bf3c13
100644
(file)
--- a/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@
-219,7
+219,13
@@
{
"initialAutoRepeatingDelay":2.0,
"nextAutoRepeatingDelay":0.9,
{
"initialAutoRepeatingDelay":2.0,
"nextAutoRepeatingDelay":0.9,
- "labelStrutLength":12
+ "label":
+ {
+ "visualType": "TEXT",
+ "horizontalAlignment": "CENTER",
+ "pointSize" : 15.0, // Point size must always be provided to Text Visual
+ "verticalAlignment": "CENTER"
+ }
// Note: Visuals added to Button will be used in all derived buttons unless overridden.
},
"PushButton":
// Note: Visuals added to Button will be used in all derived buttons unless overridden.
},
"PushButton":
@@
-252,22
+258,22
@@
"CheckBoxButton":
{
"styles":["Button"],
"CheckBoxButton":
{
"styles":["Button"],
- "unselected
Background
Visual":
+ "unselectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-unselected.png"
},
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-unselected.png"
},
- "selected
Background
Visual":
+ "selectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-selected.png"
},
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-selected.png"
},
- "disabledUnselected
Background
Visual":
+ "disabledUnselectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png"
},
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png"
},
- "disabledSelected
Background
Visual":
+ "disabledSelectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png"
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png"
@@
-276,22
+282,22
@@
"RadioButton":
{
"styles":["Button"],
"RadioButton":
{
"styles":["Button"],
- "unselected
Background
Visual":
+ "unselectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-unselected.png"
},
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-unselected.png"
},
- "selected
Background
Visual":
+ "selectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-selected.png"
},
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-selected.png"
},
- "disabledUnselected
Background
Visual":
+ "disabledUnselectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png"
},
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png"
},
- "disabledSelected
Background
Visual":
+ "disabledSelectedVisual":
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png"
{
"visualType": "IMAGE",
"url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png"