Merge "Add a callback to get textfitted font size." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-controller.h

diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h
index 149e788..a5bc8b4 100644 (file)
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -1902,26 +1902,6 @@ private: // Helpers.
    */
   void ShowPlaceholderText();
 
    */
   void ShowPlaceholderText();
 

-  /**
-   * @brief Helper to clear font-specific data (only).
-   */
-  void ClearFontData();
-
-  /**
-   * @brief Helper to clear text's style data.
-   */
-  void ClearStyleData();
-
-  /**
-   * @brief Used to reset the scroll position after setting a new text.
-   */
-  void ResetScrollPosition();
-
-  /**
-   * @brief fill needed relayout parameters when line size is changed & request relayout.
-   */
-  void RelayoutForNewLineSize();
-

 private: // Private contructors & copy operator.
   /**
    * @brief Private constructor.
 private: // Private contructors & copy operator.
   /**
    * @brief Private constructor.


@@ -1962,6 +1942,7 @@ public:
 private:
   struct EventHandler;
   struct InputFontHandler;
 private:
   struct EventHandler;
   struct InputFontHandler;

+  struct InputProperties;

   struct PlaceholderHandler;
   struct Relayouter;
   struct TextUpdater;
   struct PlaceholderHandler;
   struct Relayouter;
   struct TextUpdater;