cpp/openttd-patchpack/source Changeset - r27266:57086da699c4

Changeset - r27266:57086da699c4

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Michael Lutz - 13 months ago 2023-05-06 16:15:40
michi@icosahedron.de

Fix: [Win32] Text line breaking did not properly handle punctuation characters. (#10775)

1 file changed with 3 insertions and 3 deletions:

src/os/windows/string_uniscribe.cpp

0 comments (0 inline, 0 general)

src/os/windows/string_uniscribe.cpp

➞

Show inline comments

@@ @@ -341,13 +341,13 @@ static std::vector<SCRIPT_ITEM> Uniscrib @@
+	}
 	/* Gather runs until the line is full. */
 	while (last_run != this->ranges.end() && cur_width < max_width) {
+	while (last_run != this->ranges.end() && cur_width <= max_width) {
 		cur_width += last_run->total_advance;
 		++last_run;
+	}
 	/* If the text does not fit into the available width, find a suitable breaking point. */
 	int remaining_offset = (last_run - 1)->len;
+	int remaining_offset = (last_run - 1)->len + 1;
 	int whitespace_count = 0;
 	if (cur_width > max_width) {
 		std::vector<SCRIPT_LOGATTR> log_attribs;
@@ @@ -433,7 +433,7 @@ static std::vector<SCRIPT_ITEM> Uniscrib @@
 		cur_pos += run.total_advance;
+	}
 	if (remaining_offset + whitespace_count < (last_run - 1)->len) {
+	if (remaining_offset + whitespace_count - 1 < (last_run - 1)->len) {
 		/* We didn't use up all of the last run, store remainder for the next line. */
 		this->cur_range_offset = remaining_offset + whitespace_count - 1;
 		this->cur_range = last_run - 1;

0 comments (0 inline, 0 general)