ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: combo: CB_SETITEMHEIGHT should make the edit area 2px higher than the item (with testcase).

This commit is contained in:
Mikolaj Zalewski 2007-08-30 11:45:51 -07:00 committed by Alexandre Julliard
parent d99882a384
commit 71d77d98e2
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/user32/combo.c
View File

@ -1640,7 +1640,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height )
{
if( height < 32768 )
{
lphc->editHeight = height;
lphc->editHeight = height + 2; /* Is the 2 for 2*EDIT_CONTROL_PADDING? */
/*
* Redo the layout of the control.

25
dlls/user32/tests/combo.c
View File

@ -69,6 +69,29 @@ static int is_font_installed(const char *name)
return ret;
}
static void test_setitemheight(DWORD style)
{
HWND hCombo = build_combo(style);
RECT r;
int i;
trace("Style %x\n", style);
GetClientRect(hCombo, &r);
expect_rect(r, 0, 0, 100, 24);
SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r);
MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2);
todo_wine expect_rect(r, 5, 5, 105, 105);
for (i = 1; i < 30; i++)
{
SendMessage(hCombo, CB_SETITEMHEIGHT, -1, i);
GetClientRect(hCombo, &r);
expect_eq(r.bottom - r.top, i + 6, int, "%d");
}
DestroyWindow(hCombo);
}
static void test_setfont(DWORD style)
{
HWND hCombo = build_combo(style);
@ -224,6 +247,8 @@ START_TEST(combo)
test_setfont(CBS_DROPDOWN);
test_setfont(CBS_DROPDOWNLIST);
test_setitemheight(CBS_DROPDOWN);
test_setitemheight(CBS_DROPDOWNLIST);
test_CBN_SELCHANGE();
DestroyWindow(hMainWnd);