Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
fa5bbc5a
Commit
fa5bbc5a
authored
5 years ago
by
Mikael Pettersson
Committed by
Mikael Pettersson
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Added keymodifiers to touch event handling
parent
3210dfd3
master
content/2012EventProfile
elumenati/spout-implementation
elumenati/spoutImplementation
feature/2012Fieldlines
feature/WSA
feature/arrow-renderable
feature/asset-helper
feature/asset-meta-update-part2
feature/asset-require
feature/atmosphere-stars-rendering
feature/bufferTransferTestings
feature/camera-control-during-path
feature/camera-path-stability
feature/cef-update
feature/change-renderbin-runtime
feature/cmake
feature/codegen-lua
feature/codegen-lua-jenkins
feature/compile-times
feature/direction-hint-renderable
feature/du-meshes-selection
feature/fieldlines
feature/gamma-correction
feature/geojson
feature/geojson-renderable
feature/getting-started-tour
feature/grid-labels
feature/grids-update
feature/gui-mouseinteraction-fix
feature/horizons-framework
feature/horizons-unit-tests
feature/idle-behavior-updates
feature/imageTestKeys2Actions
feature/jenkins-codegen
feature/jenkins-fix
feature/jenkins-timeout
feature/juice
feature/jwst-pointing
feature/jwst-trail-update
feature/jwst-update
feature/labels-rendering
feature/location-measure
feature/macos
feature/mars-moons
feature/mas-model
feature/missions
feature/model-opacity
feature/molecule_rendering
feature/mollwide-projection
feature/orientation-check
feature/paper-atmosphere
feature/properties-visibility
feature/renderable-enabled-event
feature/satellites
feature/saturn-shepherd-moons
feature/science-on-the-sphere
feature/sgct-framebuffer-fixes
feature/sgct-gui
feature/sgct-gui-editable
feature/sgct-gui-jenkins
feature/sgct-json
feature/sgct-ui
feature/side-by-side-removal
feature/skybrowser
feature/skybrowser-cleanup
feature/skybrowser-drag-and-drop
feature/skybrowser-reload
feature/spacecraft-instruments
feature/spice-update
feature/tileprovider-minlevel
feature/tileproviders
feature/ubuntu2204
feature/unit-tests
feature/userproperties
feature/various-changes
feature/video-on-globe
feature/visual-testing-try2
feature/warnings
feature/wormhole
feature/xbox-update
hotfix/scaling
integration/paper-atmosphere
issue/1161
issue/1279
issue/1366-2
issue/1479
issue/1559
issue/1607
issue/1666
issue/1707
issue/1751
issue/1814
issue/1827
issue/1842
issue/1845
issue/1851
issue/1905
issue/1908
issue/1910
issue/1911
issue/1964
issue/1989
issue/1995
issue/2029
issue/2055
issue/2093
issue/2111
issue/2118
issue/2121
issue/2127
issue/2133
issue/2137
issue/2194
issue/2207
issue/2209
issue/2212
issue/2236
issue/2259
issue/2261
issue/2266
issue/2269
issue/843
issue/888
jenkins/1
jenkins/2
jenkins/2286
jenkins/utah-test-1
project/2021-wisdome-installation
project/climate
project/exoplanet-explorer
project/exoplanets-expert-tool
project/lights-2020-installation
project/spaceship-installation
rc/0.18.1
temp/skybrowser-animation-fixes-merge
thesis/2020/software-integration
thesis/2020/sonification
thesis/2021/airtraffic
thesis/2021/fieldlines
thesis/2021/multiuser-collab
thesis/2021/multiuser-collab3
thesis/2021/skybrowser
thesis/2022/climate
thesis/2022/cosmic-view
thesis/2022/fieldline-rendering
thesis/2022/remote-streaming
thesis/2022/software-integration
thesis/2022/software-integration_dod
thesis/2022/software-integration_receive-ra-dec
thesis/2022/software-integration_refactor-simp
thesis/2022/software-integration_velocity-support
thesis/2022/streaming
vislabs/release/2.1
research/atmospheres
releases/v0.18.0
releases/v0.17.2
releases/v0.17.1
releases/v0.17.0
releases/v0.16.1
releases/v0.16.0
releases/v0.15.2
releases/beta/beta-9
releases/beta/beta-8
releases/beta/beta-7
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/webbrowser/src/eventhandler.cpp
+8
-2
modules/webbrowser/src/eventhandler.cpp
with
8 additions
and
2 deletions
+8
-2
modules/webbrowser/src/eventhandler.cpp
+
8
-
2
View file @
fa5bbc5a
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help