Commit ccd4479c authored by Austin Lund's avatar Austin Lund Committed by Alexandre Julliard

user32/tests: Fixed WM_SETFONT combo box tests.

parent 3d3ab1cb
...@@ -117,6 +117,10 @@ static void test_setfont(DWORD style) ...@@ -117,6 +117,10 @@ static void test_setfont(DWORD style)
MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2);
todo_wine expect_rect(r, 5, 5, 105, 105); todo_wine expect_rect(r, 5, 5, 105, 105);
/* The size of the dropped control is initially equal to the size
of the window when it was created. The size of the calculated
dropped area changes only by how much the selection area
changes, not by how much the list area changes. */
if (font_height(hFont1) == 10 && font_height(hFont2) == 8) if (font_height(hFont1) == 10 && font_height(hFont2) == 8)
{ {
SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE);
...@@ -124,21 +128,21 @@ static void test_setfont(DWORD style) ...@@ -124,21 +128,21 @@ static void test_setfont(DWORD style)
expect_rect(r, 0, 0, 100, 18); expect_rect(r, 0, 0, 100, 18);
SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r);
MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2);
todo_wine expect_rect(r, 5, 5, 105, 99); todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1)));
SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont2, FALSE); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont2, FALSE);
GetClientRect(hCombo, &r); GetClientRect(hCombo, &r);
expect_rect(r, 0, 0, 100, 16); expect_rect(r, 0, 0, 100, 16);
SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r);
MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2);
todo_wine expect_rect(r, 5, 5, 105, 97); todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont2)));
SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); SendMessage(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE);
GetClientRect(hCombo, &r); GetClientRect(hCombo, &r);
expect_rect(r, 0, 0, 100, 18); expect_rect(r, 0, 0, 100, 18);
SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r);
MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2);
todo_wine expect_rect(r, 5, 5, 105, 99); todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1)));
} }
else else
{ {
......
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