X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftext-controls%2Ftext-selection-toolbar.h;h=98b4e7d5bf12328bf5f55df61cbd6f9524c4deb1;hp=d0c5976c2c2a3b6c185d9150b425badf40195d45;hb=3d655cb57a51fee5d3a887aa36f4c6b8b77c2f7d;hpb=801f24237cb266e175386f62231663a47196661a

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 d0c5976..98b4e7d 100644
--- 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) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -23,10 +23,8 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
 class TextSelectionToolbar;
@@ -42,17 +40,16 @@ class TextSelectionToolbar;
  *
  *
  */
-class DALI_IMPORT_API TextSelectionToolbar : public Control
+class DALI_TOOLKIT_API TextSelectionToolbar : public Control
 {
 public:
-
   /**
    * @brief The start and end property ranges for this control.
    */
   enum PropertyRange
   {
     PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
-    PROPERTY_END_INDEX =   PROPERTY_START_INDEX + 1000              ///< Reserve property indices
+    PROPERTY_END_INDEX   = PROPERTY_START_INDEX + 1000 ///< Reserve property indices
   };
 
   /**
@@ -62,7 +59,11 @@ public:
   {
     enum
     {
-      MAX_SIZE =  PROPERTY_START_INDEX   ///< name "popup-max-size",                The maximum size the Popup can be,              type VECTOR2
+      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
     };
   };
 
@@ -82,7 +83,7 @@ public:
    *
    * @param[in] handle The handle to copy from.
    */
-  TextSelectionToolbar( const TextSelectionToolbar& handle );
+  TextSelectionToolbar(const TextSelectionToolbar& handle);
 
   /**
    * @brief Assignment operator.
@@ -90,7 +91,7 @@ public:
    * @param[in] handle The handle to copy from.
    * @return A reference to this.
    */
-  TextSelectionToolbar& operator=( const TextSelectionToolbar& handle );
+  TextSelectionToolbar& operator=(const TextSelectionToolbar& handle);
 
   /**
    * @brief Destructor
@@ -99,31 +100,35 @@ public:
    */
   ~TextSelectionToolbar();
 
-
   /**
    * @brief Add a option to the the Tool bar
    * @param[in] option Option actor to add
    */
-  void AddOption( Actor& option );
+  void AddOption(Actor& option);
 
   /**
    * @brief Add a divider to the the Tool bar
    * @param[in] divider Actor to be used as divider
    */
-  void AddDivider( Actor& divider );
+  void AddDivider(Actor& divider);
 
   /**
    *  @brief ResizeDividers
    *  @param[in] size New size of dividers, provide 0 for height to automatically set height
    */
-  void ResizeDividers( Size& size );
+  void ResizeDividers(Size& size);
 
   /**
-   * @brief Raises the layer above the given @e target layer.
+   * @brief Raises the actor above the given @e target actor.
    *
-   * @param[in] target The layer to get above of.
+   * @param[in] target The actor to get above of.
    */
-  void RaiseAbove( Layer target );
+  void RaiseAbove(Actor target);
+
+  /**
+   * @copydoc Toolkit::ScrollView::ScrollTo(const Vector2&)
+   */
+  void ScrollTo(const Vector2& position);
 
   /**
    * @brief Downcast a handle to TextSelectionToolbar.
@@ -134,23 +139,22 @@ public:
    * @param[in] handle Handle to an object
    * @return handle to a TextSelectionToolbar or an empty handle
    */
-  static TextSelectionToolbar DownCast( BaseHandle handle );
+  static TextSelectionToolbar DownCast(BaseHandle handle);
 
 public: // Not intended for application developers
-
   /**
    * @brief Creates a handle using the Toolkit::Internal implementation.
    *
    * @param[in] implementation The Control implementation.
    */
-  DALI_INTERNAL TextSelectionToolbar( Internal::TextSelectionToolbar& implementation );
+  DALI_INTERNAL TextSelectionToolbar(Internal::TextSelectionToolbar& implementation);
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  explicit DALI_INTERNAL TextSelectionToolbar( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL TextSelectionToolbar(Dali::Internal::CustomActor* internal);
 
 }; // Class TextSelectionToolbar
 
@@ -158,4 +162,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__
+#endif // DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H