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 "Remove FrameBufferImage" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
styles
/
1920x1080
/
dali-toolkit-default-theme.json
diff --git
a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
old mode 100644
(file)
new mode 100755
(executable)
index
50f9529
..
43bd4e5
--- a/
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@
-28,6
+28,7
@@
{
"config":
{
{
"config":
{
+ "brokenImageUrl":"{DALI_IMAGE_DIR}broken.png",
"alwaysShowFocus":true,
"clearFocusOnEscape":false
},
"alwaysShowFocus":true,
"clearFocusOnEscape":false
},
@@
-65,7
+66,8
@@
"enableAutoScroll":false,
"autoScrollLoopCount":2,
"autoScrollGap":50,
"enableAutoScroll":false,
"autoScrollLoopCount":2,
"autoScrollGap":50,
- "autoScrollSpeed":80
+ "autoScrollSpeed":80,
+ "ignoreSpacesAfterText":false
},
"TextLabelFontSize0":
},
"TextLabelFontSize0":