From: Ivan Ivlev <iviv@etersoft.ru> Signed-off-by: Ivan Ivlev <iviv@etersoft.ru> --- dlls/comctl32/toolbar.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5dffa4687c9..e40c9cd2ef9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1439,10 +1439,9 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) continue; } - /* The layout makes sure the bitmap is visible, but not the button. */ /* Test added to also wrap after a button that starts a row but */ /* is bigger than the area. - GA 8/01 */ - if ((x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 > width) || + if ((x + cx > width) || ((x == infoPtr->nIndent) && (cx > width))) { BOOL bFound = FALSE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10261