Clipping support for TextField

[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 11d212b..b061330 100644 (file)
--- a/dali-toolkit/internal/text/text-controller.h
+++ b/dali-toolkit/internal/text/text-controller.h
@@ -75,9 +75,10 @@ private:
     LAYOUT             = 0x0080,
     UPDATE_ACTUAL_SIZE = 0x0100,
     UPDATE_POSITIONS   = 0x0200,
-    REORDER            = 0x0400,
-    ALIGNMENT          = 0x0800,
-    RENDER             = 0x1000,
+    UPDATE_LINES       = 0x0400,
+    REORDER            = 0x0800,
+    ALIGNMENT          = 0x1000,
+    RENDER             = 0x2000,
     ALL_OPERATIONS     = 0xFFFF
   };
 
@@ -186,8 +187,11 @@ public:
    *
    * @param[in] size A the size of a bounding box to layout text within.
    * @param[in] operations The layout operations which need to be done.
+   * @param[out] layoutSize The size of the laid-out text.
    */
-  bool DoRelayout( const Vector2& size, OperationsMask operations );
+  bool DoRelayout( const Vector2& size,
+                   OperationsMask operations,
+                   Size& layoutSize );
 
   /**
    * @copydoc Control::GetNaturalSize()