Skip to content

W
wine-winehq
Commit 2e0a42ec authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

The calculated button height should include the text height when no

buttons are present.
parent 3b77de9c
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
dlls/comctl32/toolbar.c
View file @ 2e0a42ec
...@@ -1175,12 +1175,20 @@ TOOLBAR_CalcStrings (HWND hwnd, LPSIZE lpSize) ...@@ -1175,12 +1175,20 @@ TOOLBAR_CalcStrings (HWND hwnd, LPSIZE lpSize)
lpSize->cx = 0; lpSize->cx = 0;
lpSize->cy = 0; lpSize->cy = 0;
if(infoPtr->nMaxTextRows == 0) if (infoPtr->nMaxTextRows == 0)
return; return;
hdc = GetDC (hwnd); hdc = GetDC (hwnd);
hOldFont = SelectObject (hdc, infoPtr->hFont); hOldFont = SelectObject (hdc, infoPtr->hFont);
if (infoPtr->nNumButtons == 0)
{
TEXTMETRICW tm;
GetTextMetricsW(hdc, &tm);
lpSize->cy = tm.tmHeight;
}
btnPtr = infoPtr->buttons; btnPtr = infoPtr->buttons;
for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
if(TOOLBAR_HasText(infoPtr, btnPtr)) if(TOOLBAR_HasText(infoPtr, btnPtr))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment