diff options
| author | 2020-05-06 18:50:43 -0400 | |
|---|---|---|
| committer | 2020-05-06 18:50:43 -0400 | |
| commit | 3c39a87146b9cd0daf6dc0bd226bd25ea36bd170 (patch) | |
| tree | bdaf4ae9d6708470fb5e4d99f935123602d73c42 | |
| parent | Merge pull request #3815 from FernandoS27/command-list-2 (diff) | |
| parent | Menubar: fix mouse tracking bug (diff) | |
| download | yuzu-3c39a87146b9cd0daf6dc0bd226bd25ea36bd170.tar.gz yuzu-3c39a87146b9cd0daf6dc0bd226bd25ea36bd170.tar.xz yuzu-3c39a87146b9cd0daf6dc0bd226bd25ea36bd170.zip | |
Merge pull request #3892 from FearlessTobi/port-5280
Port citra-emu/citra#5280: "Small fixes to "Option to hide mouse on inactivity""
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 0a6839b2d..86e8a1d49 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1026,7 +1026,6 @@ void GMainWindow::BootGame(const QString& filename) { | |||
| 1026 | mouse_hide_timer.start(); | 1026 | mouse_hide_timer.start(); |
| 1027 | setMouseTracking(true); | 1027 | setMouseTracking(true); |
| 1028 | ui.centralwidget->setMouseTracking(true); | 1028 | ui.centralwidget->setMouseTracking(true); |
| 1029 | ui.menubar->setMouseTracking(true); | ||
| 1030 | } | 1029 | } |
| 1031 | 1030 | ||
| 1032 | const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID(); | 1031 | const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID(); |
| @@ -1099,7 +1098,6 @@ void GMainWindow::ShutdownGame() { | |||
| 1099 | 1098 | ||
| 1100 | setMouseTracking(false); | 1099 | setMouseTracking(false); |
| 1101 | ui.centralwidget->setMouseTracking(false); | 1100 | ui.centralwidget->setMouseTracking(false); |
| 1102 | ui.menubar->setMouseTracking(false); | ||
| 1103 | 1101 | ||
| 1104 | UpdateWindowTitle(); | 1102 | UpdateWindowTitle(); |
| 1105 | 1103 | ||
| @@ -1861,12 +1859,10 @@ void GMainWindow::OnConfigure() { | |||
| 1861 | if (UISettings::values.hide_mouse && emulation_running) { | 1859 | if (UISettings::values.hide_mouse && emulation_running) { |
| 1862 | setMouseTracking(true); | 1860 | setMouseTracking(true); |
| 1863 | ui.centralwidget->setMouseTracking(true); | 1861 | ui.centralwidget->setMouseTracking(true); |
| 1864 | ui.menubar->setMouseTracking(true); | ||
| 1865 | mouse_hide_timer.start(); | 1862 | mouse_hide_timer.start(); |
| 1866 | } else { | 1863 | } else { |
| 1867 | setMouseTracking(false); | 1864 | setMouseTracking(false); |
| 1868 | ui.centralwidget->setMouseTracking(false); | 1865 | ui.centralwidget->setMouseTracking(false); |
| 1869 | ui.menubar->setMouseTracking(false); | ||
| 1870 | } | 1866 | } |
| 1871 | 1867 | ||
| 1872 | dock_status_button->setChecked(Settings::values.use_docked_mode); | 1868 | dock_status_button->setChecked(Settings::values.use_docked_mode); |