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
Prevented json array of numbers appending on merge
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
multi-language-support.h
diff --git
a/dali-toolkit/internal/text/multi-language-support.h
b/dali-toolkit/internal/text/multi-language-support.h
index
5c8ea1d
..
bcbb130
100644
(file)
--- a/
dali-toolkit/internal/text/multi-language-support.h
+++ b/
dali-toolkit/internal/text/multi-language-support.h
@@
-24,6
+24,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/font-run.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/font-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
#include <dali-toolkit/internal/text/script-run.h>
namespace Dali
#include <dali-toolkit/internal/text/script-run.h>
namespace Dali
@@
-42,8
+43,6
@@
class MultilanguageSupport;
} // Internal
} // Internal
-class LogicalModel;
-
/**
* @brief Sets the character's scripts to the model and validates the fonts set by the user or assigns default ones.
*/
/**
* @brief Sets the character's scripts to the model and validates the fonts set by the user or assigns default ones.
*/
@@
-99,8
+98,6
@@
public:
/**
* @brief Validates the character's font of the whole text.
*
/**
* @brief Validates the character's font of the whole text.
*
- * It may update fonts set by application developers.
- *
* This method ensures all characters are going to be rendered using an appropriate font. Provided a valid font
* exists in the platform.
*
* This method ensures all characters are going to be rendered using an appropriate font. Provided a valid font
* exists in the platform.
*
@@
-111,10
+108,14
@@
public:
*
* @param[in] text Vector of UTF-32 characters.
* @param[in] scripts Vector containing the script runs for the whole text.
*
* @param[in] text Vector of UTF-32 characters.
* @param[in] scripts Vector containing the script runs for the whole text.
- * @param[in,out] fonts Initially contains the fonts set by the application developers. Returns the validated fonts.
+ * @param[in] fontDescriptions The fonts set by the application developers.
+ * @param[in] defaultFontId The default font's id.
+ * @param[out] fonts The validated fonts.
*/
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
*/
void ValidateFonts( const Vector<Character>& text,
const Vector<ScriptRun>& scripts,
+ const Vector<FontDescriptionRun>& fontDescriptions,
+ FontId defaultFontId,
Vector<FontRun>& fonts );
};
Vector<FontRun>& fonts );
};