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
Add MIN_LINE_SIZE property
[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
..
e8adee9
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
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__
-#define
__DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__
+#ifndef
DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H
+#define
DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-42,7
+42,7
@@
class TextSelectionToolbar;
*
*
*/
*
*
*/
-class DALI_
IMPOR
T_API TextSelectionToolbar : public Control
+class DALI_
TOOLKI
T_API TextSelectionToolbar : public Control
{
public:
{
public:
@@
-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
};
};
@@
-128,6
+130,11
@@
public:
void RaiseAbove( Layer target );
/**
void RaiseAbove( Layer target );
/**
+ * @copydoc Toolkit::ScrollView::ScrollTo(const Vector2&)
+ */
+ void ScrollTo( const Vector2& position );
+
+ /**
* @brief Downcast a handle to TextSelectionToolbar.
*
* If the BaseHandle points is a TextSelectionToolbar the downcast returns a valid handle.
* @brief Downcast a handle to TextSelectionToolbar.
*
* If the BaseHandle points is a TextSelectionToolbar the downcast returns a valid handle.
@@
-160,4
+167,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__
+#endif //
DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H