Skip to content

Commit 72e5632

Browse files
committed
Only toggle fullscreen on RMB if no modifier keys are pressed
1 parent 7131af0 commit 72e5632

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/RenderLoop.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,10 @@ void RenderLoop::MouseDownEvent(const SDL_MouseButtonEvent& event)
404404
break;
405405

406406
case SDL_BUTTON_RIGHT:
407-
_sdlRenderingWindow.ToggleFullscreen();
407+
if (!_keyStates.AnyPressed())
408+
{
409+
_sdlRenderingWindow.ToggleFullscreen();
410+
}
408411
break;
409412

410413
case SDL_BUTTON_MIDDLE:

src/RenderLoop.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ class RenderLoop
2121

2222
protected:
2323
struct ModifierKeyStates {
24+
bool AnyPressed() const
25+
{
26+
return _shiftPressed || _ctrlPressed || _altPressed || _metaPressed;
27+
}
28+
2429
bool _shiftPressed{false}; //!< L/R shift keys
2530
bool _ctrlPressed{false}; //!< L/R control keys
2631
bool _altPressed{false}; //!< L/R alt keys

0 commit comments

Comments
 (0)