comctl32: toolbar: The SetButtonSize should not allow too small buttons.

This commit is contained in:
Mikołaj Zalewski 2006-11-01 23:04:05 +01:00 committed by Alexandre Julliard
parent 3bfcacc54c
commit 420f7cb076
1 changed files with 11 additions and 2 deletions

View File

@ -4646,8 +4646,17 @@ TOOLBAR_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
* either size, the system changes it to the default of 24 wide and
* 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02
*/
infoPtr->nButtonWidth = (cx) ? cx : 24;
infoPtr->nButtonHeight = (cy) ? cy : 22;
if (cx == 0) cx = 24;
if (cy == 0) cx = 22;
cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth);
cy = max(cy, infoPtr->szPadding.cy + infoPtr->nVBitmapHeight);
infoPtr->nButtonWidth = cx;
infoPtr->nButtonHeight = cy;
infoPtr->iTopMargin = default_top_margin(infoPtr);
TOOLBAR_LayoutToolbar(hwnd);
return TRUE;
}