mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Pass on modifier keys to CEF for mouse events (#790)

Browse Source 
* Update sgct
* Pass on modifier keys to CEF for mouse events
This commit is contained in:
Emil Axelsson
2019-02-04 15:14:51 +01:00
committed by GitHub
parent 59b1f2b741
commit f60371bdbc
9 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/openspaceengine.cpp
View File

@@ -1180,10 +1180,13 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier)
global::luaConsole.charCallback(codepoint, modifier);
}
void OpenSpaceEngine::mouseButtonCallback(MouseButton button, MouseAction action) {
using F = std::function<bool (MouseButton, MouseAction)>;
void OpenSpaceEngine::mouseButtonCallback(MouseButton button,
MouseAction action,
KeyModifier mods)
{
using F = std::function<bool (MouseButton, MouseAction, KeyModifier)>;
for (const F& func : global::callback::mouseButton) {
bool isConsumed = func(button, action);
bool isConsumed = func(button, action, mods);
if (isConsumed) {
// If the mouse was released, we still want to forward it to the navigation
// handler in order to reliably terminate a rotation or zoom. Accidentally