X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fvisual-model-impl.h;h=fb9f7bcc71556bb6cc22fd45a7560af1dd5a7178;hp=292adc72f07ce7a3946b53f58cb6ed2e014b1bc7;hb=2fcbbac038816efeeed3ea7717cdd823d46d9c2c;hpb=0a2f5e1551be90466c7b64173bd750c4009c744e diff --git a/dali-toolkit/internal/text/visual-model-impl.h b/dali-toolkit/internal/text/visual-model-impl.h index 292adc7..fb9f7bc 100644 --- a/dali-toolkit/internal/text/visual-model-impl.h +++ b/dali-toolkit/internal/text/visual-model-impl.h @@ -478,7 +478,7 @@ public: void ClearCaches(); /** - * @brief Set the override used for underline height, 0 indicates height will be supplied by adaptor + * @brief Set the override used for underline height, 0 indicates height will be come from font metrics * * @param[in] height The height in pixels of the underline */ @@ -487,7 +487,7 @@ public: /** * @brief Retrieves the underline height override * - * @return Returns the override height for an underline, 0 indicates that adaptor will determine the height + * @return Returns the override height for an underline, 0 indicates that font metrics will determine the height */ float GetUnderlineHeight() const; @@ -525,9 +525,8 @@ public: Vector4 mShadowColor; ///< Color of drop shadow Vector4 mUnderlineColor; ///< Color of underline Vector2 mShadowOffset; ///< Offset for drop shadow, 0 indicates no shadow - float mUnderlineHeight; ///< Fixed height for underline to override adaptor supplied settings. - bool mUnderlineEnabled:1; ///< Underline enabled flag - bool mUnderlineColorSet:1; ///< Has the underline color been explicitly set? + float mUnderlineHeight; ///< Fixed height for underline to override font metrics. + private: @@ -538,6 +537,11 @@ private: // Caches to increase performance in some consecutive operations. LineIndex mCachedLineIndex; ///< Used to increase performance in consecutive calls to GetLineOfGlyph() or GetLineOfCharacter() with consecutive glyphs or characters. +public: + + bool mUnderlineEnabled:1; ///< Underline enabled flag + bool mUnderlineColorSet:1; ///< Has the underline color been explicitly set? + }; } // namespace Text