From ab5a33fc3136f5cacf2189fc6dce28c50242e958 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 27 Jun 2022 09:19:27 +0200 Subject: [PATCH] Qt: Properly repaint the Emulation menu icons --- rpcs3/rpcs3qt/main_window.cpp | 7 ++++++- rpcs3/rpcs3qt/main_window.h | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index d828b33373..4ef4ffaf7e 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -1446,7 +1446,6 @@ void main_window::RepaintToolBarIcons() m_icon_play = icon(":/Icons/play.png"); m_icon_pause = icon(":/Icons/pause.png"); - m_icon_stop = icon(":/Icons/stop.png"); m_icon_restart = icon(":/Icons/restart.png"); m_icon_fullscreen_on = icon(":/Icons/fullscreen.png"); m_icon_fullscreen_off = icon(":/Icons/exit_fullscreen.png"); @@ -1459,17 +1458,23 @@ void main_window::RepaintToolBarIcons() ui->toolbar_refresh ->setIcon(icon(":/Icons/refresh.png")); ui->toolbar_stop ->setIcon(icon(":/Icons/stop.png")); + ui->sysStopAct->setIcon(icon(":/Icons/stop.png")); + ui->sysRebootAct->setIcon(m_icon_restart); + if (Emu.IsRunning()) { ui->toolbar_start->setIcon(m_icon_pause); + ui->sysPauseAct->setIcon(m_icon_pause); } else if (Emu.IsStopped() && !Emu.GetBoot().empty()) { ui->toolbar_start->setIcon(m_icon_restart); + ui->sysPauseAct->setIcon(m_icon_restart); } else { ui->toolbar_start->setIcon(m_icon_play); + ui->sysPauseAct->setIcon(m_icon_play); } if (isFullScreen()) diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index 6d8bd5eb73..1dbaca6d96 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -52,7 +52,6 @@ class main_window : public QMainWindow QIcon m_app_icon; QIcon m_icon_play; QIcon m_icon_pause; - QIcon m_icon_stop; QIcon m_icon_restart; QIcon m_icon_fullscreen_on; QIcon m_icon_fullscreen_off;