gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-10 08:00:05 +00:00
Code Issues 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.)
This commit is contained in:
Peter Nelson 2024-01-20 17:16:42 +00:00 committed by GitHub
parent 086cbd0d72
commit d6ccfdbbd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gfx_layout.cpp
View File

@ -244,10 +244,12 @@ Point Layouter::GetCharPosition(std::string_view::const_iterator ch) const
if (!IsConsumedFormattingCode(c)) index += line->GetInternalCharLength(c); if (!IsConsumedFormattingCode(c)) index += line->GetInternalCharLength(c);
} }
/* Initial position, returned if character not found. */
static const std::vector<Point> zero = { {0, 0} };
auto position = zero.begin();
/* We couldn't find the code point index. */ /* We couldn't find the code point index. */
if (str != ch) { if (str != ch) return *position;
return { 0, 0 };
}
/* Valid character. */ /* Valid character. */
@ -257,15 +259,24 @@ Point Layouter::GetCharPosition(std::string_view::const_iterator ch) const
const auto &positions = run.GetPositions(); const auto &positions = run.GetPositions();
const auto &charmap = run.GetGlyphToCharMap(); const auto &charmap = run.GetGlyphToCharMap();
for (int i = 0; i < run.GetGlyphCount(); i++) { /* Run starts after our character, use the last found position. */
/* Matching glyph? Return position. */ if ((size_t)charmap.front() > index) return *position;
if ((size_t)charmap[i] == index) {
return positions[i]; position = positions.begin();
} 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;
} }
} }
NOT_REACHED(); /* 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;
} }
/** /**