projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed an incorrect ellipsis" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support-impl.h
diff --git
a/dali-toolkit/internal/text/multi-language-support-impl.h
b/dali-toolkit/internal/text/multi-language-support-impl.h
index
283b021
..
c9a7d30
100644
(file)
--- 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.
*/
*
* @return @e true if the font is in the vector of valid fonts.
*/
- bool
Find
ValidFont( FontId fontId ) const;
+ bool
Is
ValidFont( FontId fontId ) const;
Vector<FontId> mValidFonts;
};
Vector<FontId> mValidFonts;
};
@@
-77,6
+77,12
@@
struct ValidateFontsPerScript
*/
struct DefaultFonts
{
*/
struct DefaultFonts
{
+ struct CacheItem
+ {
+ TextAbstraction::FontDescription description;
+ FontId fontId;
+ };
+
/**
* Default constructor.
*/
/**
* Default constructor.
*/
@@
-94,13
+100,18
@@
struct DefaultFonts
* @brief Finds a default font for the given @p size.
*
* @param[in] fontClient The font client.
* @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.
*/
* @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;
+
+ void Cache( const TextAbstraction::FontDescription& description, FontId fontId );
-
Vector<FontId
> mFonts;
+
std::vector<CacheItem
> mFonts;
};
/**
};
/**
@@
-141,7
+152,8
@@
public:
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
const Vector<FontDescriptionRun>& fontDescriptions,
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
const Vector<FontDescriptionRun>& fontDescriptions,
- FontId defaultFontId,
+ const TextAbstraction::FontDescription& defaultFontDescription,
+ TextAbstraction::PointSize26Dot6 defaultFontPointSize,
CharacterIndex startIndex,
Length numberOfCharacters,
Vector<FontRun>& fonts );
CharacterIndex startIndex,
Length numberOfCharacters,
Vector<FontRun>& fonts );