Skip to content

W
wine-cw
Commit 3d0be0ba authored by Fabian Maurer's avatar Fabian Maurer Committed by Alexandre Julliard
Browse files
Options

user32/combo: Properly set dropdown height.

Now that user32 and comctl32 combo are separated, this won't lead to a regression anymore. Signed-off-by: 's avatarFabian Maurer <dark.shadow4@web.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6ec0bfe1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 18 deletions
dlls/user32/combo.c
View file @ 3d0be0ba
......@@ -1029,14 +1029,6 @@ static void CBDropDown( LPHEADCOMBO lphc )
if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE())
nDroppedHeight = nHeight + COMBO_YBORDERSIZE();
if (nDroppedHeight < nHeight)
{
if (nItems < 5)
nDroppedHeight = (nItems+1)*nIHeight;
else if (nDroppedHeight < 6*nIHeight)
nDroppedHeight = 6*nIHeight;
}
}
r.left = rect.left;
......
dlls/user32/tests/combo.c
View file @ 3d0be0ba
......@@ -688,25 +688,25 @@ static void test_listbox_size(DWORD style)
int height_combo;
BOOL todo;
} info_height[] = {
{2, 24, TRUE},
{2, 24, FALSE},
{2, 41, TRUE},
{2, 42, TRUE},
{2, 50, TRUE},
{2, 42, FALSE},
{2, 50, FALSE},
{2, 60},
{2, 80},
{2, 89},
{2, 90},
{2, 100},
{10, 24, TRUE},
{10, 24, FALSE},
{10, 41, TRUE},
{10, 42, TRUE},
{10, 50, TRUE},
{10, 60, TRUE},
{10, 80, TRUE},
{10, 42, FALSE},
{10, 50, FALSE},
{10, 60, FALSE},
{10, 80, FALSE},
{10, 89, TRUE},
{10, 90, TRUE},
{10, 100, TRUE},
{10, 90, FALSE},
{10, 100, FALSE},
};
for(test = 0; test < ARRAY_SIZE(info_height); test++)
......
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