diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index dc016b93d..082ffb884 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -78,7 +78,7 @@ BEGIN PUSHBUTTON STR_CANCEL,IDCANCEL,99,45,50,14 END -DLG_CONFIG DIALOG DISCARDABLE 0, 0, 500, 256 +DLG_CONFIG DIALOG DISCARDABLE 0, 0, 376, 256 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_CONFIG FONT FONT_SIZE, FONT_NAME @@ -265,19 +265,23 @@ BEGIN COMBOBOX IDC_COMBO_LPT4,71,45,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_LPT4,IDT_LPT4,7,66,61,10 + COMBOBOX IDC_COMBO_LPT4,71,64,189,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + CONTROL STR_SERIAL1,IDC_CHECK_SERIAL1,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,64,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,94,10 CONTROL STR_SERIAL2,IDC_CHECK_SERIAL2,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,147,64,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,147,83,94,10 CONTROL STR_SERIAL3,IDC_CHECK_SERIAL3,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,82,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,101,94,10 CONTROL STR_SERIAL4,IDC_CHECK_SERIAL4,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,147,82,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,147,101,94,10 CONTROL STR_PARALLEL1,IDC_CHECK_PARALLEL1,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,100,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,119,94,10 CONTROL STR_PARALLEL2,IDC_CHECK_PARALLEL2,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,147,100,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,147,119,94,10 CONTROL STR_PARALLEL3,IDC_CHECK_PARALLEL3,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,118,94,10 CONTROL STR_PARALLEL4,IDC_CHECK_PARALLEL4,"Button", diff --git a/src/win/win.c b/src/win/win.c index 801c32ca5..66cf8a85e 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -1140,10 +1140,10 @@ plat_setfullscreen(int on) /* Render window. */ MoveWindow(hwndRender, 0, hide_tool_bar ? 0 : tbar_height, temp_x, temp_y, TRUE); - GetWindowRect(hwndRender, &rect); /* Status bar. */ - MoveWindow(hwndSBAR, 0, rect.bottom, temp_x, sbar_height, TRUE); + GetClientRect(hwndMain, &rect); + MoveWindow(hwndSBAR, 0, rect.bottom - sbar_height, temp_x, sbar_height, TRUE); if (mouse_capture) ClipCursor(&rect);