Merge "Fix alignment issues with field and editor." into devel/master

diff --git a/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp b/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
index 7331f3e..7033e6d 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
+++ b/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
@@ -27,7 +27,7 @@ void CommonTextUtils::RenderText(
   Text::RendererPtr                renderer,
   Text::ControllerPtr              controller,
   Text::DecoratorPtr               decorator,
-  float                            alignmentOffset,
+  float&                           alignmentOffset,
   Actor&                           renderableActor,
   Actor&                           backgroundActor,
   Toolkit::Control&                stencil,

diff --git a/dali-toolkit/internal/controls/text-controls/common-text-utils.h b/dali-toolkit/internal/controls/text-controls/common-text-utils.h
index f2eaba7..f9069a2 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/common-text-utils.h
+++ b/dali-toolkit/internal/controls/text-controls/common-text-utils.h
@@ -37,7 +37,7 @@ public:
    * @param[in] renderer pointer to the text renderer
    * @param[in] controller pointer to the text controller
    * @param[in] decorator pointer to the text decorator
-   * @param[in] alignmentOffset Alignment offset
+   * @param[in,out] alignmentOffset Alignment offset
    * @param[in,out] renderableActor Actor for rendering text
    * @param[in,out] backgroundActor Actor for rendering background
    * @param[in,out] stencil Clipping actor
@@ -49,7 +49,7 @@ public:
     Text::RendererPtr                renderer,
     Text::ControllerPtr              controller,
     Text::DecoratorPtr               decorator,
-    float                            alignmentOffset,
+    float&                           alignmentOffset,
     Actor&                           renderableActor,
     Actor&                           backgroundActor,
     Toolkit::Control&                stencil,