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 "Refactored ControlRenderer so that derived classes are responsible for the...
[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
8a0fc66
..
ff98976
100644
(file)
--- a/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@
-65,11
+65,9
@@
distributing this software or its derivatives.
"secondary-cursor-color":[0.0,0.72,0.9,1.0],
"cursor-width":3,
"selection-highlight-color":[0.75,0.96,1.0,1.0],
"secondary-cursor-color":[0.0,0.72,0.9,1.0],
"cursor-width":3,
"selection-highlight-color":[0.75,0.96,1.0,1.0],
- "grab-handle-image": { "filename":"{DALI_IMAGE_DIR}cursor_handler_center.png" },
- "selection-handle-image-left" : {"filename":"{DALI_IMAGE_DIR}selection_handle_left.png" },
- "selection-handle-image-right": {"filename":"{DALI_IMAGE_DIR}selection_handle_right.png" },
- "selection-handle-marker-image-left":{ "filename":"{DALI_IMAGE_DIR}selection_marker_left.png" },
- "selection-handle-marker-image-right":{ "filename":"{DALI_IMAGE_DIR}selection_marker_right.png" }
+ "grab-handle-image" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
+ "selection-handle-image-left" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
+ "selection-handle-image-right": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
},
"textfield-font-size-0":
},
"textfield-font-size-0":
@@
-99,7
+97,7
@@
distributing this software or its derivatives.
"popup-divider-color":[0.23,0.72,0.8,0.11],
"popup-icon-color":[1.0,1.0,1.0,1.0],
"popup-pressed-color":[0.24,0.72,0.8,0.11],
"popup-divider-color":[0.23,0.72,0.8,0.11],
"popup-icon-color":[1.0,1.0,1.0,1.0],
"popup-pressed-color":[0.24,0.72,0.8,0.11],
- "background
-image
": {
+ "background": {
"filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
},
"popup-fade-in-duration":0.25,
"filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
},
"popup-fade-in-duration":0.25,
@@
-115,11
+113,24
@@
distributing this software or its derivatives.
},
"textselectiontoolbar":
{
},
"textselectiontoolbar":
{
- "enable-overshoot":true
+ "enable-overshoot":true,
+ "scroll-view":
+ {
+ "overshoot-animation-speed":360.0,
+ "overshoot-size":[720.0,130.0]
+ }
},
"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]
}
}
}
}
}
}