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 "Changed Motion Blur and MotionStretch Effect to use new custom shaders." into...
[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
7501b72
..
0c20938
100644
(file)
--- a/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@
-117,7
+117,15
@@
distributing this software or its derivatives.
},
"scrollview":
{
},
"scrollview":
{
- "overshoot-effect-color":"B018"
+ "overshoot-effect-color":"B018",
+ "overshoot-animation-speed":360.0,
+ "overshoot-size":[720.0,130.0]
+ },
+ "itemview":
+ {
+ "overshoot-effect-color":"B018",
+ "overshoot-animation-speed":360.0,
+ "overshoot-size":[720.0,130.0]
}
}
}
}
}
}