mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Automatically abort ongoing shutdown when interacting with the mouse or the keyboard (closes #2393)

Browse Source
This commit is contained in:
Alexander Bock
2023-02-01 12:48:36 +01:00
parent a0f9e88432
commit 494188371b
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/engine/openspaceengine.cpp
View File

@@ -1362,6 +1362,17 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio
return;
}
// We need to do this check before the callback functions as we would otherwise
// immediately cancel a shutdown if someone pressed the ESC key. Similar argument for
// only checking for the Press action. Since the 'Press' of ESC will trigger the
// shutdown, the 'Release' in some frame later would cancel it immediately again
if (action == KeyAction::Press && _shutdown.inShutdown) {
_shutdown.inShutdown = false;
global::eventEngine->publishEvent<events::EventApplicationShutdown>(
events::EventApplicationShutdown::State::Aborted
);
}
using F = global::callback::KeyboardCallback;
for (const F& func : *global::callback::keyboard) {
const bool isConsumed = func(key, mod, action, isGuiWindow);
@@ -1401,6 +1412,13 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier,
global::luaConsole->charCallback(codepoint, modifier);
global::interactionMonitor->markInteraction();
if (_shutdown.inShutdown) {
_shutdown.inShutdown = false;
global::eventEngine->publishEvent<events::EventApplicationShutdown>(
events::EventApplicationShutdown::State::Aborted
);
}
}
void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action,
@@ -1441,6 +1459,13 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action
global::navigationHandler->mouseButtonCallback(button, action);
global::interactionMonitor->markInteraction();
if (_shutdown.inShutdown) {
_shutdown.inShutdown = false;
global::eventEngine->publishEvent<events::EventApplicationShutdown>(
events::EventApplicationShutdown::State::Aborted
);
}
}
void OpenSpaceEngine::mousePositionCallback(double x, double y, IsGuiWindow isGuiWindow) {