dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #11827: Make Layouter::GetCharPosition() aware of ligatures. (#11831)

Browse Source 
When ligatures happen the precise individual character position is not known, so instead return the previous position (which is that of the ligature.)

(cherry picked from commit d6ccfdbbd9)
This commit is contained in:
Peter Nelson
2024-01-20 17:16:42 +00:00
committed by Jonathan G Rennison
parent 911ccc16fb
commit 17934bcc90
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gfx_layout.cpp
View File

@@ -248,9 +248,11 @@ Point Layouter::GetCharPosition(std::string_view::const_iterator ch) const
}
/* We couldn't find the code point index. */
if (str != ch) {
return { 0, 0 };
}
if (str != ch) return {0, 0};
/* Initial position, returned if character not found. */
static const Point zero = {0, 0};
const Point *position = &zero;
/* Valid character. */
@@ -260,16 +262,24 @@ Point Layouter::GetCharPosition(std::string_view::const_iterator ch) const
const auto &positions = run.GetPositions();
const auto &charmap = run.GetGlyphToCharMap();
for (int i = 0; i < run.GetGlyphCount(); i++) {
/* Matching glyph? Return position. */
if ((size_t)charmap[i] == index) {
return positions[i];
}
/* Run starts after our character, use the last found position. */
if ((size_t)charmap.front() > index) return *position;
position = positions.data();
for (auto it = charmap.begin(); it != charmap.end(); /* nothing */) {
/* Plain honest-to-$deity match. */
if ((size_t)*it == index) return *position;
++it;
if (it == charmap.end()) break;
/* We just passed our character, it's probably a ligature, use the last found position. */
if ((size_t)*it > index) return *position;
++position;
}
}
/* Code point index not found, just give up */
return { 0, 0 };
/* At the end of the run but still didn't find our character so probably a trailing ligature, use the last found position. */
return *position;
}
/**