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

Cursor override fixes and preparation for overscan checking

Browse Source
This commit is contained in:
Cacodemon345
2024-05-04 23:36:09 +06:00
parent f907b7817b
commit 7277316c1b
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/qt_mainwindow.cpp
View File

@@ -205,7 +205,8 @@ MainWindow::MainWindow(QWidget *parent)
connect(this, &MainWindow::hardResetCompleted, this, [this]() { connect(this, &MainWindow::hardResetCompleted, this, [this]() {
ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA)); ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA));
QApplication::setOverrideCursor(Qt::ArrowCursor); while (QApplication::overrideCursor())
QApplication::restoreOverrideCursor();
#ifdef USE_WACOM #ifdef USE_WACOM
ui->menuTablet_tool->menuAction()->setVisible(mouse_input_mode >= 1); ui->menuTablet_tool->menuAction()->setVisible(mouse_input_mode >= 1);
#else #else

13
src/qt/qt_rendererstack.cpp
View File

@@ -114,7 +114,8 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
RendererStack::~RendererStack() RendererStack::~RendererStack()
{ {
QApplication::restoreOverrideCursor(); while (QApplication::overrideCursor())
QApplication::restoreOverrideCursor();
delete ui; delete ui;
} }
@@ -123,7 +124,7 @@ qt_mouse_capture(int on)
{ {
if (!on) { if (!on) {
mouse_capture = 0; mouse_capture = 0;
if (QApplication::overrideCursor()) QApplication::restoreOverrideCursor(); while (QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
#ifdef __APPLE__ #ifdef __APPLE__
CGAssociateMouseAndMouseCursorPosition(true); CGAssociateMouseAndMouseCursorPosition(true);
#endif #endif
@@ -247,7 +248,7 @@ RendererStack::enterEvent(QEnterEvent *event)
RendererStack::enterEvent(QEvent *event) RendererStack::enterEvent(QEvent *event)
#endif #endif
{ {
mousedata.mouse_tablet_in_proximity = 1; mousedata.mouse_tablet_in_proximity = m_monitor_index + 1;
if (mouse_input_mode == 1) if (mouse_input_mode == 1)
QApplication::setOverrideCursor(Qt::CrossCursor); QApplication::setOverrideCursor(Qt::CrossCursor);
@@ -258,8 +259,10 @@ RendererStack::leaveEvent(QEvent *event)
{ {
mousedata.mouse_tablet_in_proximity = 0; mousedata.mouse_tablet_in_proximity = 0;
if (mouse_input_mode == 1 && QApplication::overrideCursor()) if (mouse_input_mode == 1 && QApplication::overrideCursor()) {
QApplication::restoreOverrideCursor(); while (QApplication::overrideCursor())
QApplication::restoreOverrideCursor();
}
if (QApplication::platformName().contains("wayland")) { if (QApplication::platformName().contains("wayland")) {
event->accept(); event->accept();
return; return;