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
Change enumeration values to uppercase for Mesh & Gradient Renderer
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-selection-toolbar-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
index
7309781
..
7997bfa
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
@@
-36,11
+36,6
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-namespace
-{
-
-} // namespace
-
class TextSelectionToolbar : public Control
{
public:
class TextSelectionToolbar : public Control
{
public:
@@
-118,11
+113,17
@@
private: // From Control
*/
const Dali::Vector2& GetPopupMaxSize() const;
*/
const Dali::Vector2& GetPopupMaxSize() const;
+private: // Implementation
+
+ /**
+ * @copydoc Toolkit::TextSelectionToolbar::ConfigureScrollview()
+ */
+ void ConfigureScrollview( const Property::Map& properties );
+
/**
* @brief Set up scrollview to scroll Toolbar horizontally
/**
* @brief Set up scrollview to scroll Toolbar horizontally
- * @param[out] scrollView scrollview to setup
*/
*/
- void SetUpScrollView(
Toolkit::ScrollView& scrollView
);
+ void SetUpScrollView();
/**
* @brief Set up the parts that make the Toolbar
/**
* @brief Set up the parts that make the Toolbar
@@
-141,8
+142,6
@@
private: // From Control
*/
void OnScrollCompleted( const Vector2& position );
*/
void OnScrollCompleted( const Vector2& position );
-private: // Implementation
-
/**
* Construct a new TextField.
*/
/**
* Construct a new TextField.
*/