From 6101e34ddd088e35dc938844bdf517327f305c69 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Fri, 7 Jul 2023 20:43:54 +0200 Subject: [PATCH] remove menu in fullscreen/borderless modes --- src/dd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/dd.c b/src/dd.c index 12f14df..119d738 100644 --- a/src/dd.c +++ b/src/dd.c @@ -724,6 +724,9 @@ 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 { @@ -759,7 +762,7 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); LONG exstyle = real_GetWindowLongA(g_ddraw->hwnd, GWL_EXSTYLE); - + AdjustWindowRectEx(&dst, style, GetMenu(g_ddraw->hwnd) != NULL, exstyle); real_SetWindowPos( @@ -788,6 +791,9 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwFl } else { + if (GetMenu(g_ddraw->hwnd)) + SetMenu(g_ddraw->hwnd, NULL); + LONG style = real_GetWindowLongA(g_ddraw->hwnd, GWL_STYLE); DWORD swp_flags = SWP_SHOWWINDOW;