claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the absolute mouse movement stuff from poll to the mouse event move handler, fixes #3588.

Browse Source
This commit is contained in:
OBattler
2023-08-16 19:33:29 +02:00
parent cf50271b0f
commit a5a9875123
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/qt/qt_rendererstack.cpp
View File

@@ -143,32 +143,6 @@ qt_mouse_capture(int on)
return; return;
} }
void
RendererStack::mousePoll()
{
if (m_monitor_index >= 1) {
if (mouse_mode >= 1) {
mouse_x_abs = mousedata.x_abs;
mouse_y_abs = mousedata.y_abs;
if (!mouse_tablet_in_proximity)
mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
}
return;
}
#ifdef Q_OS_WINDOWS
if (mouse_mode == 0) {
mouse_x_abs = mousedata.x_abs;
mouse_y_abs = mousedata.y_abs;
return;
}
#endif
mouse_x_abs = mousedata.x_abs;
mouse_y_abs = mousedata.y_abs;
mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
}
int ignoreNextMouseEvent = 1; int ignoreNextMouseEvent = 1;
void void
RendererStack::mouseReleaseEvent(QMouseEvent *event) RendererStack::mouseReleaseEvent(QMouseEvent *event)
@@ -267,8 +241,29 @@ RendererStack::mouseMoveEvent(QMouseEvent *event)
ignoreNextMouseEvent = 2; ignoreNextMouseEvent = 2;
oldPos = event->pos(); oldPos = event->pos();
#endif #endif
if (m_monitor_index >= 1) {
if (mouse_mode >= 1) {
mouse_x_abs = mousedata.x_abs;
mouse_y_abs = mousedata.y_abs;
if (!mouse_tablet_in_proximity)
mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
}
return;
} }
#ifdef Q_OS_WINDOWS
if (mouse_mode == 0) {
mouse_x_abs = mousedata.x_abs;
mouse_y_abs = mousedata.y_abs;
return;
}
#endif
mouse_x_abs = mousedata.x_abs;
mouse_y_abs = mousedata.y_abs;
mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
}
void void
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)

1
src/qt/qt_rendererstack.hpp
View File

@@ -88,7 +88,6 @@ public slots:
void blitCommon(int x, int y, int w, int h); void blitCommon(int x, int y, int w, int h);
void blitRenderer(int x, int y, int w, int h); void blitRenderer(int x, int y, int w, int h);
void blitDummy(int x, int y, int w, int h); void blitDummy(int x, int y, int w, int h);
void mousePoll();
private: private:
void createRenderer(Renderer renderer); void createRenderer(Renderer renderer);