backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 10:07:47 +01:00
Code Issues Projects Releases Activity

#305 add support for window menu in borderless mode

Browse Source
This commit is contained in:
FunkyFr3sh 2024-04-20 00:34:46 +02:00
parent 547fda273a
commit f735ef839c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dd.c
View File

@ -632,6 +632,11 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
{
border = FALSE;
if (!g_config.remove_menu && GetMenu(g_ddraw.hwnd))
{
g_ddraw.render.height -= real_GetSystemMetrics(SM_CYMENU);
}
/* prevent OpenGL from going automatically into fullscreen exclusive mode */
if (g_ddraw.renderer == ogl_render_main)
nonexclusive = TRUE;
@ -883,9 +888,6 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
real_GetWindowLongA(
g_ddraw.hwnd,
GWL_STYLE) & ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZE | WS_MAXIMIZE | WS_SYSMENU));
if (GetMenu(g_ddraw.hwnd))
SetMenu(g_ddraw.hwnd, NULL);
}
else
{
@ -919,6 +921,11 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl
if (g_config.fullscreen)
{
x = y = 0;
if (!g_config.remove_menu && GetMenu(g_ddraw.hwnd))
{
y = real_GetSystemMetrics(SM_CYMENU);
}
}
else if (border && g_config.window_rect.top == -32000 && y < 0)
{