nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

win32_gui: use AdjustWindowRect to get more accurate measurement of status window

Browse Source
This commit is contained in:
Alex Kompel
2015-04-13 23:29:02 -07:00
parent 16ffab2c3c
commit 7eefb8a250
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
win/win32/mhstatus.c
View File

@@ -194,20 +194,24 @@ void mswin_status_window_size (HWND hWnd, LPSIZE sz)
HDC hdc; HDC hdc;
PNHStatusWindow data; PNHStatusWindow data;
RECT rt; RECT rt;
GetWindowRect(hWnd, &rt); SIZE text_sz;
sz->cx = rt.right - rt.left;
sz->cy = rt.bottom - rt.top; GetClientRect(hWnd, &rt);
data = (PNHStatusWindow)GetWindowLong(hWnd, GWL_USERDATA); data = (PNHStatusWindow)GetWindowLong(hWnd, GWL_USERDATA);
if(data) { if(data) {
hdc = GetDC(hWnd); hdc = GetDC(hWnd);
saveFont = SelectObject(hdc, mswin_get_font(NHW_STATUS, ATR_NONE, hdc, FALSE)); saveFont = SelectObject(hdc, mswin_get_font(NHW_STATUS, ATR_NONE, hdc, FALSE));
GetTextExtentPoint32(hdc, _T("W"), 1, &text_sz);
GetTextMetrics(hdc, &tm); GetTextMetrics(hdc, &tm);
sz->cy = tm.tmHeight * NHSW_LINES + 2*GetSystemMetrics(SM_CYSIZEFRAME); rt.bottom = rt.top + text_sz.cy*NHSW_LINES;
SelectObject(hdc, saveFont); SelectObject(hdc, saveFont);
ReleaseDC(hWnd, hdc); ReleaseDC(hWnd, hdc);
} }
AdjustWindowRect(&rt, GetWindowLong(hWnd, GWL_STYLE), FALSE);
sz->cx = rt.right - rt.left;
sz->cy = rt.bottom - rt.top;
} }