Pass stage from actor to attachment to avoid unnecessary calls to Stage::GetCurrent()

[platform/core/uifw/dali-core.git] / dali / internal / event / actor-attachments / text-attachment-impl.h

diff --git a/dali/internal/event/actor-attachments/text-attachment-impl.h b/dali/internal/event/actor-attachments/text-attachment-impl.h
index 18d80a0..eec38ae 100644 (file)
--- a/dali/internal/event/actor-attachments/text-attachment-impl.h
+++ b/dali/internal/event/actor-attachments/text-attachment-impl.h
@@ -26,10 +26,10 @@
 #include <dali/internal/event/actor-attachments/renderable-attachment-impl.h>
 #include <dali/internal/event/actor-attachments/actor-attachment-declarations.h>
 #include <dali/internal/event/text/font-declarations.h>
-#include <dali/internal/common/text-array.h>
 #include <dali/internal/event/text/text-request-helper.h>
 #include <dali/internal/event/text/resource/glyph-texture-observer.h>
 #include <dali/internal/common/owner-pointer.h>
+#include <dali/integration-api/text-array.h>
 
 namespace Dali
 {
@@ -54,25 +54,25 @@ public:
 
   /**
    * Create a new TextAttachment.
+   * @param[in] stage The stage to use for messaging
    * @param[in] parentNode The node to attach a scene-object to.
    * @param [in] text The text which will be displayed.
    * @param [in] font The font which will be used for the text.
-   * @param [in] isLeftToRight Text is displayed from left to right if true, otherwise from right to left.
    * @return A smart-pointer to the newly allocated TextAttachment.
    */
-  static TextAttachmentPtr New( const SceneGraph::Node& parentNode, const TextArray& text, FontPointer font, bool isLeftToRight );
+  static TextAttachmentPtr New( Stage& stage, const SceneGraph::Node& parentNode, const Integration::TextArray& text, FontPointer font );
 
   /**
    * Set the text label displayed by the attachment
    * @param [in] text The new text label
    */
-  void SetText(const TextArray& text);
+  void SetText(const Integration::TextArray& text);
 
   /**
    * Get the text label displayed by the attachment
    * @return The text label
    */
-  const TextArray& GetText() const
+  const Integration::TextArray& GetText() const
   {
     // This is not animatable; the cached value is up-to-date.
     return mText;
@@ -390,9 +390,8 @@ private:
                                                   ///< Font parameters are stored in the FontPointer member. Inside the TextStyle, font parameters and color are allocated in the same struct,
                                                   ///< so store the text color in the style will allocate space for the font parameters as well, wasting space.
   // Cached values for public getters
-  TextArray mText;
+  Integration::TextArray mText;
 
-  bool    mIsLeftToRight:1;     ///< whether the text is left to right
   bool    mTextChanged:1;       ///< whether the text has changed
   bool    mFontChanged:1;       ///< whether the font has changed
   bool    mUnderlineChanged:1;  ///< whether the underline has changed