From 4626e48980e11da36d1d2b9b34d470bb23c19c7a Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Sun, 3 Jan 2016 22:09:08 +0200 Subject: [PATCH] GS window title: add when paused Mostly relevant if the GS window is set to not hide while paused, but also shows when the emulation is paused due to plugin config etc. The string is configurable via the template at PCSX2_ui.ini (including making it empty) but currently it always appear at the begining of the title. --- pcsx2/gui/AppConfig.cpp | 4 +++- pcsx2/gui/AppConfig.h | 1 + pcsx2/gui/FrameForGS.cpp | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index 87ae9eaf92..1ded05622d 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -939,7 +939,8 @@ AppConfig::UiTemplateOptions::UiTemplateOptions() OutputField = L"Field"; OutputProgressive = L"Progressive"; OutputInterlaced = L"Interlaced"; - TitleTemplate = L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}"; + Paused = L" "; + TitleTemplate = L"${pause}Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}"; } void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini) @@ -954,6 +955,7 @@ void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini) IniEntry(OutputField); IniEntry(OutputProgressive); IniEntry(OutputInterlaced); + IniEntry(Paused); IniEntry(TitleTemplate); } diff --git a/pcsx2/gui/AppConfig.h b/pcsx2/gui/AppConfig.h index 9b01b9a35b..adbef669e0 100644 --- a/pcsx2/gui/AppConfig.h +++ b/pcsx2/gui/AppConfig.h @@ -253,6 +253,7 @@ public: wxString OutputField; wxString OutputProgressive; wxString OutputInterlaced; + wxString Paused; wxString TitleTemplate; }; diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 0cde33a89f..2928c7089f 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -622,6 +622,8 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt ) title.Replace(L"${omodef}", omodef); title.Replace(L"${omodei}", omodei); title.Replace(L"${gsdx}", fromUTF8(gsDest)); + if (CoreThread.IsPaused()) + title = templates.Paused + title; SetTitle(title); }