X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmulti-language-support-impl.h;h=3f568a22a6cb48bae8de8321188dd87d00e35fda;hp=283b02198e2b09c3bad999d712ede8faba2a1a36;hb=a632f8445619b331bc1cf1ae95b14d84a024a281;hpb=ad48a2df15896480b1b6aaf1c744e5463f56ee06 diff --git a/dali-toolkit/internal/text/multi-language-support-impl.h b/dali-toolkit/internal/text/multi-language-support-impl.h index 283b021..3f568a2 100644 --- a/dali-toolkit/internal/text/multi-language-support-impl.h +++ b/dali-toolkit/internal/text/multi-language-support-impl.h @@ -67,7 +67,7 @@ struct ValidateFontsPerScript * * @return @e true if the font is in the vector of valid fonts. */ - bool FindValidFont( FontId fontId ) const; + bool IsValidFont( FontId fontId ) const; Vector mValidFonts; }; @@ -94,11 +94,14 @@ struct DefaultFonts * @brief Finds a default font for the given @p size. * * @param[in] fontClient The font client. + * @param[in] description The font's description. * @param[in] size The given size. * * @return The font id of a default font for the given @p size. If there isn't any font cached it returns 0. */ - FontId FindFont( TextAbstraction::FontClient& fontClient, PointSize26Dot6 size ) const; + FontId FindFont( TextAbstraction::FontClient& fontClient, + const TextAbstraction::FontDescription& description, + PointSize26Dot6 size ) const; Vector mFonts; }; @@ -141,7 +144,8 @@ public: void ValidateFonts( const Vector& text, const Vector& scripts, const Vector& fontDescriptions, - FontId defaultFontId, + const TextAbstraction::FontDescription& defaultFontDescription, + TextAbstraction::PointSize26Dot6 defaultFontPointSize, CharacterIndex startIndex, Length numberOfCharacters, Vector& fonts );