INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-10 14:48:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

yuzu/main: fix mouse not showing on move and port citra-emu/citra#5476

Browse Source
This commit is contained in:
gal20
2020-12-30 21:41:14 +02:00
parent aa87278bf0
commit 5dfb8743cb
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/yuzu/main.cpp
View File

@ -1134,6 +1134,7 @@ void GMainWindow::BootGame(const QString& filename, std::size_t program_index) {
[this](std::size_t program_index) { render_window->ExecuteProgram(program_index); });
connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity);
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
// before the CPU continues
connect(emu_thread.get(), &EmuThread::DebugModeEntered, waitTreeWidget,
@ -1157,8 +1158,8 @@ void GMainWindow::BootGame(const QString& filename, std::size_t program_index) {
if (UISettings::values.hide_mouse) {
mouse_hide_timer.start();
setMouseTracking(true);
ui.centralwidget->setMouseTracking(true);
render_window->installEventFilter(render_window);
render_window->setAttribute(Qt::WA_Hover, true);
}
std::string title_name;
@ -1235,8 +1236,8 @@ void GMainWindow::ShutdownGame() {
}
game_list->SetFilterFocus();
setMouseTracking(false);
ui.centralwidget->setMouseTracking(false);
render_window->removeEventFilter(render_window);
render_window->setAttribute(Qt::WA_Hover, false);
UpdateWindowTitle();
@ -2317,12 +2318,12 @@ void GMainWindow::OnConfigure() {
config->Save();
if (UISettings::values.hide_mouse && emulation_running) {
setMouseTracking(true);
ui.centralwidget->setMouseTracking(true);
render_window->installEventFilter(render_window);
render_window->setAttribute(Qt::WA_Hover, true);
mouse_hide_timer.start();
} else {
setMouseTracking(false);
ui.centralwidget->setMouseTracking(false);
render_window->removeEventFilter(render_window);
render_window->setAttribute(Qt::WA_Hover, false);
}
UpdateStatusButtons();
@ -2565,21 +2566,17 @@ void GMainWindow::HideMouseCursor() {
ShowMouseCursor();
return;
}
setCursor(QCursor(Qt::BlankCursor));
render_window->setCursor(QCursor(Qt::BlankCursor));
}
void GMainWindow::ShowMouseCursor() {
unsetCursor();
render_window->unsetCursor();
if (emu_thread != nullptr && UISettings::values.hide_mouse) {
mouse_hide_timer.start();
}
}
void GMainWindow::mouseMoveEvent(QMouseEvent* event) {
ShowMouseCursor();
}
void GMainWindow::mousePressEvent(QMouseEvent* event) {
void GMainWindow::OnMouseActivity() {
ShowMouseCursor();
}