mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-24 05:18:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added keymodifiers to touch event handling

Browse Source
This commit is contained in:
Mikael Pettersson
2020-03-11 14:06:23 +01:00
committed by Mikael Pettersson
parent 3210dfd315
commit fa5bbc5a44
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/webbrowser/src/eventhandler.cpp
+8 -2
View File
@@ -28,6 +28,8 @@
#include <openspace/engine/globalscallbacks.h>
#include <openspace/engine/globals.h>
#include <openspace/engine/windowdelegate.h>
#include <openspace/interaction/navigationhandler.h>
#include <openspace/interaction/inputstate.h>
#include <openspace/interaction/interactionmonitor.h>
#include <ghoul/logging/logmanager.h>
#include <fmt/format.h>
@@ -473,8 +475,12 @@ CefTouchEvent EventHandler::touchEvent(const TouchInput& input,
event.x = windowPos.x;
event.y = windowPos.y;
event.type = eventType;
//TODO: We should probably use key mods for touch as well:
// event.modifiers = mods;
const std::vector<std::pair<Key, KeyModifier>> &keyModVec =
global::navigationHandler.inputState().pressedKeys();
for (auto keyModPair : keyModVec) {
const KeyModifier mods = keyModVec[0].second;
event.modifiers |= static_cast<uint32_t>(mapToCefModifiers(mods));
}
event.pointer_type = cef_pointer_type_t::CEF_POINTER_TYPE_TOUCH;
return event;
}