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 "Stop CreateSolidActor from creating an RGBA BufferImage when it isn't needed...
[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
8a0d1ee
..
384c27b
100644
(file)
--- a/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@
-98,7
+98,9
@@
distributing this software or its derivatives.
"popup-pressed-color":[0.24,0.72,0.8,0.11],
"background-image": {
"filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
- }
+ },
+ "popup-fade-in-duration":0.25,
+ "popup-fade-out-duration":0.25
},
"scrollview":
{