The calculated button height should include the text height when no

buttons are present.

The calculated button height should include the text height when no
2e0a42ec · Robert Shearman · Alexandre Julliard · 3b77de9c · 2e0a42ec
Commit 2e0a42ec authored Jul 22, 2005 by Robert Shearman Committed by Alexandre Julliard Jul 22, 2005
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

toolbar.c dlls/comctl32/toolbar.c +9 -1

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1175,12 +1175,20 @@ TOOLBAR_CalcStrings (HWND hwnd, LPSIZE lpSize)
    lpSize->cx = 0;
    lpSize->cy = 0;

-    if(infoPtr->nMaxTextRows == 0)
+    if (infoPtr->nMaxTextRows == 0)
        return;

    hdc = GetDC (hwnd);
    hOldFont = SelectObject (hdc, infoPtr->hFont);

+    if (infoPtr->nNumButtons == 0)
+    {
+        TEXTMETRICW tm;
+
+        GetTextMetricsW(hdc, &tm);
+        lpSize->cy = tm.tmHeight;
+    }
+
    btnPtr = infoPtr->buttons;
    for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) {
        if(TOOLBAR_HasText(infoPtr, btnPtr))