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 "Added BACKGROUND_BORDER property to TextSelectionPopup" 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
23af0f7
..
105b87b
100644
(file)
--- a/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@
-124,7
+124,12
@@
"popupPressedColor":[0.24,0.72,0.8,0.11],
"background": {
"visualType": "IMAGE",
"popupPressedColor":[0.24,0.72,0.8,0.11],
"background": {
"visualType": "IMAGE",
- "url": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+ "url": "{DALI_IMAGE_DIR}selection-popup-background.9.png"
+ },
+ "backgroundBorder": {
+ "visualType": "IMAGE",
+ "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png",
+ "mixColor":[0.24,0.72,0.8,1.0]
},
"popupFadeInDuration":0.25,
"popupFadeOutDuration":0.25
},
"popupFadeInDuration":0.25,
"popupFadeOutDuration":0.25
@@
-167,9
+172,10
@@
"image":
{
"visualType":"IMAGE",
"image":
{
"visualType":"IMAGE",
- "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png"
+ "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png"
// designed for HD resolution
},
},
- "color":[0.0,0.72,0.9,0.7]
+ "color":[0.0,0.72,0.9,0.7],
+ "scale":[0.625,1.0,1.0] // Note: This reduces height for WVGA resolution
},
"ScrollView":
{
},
"ScrollView":
{