disable maximize and windowed toggle while maximized on macOS
This commit is contained in:
parent
07e088faaa
commit
dce598afcf
2 changed files with 9 additions and 1 deletions
|
@ -131,7 +131,7 @@ void cfg_save()
|
||||||
if (!g_config.save_settings)
|
if (!g_config.save_settings)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Do not save settings while window is maxmized */
|
/* Do not save settings while window is maximized */
|
||||||
if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top)
|
if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -613,6 +613,10 @@ void util_toggle_maximize()
|
||||||
if (!g_config.resizable || !g_config.windowed || g_config.fullscreen || !g_ddraw.width)
|
if (!g_config.resizable || !g_config.windowed || g_config.fullscreen || !g_ddraw.width)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* Do not allow maximize while window is maxmized */
|
||||||
|
if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top)
|
||||||
|
return;
|
||||||
|
|
||||||
RECT client_rc;
|
RECT client_rc;
|
||||||
RECT dst_rc;
|
RECT dst_rc;
|
||||||
|
|
||||||
|
@ -717,6 +721,10 @@ void util_toggle_fullscreen()
|
||||||
if (g_ddraw.bnet_active || !g_ddraw.width || (g_config.infantryhack && GetMenu(g_ddraw.hwnd)))
|
if (g_ddraw.bnet_active || !g_ddraw.width || (g_config.infantryhack && GetMenu(g_ddraw.hwnd)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
/* Do not allow ALT+ENTER while window is maxmized */
|
||||||
|
if (IsMacOS() && !g_config.window_rect.left && !g_config.window_rect.top)
|
||||||
|
return;
|
||||||
|
|
||||||
if (g_config.toggle_borderless && g_config.windowed)
|
if (g_config.toggle_borderless && g_config.windowed)
|
||||||
{
|
{
|
||||||
if (!g_config.fullscreen)
|
if (!g_config.fullscreen)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue