Skip to content

Commit 2906d2c

Browse files
committed
re-enabled k_allowfullscreentoggle which got disabled in a recent refactoring.
1 parent b746be8 commit 2906d2c

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

‎src/common/engine/d_event.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ CVAR(Float, m_sensitivity_x, 2.f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
5656
CVAR(Float, m_sensitivity_y, 2.f, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
5757
CVAR(Bool, invertmouse, false, CVAR_GLOBALCONFIG | CVAR_ARCHIVE); // Invert mouse look down/up?
5858
CVAR(Bool, invertmousex, false, CVAR_GLOBALCONFIG | CVAR_ARCHIVE); // Invert mouse look left/right?
59+
CVAR (Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
5960

6061

6162
//==========================================================================
@@ -93,11 +94,14 @@ void D_ProcessEvents (void)
9394

9495
#if defined(__linux__) || defined(_WIN32)
9596
// I cannot test on macos, so it is disabled for now
96-
if ((ev->type == EV_KeyDown && ev->data1 == KEY_ENTER && (ev->data3 & GKM_ALT))
97-
|| (ev->type == EV_GUI_Event && ev->subtype == EV_GUI_KeyDown && ev->data1 == GK_RETURN && (ev->data3 & GKM_ALT)))
97+
if (k_allowfullscreentoggle)
9898
{
99-
ToggleFullscreen = !ToggleFullscreen;
100-
continue;
99+
if ((ev->type == EV_KeyDown && ev->data1 == KEY_ENTER && (ev->data3 & GKM_ALT))
100+
|| (ev->type == EV_GUI_Event && ev->subtype == EV_GUI_KeyDown && ev->data1 == GK_RETURN && (ev->data3 & GKM_ALT)))
101+
{
102+
ToggleFullscreen = !ToggleFullscreen;
103+
continue;
104+
}
101105
}
102106
#endif
103107

‎src/common/platform/posix/cocoa/i_input.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
CVAR(Bool, use_mouse, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
5555

56-
CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
56+
EXTERN_CVAR(Bool, k_allowfullscreentoggle)
5757

5858
extern int paused;
5959
extern bool ToggleFullscreen;

0 commit comments

Comments
 (0)