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
Merge "Updated control transitions to work with visual transform" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
styles
/
480x800
/
dali-toolkit-default-theme.json
diff --git
a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index
039a5df
..
431f73c
100644
(file)
--- a/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@
-109,6
+109,16
@@
{
"visualType":"TEXT",
"pointSize":8
{
"visualType":"TEXT",
"pointSize":8
+ },
+ "unselectedBackgroundVisual":
+ {
+ "visualType": "IMAGE",
+ "url": ""
+ },
+ "selectedBackgroundVisual":
+ {
+ "visualType": "IMAGE",
+ "url": ""
}
},
"TextSelectionToolbar":
}
},
"TextSelectionToolbar":
@@
-210,8
+220,7
@@
"Button":
{
"initialAutoRepeatingDelay":2.0,
"Button":
{
"initialAutoRepeatingDelay":2.0,
- "nextAutoRepeatingDelay":0.9,
- "labelStrutLength":12
+ "nextAutoRepeatingDelay":0.9
// 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":
@@
-220,6
+229,13
@@
"autoRepeating":false,
"togglable":false,
"labelPadding":[ 12.0, 12.0, 12.0, 12.0 ],
"autoRepeating":false,
"togglable":false,
"labelPadding":[ 12.0, 12.0, 12.0, 12.0 ],
+ "label":
+ {
+ "visualType": "TEXT",
+ "horizontalAlignment": "CENTER",
+ "pointSize" : 15.0, // Point size must always be provided to Text Visual
+ "verticalAlignment": "CENTER"
+ },
"unselectedBackgroundVisual":
{
"visualType": "IMAGE",
"unselectedBackgroundVisual":
{
"visualType": "IMAGE",
@@
-244,6
+260,13
@@
"CheckBoxButton":
{
"styles":["Button"],
"CheckBoxButton":
{
"styles":["Button"],
+ "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+ "label":
+ {
+ "visualType": "TEXT",
+ "pointSize" : 15.0, // Point size must always be provided to Text Visual
+ "verticalAlignment": "CENTER"
+ },
"unselectedVisual":
{
"visualType": "IMAGE",
"unselectedVisual":
{
"visualType": "IMAGE",
@@
-268,6
+291,13
@@
"RadioButton":
{
"styles":["Button"],
"RadioButton":
{
"styles":["Button"],
+ "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+ "label":
+ {
+ "visualType": "TEXT",
+ "pointSize" : 15.0, // Point size must always be provided to Text Visual
+ "verticalAlignment": "CENTER"
+ },
"unselectedVisual":
{
"visualType": "IMAGE",
"unselectedVisual":
{
"visualType": "IMAGE",