ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use last cluster to determine linebreaking so ligatures is handled

Browse Source
This commit is contained in:
Benau 2019-06-19 12:49:47 +08:00
parent c969e40fbf
commit 1389d55e35
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/font/font_manager.cpp
View File

@ -413,8 +413,6 @@ void FontManager::shape(const std::u32string& text,
gl.flags |= gui::GLF_RTL_LINE;
if (rtl_char[glyphs[idx].cluster])
gl.flags |= gui::GLF_RTL_CHAR;
if (breakable[glyphs[idx].cluster])
gl.flags |= gui::GLF_BREAKABLE;
if (FT_HAS_COLOR(glyphs[idx].ftface))
gl.flags |= gui::GLF_COLORED;
cur_line.push_back(gl);
@ -455,6 +453,14 @@ void FontManager::shape(const std::u32string& text,
{
return a_gi.original_index < b_gi.original_index;
});
// Use last cluster to determine link breaking, so ligatures can be
// handled
for (gui::GlyphLayout& gl : cur_line)
{
int last_cluster = gl.cluster.back();
if (breakable[last_cluster])
gl.flags |= gui::GLF_BREAKABLE;
}
gls.insert(gls.end(), cur_line.begin(), cur_line.end());
raqm_destroy(rq);
if (line_data)