niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

user32: Wrap at whitespace rather than soft break.

Browse source
This commit is contained in:
Brendan McGrath 2023-12-08 09:52:32 +11:00 • committed by Alexandre Julliard
parent 90d934b5ae
commit 8e1197c92e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/user32/tests/text.c
View file

@ -604,7 +604,7 @@ static void test_DrawTextCalcRect(void)
textheight = DrawTextW(hdc, wordbreak_text_colonW, -1, &rect, DT_CALCRECT | DT_WORDBREAK);
ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n",
textheight, heightcheck * 2);
todo_wine ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n",
ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n",
rect.right, rect2.right - 10);
SetRect(&rect, 0, 0, 200, 1);
@ -618,7 +618,7 @@ static void test_DrawTextCalcRect(void)
textheight = DrawTextW(hdc, wordbreak_text_csbW, -1, &rect, DT_CALCRECT | DT_WORDBREAK);
ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n",
textheight, heightcheck * 2);
todo_wine ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n",
ok(rect.right > rect2.right - 10, "Got unexpected textwdith %ld, expected larger than %ld.\n",
rect.right, rect2.right - 10);

4
dlls/user32/text.c
View file

@ -384,9 +384,9 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str,
}
else
{
while (i > 0 && !sla[(--i)+1].fSoftBreak) p--;
while (i > 0 && !sla[(--i)+1].fWhiteSpace) p--;
p--;
word_fits = (i != 0 || sla[i+1].fSoftBreak );
word_fits = (i != 0 || sla[i+1].fWhiteSpace );
}
/* If there was one. */