SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged IceWind's most recent changes

Browse Source
This commit is contained in:
ykeara
2018-11-25 20:46:29 -06:00
parent 3596562bd0 dcf33f1384
commit 734581f495
17 changed files with 787 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlaycontroller.cpp
+14 -3
View File
@@ -28,6 +28,8 @@ namespace advsettings {
std::unique_ptr<OverlayController> OverlayController::singleton;
constexpr const char* OverlayController::applicationVersionString;
QSettings* OverlayController::_appSettings = nullptr;
OverlayController::~OverlayController() {
@@ -328,6 +330,15 @@ bool OverlayController::pollNextEvent(vr::VROverlayHandle_t ulOverlayHandle, vr:
}
}
QPoint OverlayController::getMousePositionForEvent(vr::VREvent_Mouse_t mouse) {
float y = mouse.y;
#ifdef __linux__
float h = (float) m_pWindow->height();
y = h - y;
#endif
return QPoint(mouse.x, y);
}
void OverlayController::OnTimeoutPumpEvents() {
if (!vr::VRSystem())
return;
@@ -337,7 +348,7 @@ void OverlayController::OnTimeoutPumpEvents() {
while (pollNextEvent(m_ulOverlayHandle, &vrEvent)) {
switch (vrEvent.eventType) {
case vr::VREvent_MouseMove: {
QPoint ptNewMouse(vrEvent.data.mouse.x, vrEvent.data.mouse.y);
QPoint ptNewMouse = getMousePositionForEvent(vrEvent.data.mouse);
if (ptNewMouse != m_ptLastMouse) {
QMouseEvent mouseEvent( QEvent::MouseMove, ptNewMouse, m_pWindow->mapToGlobal(ptNewMouse), Qt::NoButton, m_lastMouseButtons, 0 );
m_ptLastMouse = ptNewMouse;
@@ -348,7 +359,7 @@ void OverlayController::OnTimeoutPumpEvents() {
break;
case vr::VREvent_MouseButtonDown: {
QPoint ptNewMouse(vrEvent.data.mouse.x, vrEvent.data.mouse.y);
QPoint ptNewMouse = getMousePositionForEvent(vrEvent.data.mouse);
Qt::MouseButton button = vrEvent.data.mouse.button == vr::VRMouseButton_Right ? Qt::RightButton : Qt::LeftButton;
m_lastMouseButtons |= button;
QMouseEvent mouseEvent(QEvent::MouseButtonPress, ptNewMouse, m_pWindow->mapToGlobal(ptNewMouse), button, m_lastMouseButtons, 0);
@@ -357,7 +368,7 @@ void OverlayController::OnTimeoutPumpEvents() {
break;
case vr::VREvent_MouseButtonUp: {
QPoint ptNewMouse(vrEvent.data.mouse.x, vrEvent.data.mouse.y);
QPoint ptNewMouse = getMousePositionForEvent(vrEvent.data.mouse);
Qt::MouseButton button = vrEvent.data.mouse.button == vr::VRMouseButton_Right ? Qt::RightButton : Qt::LeftButton;
m_lastMouseButtons &= ~button;
QMouseEvent mouseEvent(QEvent::MouseButtonRelease, ptNewMouse, m_pWindow->mapToGlobal(ptNewMouse), button, m_lastMouseButtons, 0);