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 "Rotation High Level Class support in C#" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
text-controls
/
text-selection-toolbar.h
diff --git
a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
index
0a3b941
..
26d81a4
100644
(file)
--- a/
dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
+++ b/
dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
@@
-64,6
+64,8
@@
public:
{
MAX_SIZE = PROPERTY_START_INDEX, ///< name "maxSize", The maximum size the Popup can be, type VECTOR2
ENABLE_OVERSHOOT, ///< name "enableOvershoot", Whether the overshoot image is enabled, type BOOLEAN
{
MAX_SIZE = PROPERTY_START_INDEX, ///< name "maxSize", The maximum size the Popup can be, type VECTOR2
ENABLE_OVERSHOOT, ///< name "enableOvershoot", Whether the overshoot image is enabled, type BOOLEAN
+ ENABLE_SCROLL_BAR, ///< name "enableScrollBar", Whether the scroll-bar is enabled, type BOOLEAN
+ SCROLL_BAR_PADDING, ///< name "scrollBarPadding", The padding used to position the scroll bar, type VECTOR2
SCROLL_VIEW, ///< name "scrollView", Properties to set on scroll view type Property::Map
};
};
SCROLL_VIEW, ///< name "scrollView", Properties to set on scroll view type Property::Map
};
};