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
DALi Version 1.3.45
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
shaper.cpp
diff --git
a/dali-toolkit/internal/text/shaper.cpp
b/dali-toolkit/internal/text/shaper.cpp
index
5313d0c
..
624c443
100644
(file)
--- a/
dali-toolkit/internal/text/shaper.cpp
+++ b/
dali-toolkit/internal/text/shaper.cpp
@@
-137,6
+137,8
@@
void ShapeText( const Vector<Character>& text,
currentFontId = fontRun.fontId;
currentScript = scriptRun.script;
currentFontId = fontRun.fontId;
currentScript = scriptRun.script;
+ bool softwareItalic = fontRun.softwareItalic;
+ bool softwareBold = fontRun.softwareBold;
// Get the min index to the last character of both runs.
CharacterIndex currentIndex = min( fontRun.characterRun.characterIndex + fontRun.characterRun.numberOfCharacters,
// Get the min index to the last character of both runs.
CharacterIndex currentIndex = min( fontRun.characterRun.characterIndex + fontRun.characterRun.numberOfCharacters,
@@
-170,12
+172,17
@@
void ShapeText( const Vector<Character>& text,
// Retrieve the glyphs and the glyph to character conversion map.
Vector<GlyphInfo> tmpGlyphs;
Vector<CharacterIndex> tmpGlyphToCharacterMap;
// Retrieve the glyphs and the glyph to character conversion map.
Vector<GlyphInfo> tmpGlyphs;
Vector<CharacterIndex> tmpGlyphToCharacterMap;
- tmpGlyphs.Resize( numberOfGlyphs );
+
+ GlyphInfo glyphInfo;
+ glyphInfo.softwareItalic = softwareItalic;
+ glyphInfo.softwareBold = softwareBold;
+
+ tmpGlyphs.Resize( numberOfGlyphs, glyphInfo );
tmpGlyphToCharacterMap.Resize( numberOfGlyphs );
shaping.GetGlyphs( tmpGlyphs.Begin(),
tmpGlyphToCharacterMap.Begin() );
tmpGlyphToCharacterMap.Resize( numberOfGlyphs );
shaping.GetGlyphs( tmpGlyphs.Begin(),
tmpGlyphToCharacterMap.Begin() );
- // Update the
indices
.
+ // Update the
new indices of the glyph to character map
.
if( 0u != totalNumberOfGlyphs )
{
for( Vector<CharacterIndex>::Iterator it = tmpGlyphToCharacterMap.Begin(),
if( 0u != totalNumberOfGlyphs )
{
for( Vector<CharacterIndex>::Iterator it = tmpGlyphToCharacterMap.Begin(),