Fix for toolbar button size.

031aef9a · Hidenori Takeshima · Alexandre Julliard · 45daffaa · 031aef9a
Commit 031aef9a authored Feb 25, 2000 by Hidenori Takeshima Committed by Alexandre Julliard Feb 25, 2000
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

toolbar.c dlls/comctl32/toolbar.c +5 -0

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -517,6 +517,11 @@ TOOLBAR_CalcToolbar (HWND hwnd)
 	infoPtr->nButtonWidth = infoPtr->nBitmapWidth + 6;
    }

+    if ( infoPtr->cxMin >= 0 && infoPtr->nButtonWidth < infoPtr->cxMin )
+        infoPtr->nButtonWidth = infoPtr->cxMin;
+    if ( infoPtr->cxMax >= 0 && infoPtr->nButtonWidth > infoPtr->cxMax )
+        infoPtr->nButtonWidth = infoPtr->cxMax;
+
    TOOLBAR_WrapToolbar( hwnd, dwStyle );

    x  = infoPtr->nIndent;