Skip to content

W
wine-cw
Commit 8b086842 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

The IsValidImageList test is not needed because if it isn't a valid

image list we will have set the bitmap width and height to 1 and it does the wrong thing when no buttons are present.
parent 455989fa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 8 deletions
dlls/comctl32/toolbar.c
View file @ 8b086842
...@@ -1565,7 +1565,6 @@ TOOLBAR_CalcToolbar (HWND hwnd) ...@@ -1565,7 +1565,6 @@ TOOLBAR_CalcToolbar (HWND hwnd)
INT x, y, cx, cy; INT x, y, cx, cy;
SIZE sizeString, sizeButton; SIZE sizeString, sizeButton;
BOOL bWrap; BOOL bWrap;
BOOL usesBitmaps = FALSE;
BOOL validImageList = FALSE; BOOL validImageList = FALSE;
BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle); BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle);
...@@ -1573,14 +1572,9 @@ TOOLBAR_CalcToolbar (HWND hwnd) ...@@ -1573,14 +1572,9 @@ TOOLBAR_CalcToolbar (HWND hwnd)
TOOLBAR_DumpToolbar (infoPtr, __LINE__); TOOLBAR_DumpToolbar (infoPtr, __LINE__);
for (i = 0; i < infoPtr->nNumButtons && !usesBitmaps; i++)
{
if (TOOLBAR_IsValidBitmapIndex(infoPtr,infoPtr->buttons[i].iBitmap))
usesBitmaps = TRUE;
}
if (TOOLBAR_IsValidImageList(infoPtr, 0)) if (TOOLBAR_IsValidImageList(infoPtr, 0))
validImageList = TRUE; validImageList = TRUE;
sizeButton = TOOLBAR_MeasureButton(infoPtr, sizeString, usesBitmaps, validImageList); sizeButton = TOOLBAR_MeasureButton(infoPtr, sizeString, TRUE, validImageList);
infoPtr->nButtonWidth = sizeButton.cx; infoPtr->nButtonWidth = sizeButton.cx;
infoPtr->nButtonHeight = sizeButton.cy; infoPtr->nButtonHeight = sizeButton.cy;
...@@ -1592,7 +1586,10 @@ TOOLBAR_CalcToolbar (HWND hwnd) ...@@ -1592,7 +1586,10 @@ TOOLBAR_CalcToolbar (HWND hwnd)
TOOLBAR_WrapToolbar( hwnd, dwStyle ); TOOLBAR_WrapToolbar( hwnd, dwStyle );
x = infoPtr->nIndent; x = infoPtr->nIndent;
y = 0; if (infoPtr->dwStyle & TBSTYLE_FLAT)
y = 0;
else
y = TOP_BORDER;
/* from above, minimum is a button, and possible text */ /* from above, minimum is a button, and possible text */
cx = infoPtr->nButtonWidth; cx = infoPtr->nButtonWidth;
......
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