comctl32: toolbar: The string should be included in the height of a button-less…

comctl32: toolbar: The string should be included in the height of a button-less toolbar only if there is a string in the pool.

comctl32: toolbar: The string should be included in the height of a button-less…
9ec280c2 · Mikołaj Zalewski · Alexandre Julliard · d57a61f8 · 9ec280c2
Commit 9ec280c2 authored Nov 01, 2006 by Mikołaj Zalewski Committed by Alexandre Julliard Nov 02, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

toolbar.c dlls/comctl32/toolbar.c +3 -6

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1226,7 +1226,7 @@ TOOLBAR_CalcStrings (HWND hwnd, LPSIZE lpSize)
    hdc = GetDC (hwnd);
    hOldFont = SelectObject (hdc, infoPtr->hFont);
-    if (infoPtr->nNumButtons == 0)
+    if (infoPtr->nNumButtons == 0 && infoPtr->nNumStrings > 0)
    {
        TEXTMETRICW tm;
@@ -3460,11 +3460,8 @@ TOOLBAR_GetButtonSize (HWND hwnd)
 {
    TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
-    if (infoPtr->nNumButtons > 0)
+    return MAKELONG((WORD)infoPtr->nButtonWidth,
-	return MAKELONG((WORD)infoPtr->nButtonWidth,
+                    (WORD)infoPtr->nButtonHeight);
-			(WORD)infoPtr->nButtonHeight);
-    else
-	return MAKELONG(23,22);
 }