gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Layouter not taking stripped formatting codes into account when mapping visual coordinates to/from original string

Browse Source
This commit is contained in:
Niels Martin Hansen 2021-04-03 19:48:34 +02:00
parent b52e526017
commit 103d88ee33
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gfx_layout.cpp
View File

@ -206,6 +206,19 @@ Dimension Layouter::GetBounds()
return d; return d;
} }
/**
* Test whether a character is a non-printable formatting code
*/
static bool IsConsumedFormattingCode(WChar ch)
{
if (ch >= SCC_BLUE && ch <= SCC_BLACK) return true;
if (ch == SCC_PUSH_COLOUR) return true;
if (ch == SCC_POP_COLOUR) return true;
if (ch >= SCC_FIRST_FONT && ch <= SCC_LAST_FONT) return true;
// All other characters defined in Unicode standard are assumed to be non-consumed.
return false;
}
/** /**
* Get the position of a character in the layout. * Get the position of a character in the layout.
* @param ch Character to get the position of. Must be an iterator of the string passed to the constructor. * @param ch Character to get the position of. Must be an iterator of the string passed to the constructor.
@ -228,7 +241,7 @@ Point Layouter::GetCharPosition(std::string_view::const_iterator ch) const
auto str = this->string.begin(); auto str = this->string.begin();
while (str < ch) { while (str < ch) {
WChar c = Utf8Consume(str); WChar c = Utf8Consume(str);
index += line->GetInternalCharLength(c); if (!IsConsumedFormattingCode(c)) index += line->GetInternalCharLength(c);
} }
/* We couldn't find the code point index. */ /* We couldn't find the code point index. */
@ -282,7 +295,7 @@ ptrdiff_t Layouter::GetCharAtPosition(int x) const
if (cur_idx == index) return str - this->string.begin(); if (cur_idx == index) return str - this->string.begin();
WChar c = Utf8Consume(str); WChar c = Utf8Consume(str);
cur_idx += line->GetInternalCharLength(c); if (!IsConsumedFormattingCode(c)) cur_idx += line->GetInternalCharLength(c);
} }
} }
} }