CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3892 from FearlessTobi/port-5280 

Port citra-emu/citra#5280: "Small fixes to "Option to hide mouse on inactivity""
This commit is contained in:
bunnei 2020-05-06 18:50:43 -04:00 committed by GitHub
parent 41682e0888 9e5af4ad30
commit 3c39a87146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/yuzu/main.cpp
View File

@ -1026,7 +1026,6 @@ void GMainWindow::BootGame(const QString& filename) {
mouse_hide_timer.start(); mouse_hide_timer.start();
setMouseTracking(true); setMouseTracking(true);
ui.centralwidget->setMouseTracking(true); ui.centralwidget->setMouseTracking(true);
ui.menubar->setMouseTracking(true);
} }
const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID(); const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID();
@ -1099,7 +1098,6 @@ void GMainWindow::ShutdownGame() {
setMouseTracking(false); setMouseTracking(false);
ui.centralwidget->setMouseTracking(false); ui.centralwidget->setMouseTracking(false);
ui.menubar->setMouseTracking(false);
UpdateWindowTitle(); UpdateWindowTitle();
@ -1861,12 +1859,10 @@ void GMainWindow::OnConfigure() {
if (UISettings::values.hide_mouse && emulation_running) { if (UISettings::values.hide_mouse && emulation_running) {
setMouseTracking(true); setMouseTracking(true);
ui.centralwidget->setMouseTracking(true); ui.centralwidget->setMouseTracking(true);
ui.menubar->setMouseTracking(true);
mouse_hide_timer.start(); mouse_hide_timer.start();
} else { } else {
setMouseTracking(false); setMouseTracking(false);
ui.centralwidget->setMouseTracking(false); ui.centralwidget->setMouseTracking(false);
ui.menubar->setMouseTracking(false);
} }
dock_status_button->setChecked(Settings::values.use_docked_mode); dock_status_button->setChecked(Settings::values.use_docked_mode);