Merge "Make radio buttons work with size negotiation, bug fixes." into tizen

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-input / text-input-impl.h

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
index 8bc5a2a..a410205 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.h
@@ -26,7 +26,6 @@
 #include <dali-toolkit/internal/controls/text-input/text-input-popup-impl.h>
 
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/adaptor-framework/common/imf-manager.h>
 #include <dali/public-api/geometry/mesh.h>
 
 namespace Dali
@@ -881,9 +880,8 @@ public:  // Public to allow internal testing.
 
   /**
    * Draw a cursor / caret at position where new text should appear
-   * @param[in] nthChar the position along the text string in which new text should appear.
    */
-  void DrawCursor(const std::size_t nthChar = 0);
+  void DrawCursor();
 
   /**
    * Sets cursor visibility
@@ -1018,15 +1016,6 @@ public:  // Public to allow internal testing.
   void SetSelectionHandlePosition(SelectionHandleId handleId);
 
   /**
-   * Gets the visual position of a logical position.
-   * @note This is preferred over directly accessing the Map, as it resolves visual
-   * positions outside of the character map range.
-   * @param[in] logicalPosition The logical position
-   * @return Visual position is returned.
-   */
-  std::size_t GetVisualPosition(std::size_t logicalPosition) const;
-
-  /**
    * Gets a table of the visual text positions which has a flag
    * for each Character. The flag is either true (character selected)
    * or false (character deselected)
@@ -1085,8 +1074,10 @@ public:  // Public to allow internal testing.
 
   /**
    * Setup the selection popup and clipboard if relevant so the correct options are shown when ShowPopup is called.
+   * @param[in] showCutButton Flag to show or hide cut button, in some cases like whitespace we do not want to cut just select.
+   * default is true.
    */
-  void SetUpPopupSelection();
+  void SetUpPopupSelection( bool showCutButton = true );
 
   /**
    * Return the logical index containing the character position closest to the source.
@@ -1153,6 +1144,15 @@ public:  // Public to allow internal testing.
   std::size_t GetRowStartFromCharacterPosition(std::size_t logicalPosition) const;
 
   /**
+   * Retrieves the first character of a group of characters with the same direction.
+   *
+   * @param[in] logicalPosition Index to a character.
+   *
+   * @return Index to the character.
+   */
+  std::size_t GetFirstCharacterWithSameDirection( std::size_t logicalPosition ) const;
+
+  /**
    * Retrieve the dimensions of this row of text that the character resides on.
    * @param[in] characterPosition the position in the 'string' of characters.
    * @return The size of the rectangle representing this row
@@ -1219,8 +1219,9 @@ public:  // Public to allow internal testing.
 
   /**
    * Hide highlight shown between selection handles.
+   * @param[in] hidePopup flag to hide the popup too, default is to hide popup.
    */
-  void RemoveHighlight();
+  void RemoveHighlight( bool hidePopup = true );
 
   /**
    * Highlights text that has been selected