From 36809b2e2edf49ef1211180908b2a1ea0cc63066 Mon Sep 17 00:00:00 2001
From: Vitor K <vitor-kiguchi@hotmail.com>
Date: Mon, 4 May 2020 07:33:02 -0300
Subject: [PATCH] Small fixes to "Option to hide mouse on inactivity" (#5280)

* Menubar: fix mouse tracking bug

* citra_qt: Fix copy/paste error
---
 src/citra_qt/bootmanager.cpp | 2 +-
 src/citra_qt/main.cpp        | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 053d88f51..c0080f56e 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -299,7 +299,7 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) {
     } else if (event->button() == Qt::RightButton) {
         InputCommon::GetMotionEmu()->BeginTilt(pos.x(), pos.y());
     }
-    QWidget::mouseMoveEvent(event);
+    QWidget::mousePressEvent(event);
 }
 
 void GRenderWindow::mouseMoveEvent(QMouseEvent* event) {
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 7389b8c23..62604caec 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -1013,7 +1013,6 @@ void GMainWindow::BootGame(const QString& filename) {
         mouse_hide_timer.start();
         setMouseTracking(true);
         ui.centralwidget->setMouseTracking(true);
-        ui.menubar->setMouseTracking(true);
     }
 
     // show and hide the render_window to create the context
@@ -1116,7 +1115,6 @@ void GMainWindow::ShutdownGame() {
 
     setMouseTracking(false);
     ui.centralwidget->setMouseTracking(false);
-    ui.menubar->setMouseTracking(false);
 
     // Disable status bar updates
     status_bar_update_timer.stop();
@@ -1713,12 +1711,10 @@ void GMainWindow::OnConfigure() {
         if (UISettings::values.hide_mouse && emulation_running) {
             setMouseTracking(true);
             ui.centralwidget->setMouseTracking(true);
-            ui.menubar->setMouseTracking(true);
             mouse_hide_timer.start();
         } else {
             setMouseTracking(false);
             ui.centralwidget->setMouseTracking(false);
-            ui.menubar->setMouseTracking(false);
         }
     } else {
         Settings::values.input_profiles = old_input_profiles;