X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-view%2Ftext-view-impl.h;h=7493fcc8cc6142a8b977182de0c10592a717239f;hp=2d35bccbe142e2d8a2756e21b4d270df45a8defd;hb=e2e777d22421d671e2bc7bf81148f7b89a44e807;hpb=cf2dd988cd7f7154208f1ffe9257f81df698cee6

diff --git a/dali-toolkit/internal/controls/text-view/text-view-impl.h b/dali-toolkit/internal/controls/text-view/text-view-impl.h
index 2d35bcc..7493fcc 100644
--- a/dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/dali-toolkit/internal/controls/text-view/text-view-impl.h
@@ -278,6 +278,20 @@ public:
   bool IsSnapshotModeEnabled() const;
 
   /**
+   * @brief Sets whether markup processing should be carried out.
+   *
+   * @param[in] enable whether markup processing is carried out or not.
+   */
+  void SetMarkupProcessingEnabled( bool enable );
+
+  /**
+   * @brief Returns whether markup processing is enabled or not
+   *
+   * @return true is markup processing is enabled
+   */
+  bool IsMarkupProcessingEnabled() const;
+
+  /**
    * @copydoc SetScrollEnabled()
    */
   void SetScrollEnabled( bool enable );
@@ -555,7 +569,8 @@ public:
                       Toolkit::Alignment::Type               alignment,
                       Toolkit::TextView::LineJustification   lineJustification,
                       float                                  lineHeightOffset,
-                      const std::string&                     ellipsizeText );
+                      const std::string&                     ellipsizeText,
+                      const bool                             markUpEnabled );
 
     /**
      * Copy constructor
@@ -575,7 +590,8 @@ public:
     Toolkit::Alignment::Type             mVerticalAlignment;   ///< Stores the vertical alignment for the whole text.
     Toolkit::TextView::LineJustification mLineJustification;   ///< Stores the line justification.
     float                                mLineHeightOffset;    ///< Line height offset to be addded to the font line height (measured in PointSize).
-    MarkupProcessor::StyledTextArray     mEllipsizeText;       ///< Stores the ellipsize text.
+    MarkupProcessor::StyledTextArray     mEllipsizeText;       ///< Stores the ellipsize text
+    bool                                 mMarkUpEnabled:1;     ///< Is markup string scanning enabled
   };
 
   /**
@@ -689,6 +705,7 @@ private:
 
   bool                                            mLockPreviousSnapshotMode;      ///< Whether previous stored snapshot mode should be modified.
   bool                                            mPreviousSnapshotModeEnabled:1; ///< Stores the previous snapshot mode value.
+  bool                                            mMarkUpEnabled:1;               ///< enable to scan for mark-up
 
   Toolkit::TextView::ScrolledSignalV2             mScrolledSignalV2;              ///< Signal emitted when text is scrolled.