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 batching." into devel/master
[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
6b3a131
..
d846c0f
100644
(file)
--- a/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@
-124,6
+124,7
@@
"TextSelectionToolbar":
{
"enableOvershoot":true,
"TextSelectionToolbar":
{
"enableOvershoot":true,
+ "enableScrollBar":true,
"scrollView":
{
"overshootAnimationSpeed":360.0,
"scrollView":
{
"overshootAnimationSpeed":360.0,
@@
-142,6
+143,12
@@
"overshootAnimationSpeed":360.0,
"overshootSize":[720.0,130.0]
},
"overshootAnimationSpeed":360.0,
"overshootSize":[720.0,130.0]
},
+ "ScrollBar":
+ {
+ "indicatorShowDuration":0.25,
+ "indicatorHideDuration":0.25,
+ "color":[0.0,0.72,0.9,0.7]
+ },
"TextEditor":
{
"pointSize":18,
"TextEditor":
{
"pointSize":18,