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

Fix bug causing inconsistent imgui state when pressing the enter key

Browse Source
This commit is contained in:
Emil Axelsson
2017-04-12 15:46:28 +02:00
parent 51b420f2c4
commit b92fa3ca5e
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
modules/onscreengui/src/gui.cpp
View File

@@ -493,24 +493,43 @@ bool GUI::mouseWheelCallback(double position) {
}
bool GUI::keyCallback(Key key, KeyModifier modifier, KeyAction action) {
ImGuiIO& io = ImGui::GetIO();
bool consumeEvent = io.WantCaptureKeyboard;
if (consumeEvent) {
int keyIndex = static_cast<int>(key);
if (keyIndex < 0) {
LERROR("Pressed key of index '" << keyIndex << "' was negative");
}
else {
if (action == KeyAction::Press)
io.KeysDown[keyIndex] = true;
if (action == KeyAction::Release)
io.KeysDown[keyIndex] = false;
}
io.KeyShift = hasKeyModifier(modifier, KeyModifier::Shift);
io.KeyCtrl = hasKeyModifier(modifier, KeyModifier::Control);
io.KeyAlt = hasKeyModifier(modifier, KeyModifier::Alt);
const int keyIndex = static_cast<int>(key);
if (keyIndex < 0) {
LERROR("Key of index '" << keyIndex << "' was negative");
return false;
}
const bool hasShift = hasKeyModifier(modifier, KeyModifier::Shift);
const bool hasCtrl = hasKeyModifier(modifier, KeyModifier::Control);
const bool hasAlt = hasKeyModifier(modifier, KeyModifier::Alt);
ImGuiIO& io = ImGui::GetIO();
const bool consumeEvent = io.WantCaptureKeyboard;
if (consumeEvent) {
if (action == KeyAction::Press) {
io.KeysDown[keyIndex] = true;
}
io.KeyShift = hasShift;
io.KeyCtrl = hasCtrl;
io.KeyAlt = hasAlt;
}
// Even if the event is not consumed,
// set keys and modifiers to false when they are released.
if (action == KeyAction::Release) {
io.KeysDown[keyIndex] = false;
}
if (!hasShift) {
io.KeyShift = false;
}
if (!hasCtrl) {
io.KeyCtrl = false;
}
if (!hasAlt) {
io.KeyAlt = false;
}
return consumeEvent;
}