projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f754cc
)
Reduced text-selection indicator height for WVGA resolution
46/115846/3
author
Paul Wisbey
<p.wisbey@samsung.com>
Tue, 21 Feb 2017 13:28:02 +0000
(13:28 +0000)
committer
Paul Wisbey
<p.wisbey@samsung.com>
Tue, 21 Feb 2017 13:53:37 +0000
(
05:53
-0800)
Change-Id: Ief8d6f445f0bc182c0fbae1b2c08db791eafff03
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
patch
|
blob
|
history
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
patch
|
blob
|
history
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
patch
|
blob
|
history
diff --git
a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
index
6aeaded
..
ba775a2
100644
(file)
--- a/
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@
-158,6
+158,20
@@
"overshootSize":[1920.0,130.0]
}
},
"overshootSize":[1920.0,130.0]
}
},
+ "TextSelectionScrollBar":
+ {
+ "indicatorShowDuration":0.25,
+ "indicatorHideDuration":0.25
+ },
+ "TextSelectionScrollIndicator":
+ {
+ "image":
+ {
+ "visualType":"IMAGE",
+ "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png"
+ },
+ "color":[0.0,0.72,0.9,0.7]
+ },
"ScrollView":
{
"overshootEffectColor":"B018",
"ScrollView":
{
"overshootEffectColor":"B018",
diff --git
a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index
23af0f7
..
02b527d
100644
(file)
--- a/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@
-167,9
+167,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":
{
diff --git
a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index
d846c0f
..
e0e0c6a
100644
(file)
--- a/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@
-131,6
+131,20
@@
"overshootSize":[720.0,130.0]
}
},
"overshootSize":[720.0,130.0]
}
},
+ "TextSelectionScrollBar":
+ {
+ "indicatorShowDuration":0.25,
+ "indicatorHideDuration":0.25
+ },
+ "TextSelectionScrollIndicator":
+ {
+ "image":
+ {
+ "visualType":"IMAGE",
+ "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png"
+ },
+ "color":[0.0,0.72,0.9,0.7]
+ },
"ScrollView":
{
"overshootEffectColor":"B018",
"ScrollView":
{
"overshootEffectColor":"B018",