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 "Allow ImageView padding to be set to Zero" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
controls
/
control-wrapper.h
diff --git
a/plugins/dali-script-v8/src/controls/control-wrapper.h
b/plugins/dali-script-v8/src/controls/control-wrapper.h
index
dc4b636
..
8147d56
100644
(file)
--- a/
plugins/dali-script-v8/src/controls/control-wrapper.h
+++ b/
plugins/dali-script-v8/src/controls/control-wrapper.h
@@
-50,7
+50,8
@@
public:
{
UNKNOWN_CONTROL = -1,
CONTROL = 0,
- ITEMVIEW = 1
+ ITEMVIEW = 1,
+ SCROLLVIEW = 2
};
/**