80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

And fixed the fix by moving it to the correct event.

Browse Source
This commit is contained in:
OBattler
2023-08-16 19:40:05 +02:00
parent 37f6c6f7c3
commit a942ee5ad9
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/qt/qt_rendererstack.cpp
View File

@@ -57,9 +57,6 @@ extern "C" {
struct mouseinputdata { struct mouseinputdata {
atomic_bool mouse_tablet_in_proximity; atomic_bool mouse_tablet_in_proximity;
std::atomic<double> x_abs;
std::atomic<double> y_abs;
char *mouse_type; char *mouse_type;
}; };
static mouseinputdata mousedata; static mouseinputdata mousedata;
@@ -241,28 +238,6 @@ 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
@@ -551,11 +526,30 @@ RendererStack::event(QEvent* event)
{ {
if (event->type() == QEvent::MouseMove) { if (event->type() == QEvent::MouseMove) {
QMouseEvent* mouse_event = (QMouseEvent*)event; QMouseEvent* mouse_event = (QMouseEvent*)event;
if (m_monitor_index >= 1) {
if (mouse_mode >= 1) { if (mouse_mode >= 1) {
mousedata.x_abs = (mouse_event->localPos().x()) / (long double)width(); mouse_x_abs = (mouse_event->localPos().x()) / (long double)width();
mousedata.y_abs = (mouse_event->localPos().y()) / (long double)height(); mouse_y_abs = (mouse_event->localPos().y()) / (long double)height();
if (!mouse_tablet_in_proximity)
mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
} }
return QStackedWidget::event(event);
} }
#ifdef Q_OS_WINDOWS
if (mouse_mode == 0) {
mouse_x_abs = (mouse_event->localPos().x()) / (long double)width();
mouse_y_abs = (mouse_event->localPos().y()) / (long double)height();
return QStackedWidget::event(event);
}
#endif
mouse_x_abs = (mouse_event->localPos().x()) / (long double)width();
mouse_y_abs = (mouse_event->localPos().y()) / (long double)height();
mouse_tablet_in_proximity = mousedata.mouse_tablet_in_proximity;
}
return QStackedWidget::event(event); return QStackedWidget::event(event);
} }