ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OSD: Move hardcore notification from toast to OSD

This commit is contained in:
KamFretoZ 2024-07-24 16:11:33 +07:00 committed by Ty
parent 2bff3579e5
commit 1efeab4078
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcsx2/Achievements.cpp
View File

@ -1052,8 +1052,8 @@ void Achievements::DisplayHardcoreDeferredMessage()
if (VMManager::HasValidVM() && EmuConfig.Achievements.HardcoreMode && !s_hardcore_mode && if (VMManager::HasValidVM() && EmuConfig.Achievements.HardcoreMode && !s_hardcore_mode &&
ImGuiManager::InitializeFullscreenUI()) ImGuiManager::InitializeFullscreenUI())
{ {
ImGuiFullscreen::ShowToast( Host::AddIconOSDMessage(
std::string(), TRANSLATE_STR("Achievements", "Hardcore mode will be enabled on system reset."), "hardcore_on_reset", ICON_PF_DUMBELL, TRANSLATE_STR("Achievements", "Hardcore mode will be enabled on system reset."),
Host::OSD_WARNING_DURATION); Host::OSD_WARNING_DURATION);
} }
}); });
@ -1343,9 +1343,8 @@ void Achievements::HandleServerDisconnectedEvent(const rc_client_event_t* event)
MTGS::RunOnGSThread([]() { MTGS::RunOnGSThread([]() {
if (ImGuiManager::InitializeFullscreenUI()) if (ImGuiManager::InitializeFullscreenUI())
{ {
ImGuiFullscreen::ShowToast(TRANSLATE_STR("Achievements", "Achievements Disconnected"), ImGuiFullscreen::AddNotification("achievements_disconnect", Host::OSD_ERROR_DURATION, TRANSLATE_STR("Achievements", "Achievements Disconnected"),
TRANSLATE_STR("Achievements", "An unlock request could not be completed. We will keep retrying to submit this request."), TRANSLATE_STR("Achievements", "An unlock request could not be completed. We will keep retrying to submit this request."), s_game_icon);
Host::OSD_ERROR_DURATION);
} }
}); });
} }
@ -1357,8 +1356,8 @@ void Achievements::HandleServerReconnectedEvent(const rc_client_event_t* event)
MTGS::RunOnGSThread([]() { MTGS::RunOnGSThread([]() {
if (ImGuiManager::InitializeFullscreenUI()) if (ImGuiManager::InitializeFullscreenUI())
{ {
ImGuiFullscreen::ShowToast(TRANSLATE_STR("Achievements", "Achievements Reconnected"), ImGuiFullscreen::AddNotification("achievements_reconnect", Host::OSD_INFO_DURATION, TRANSLATE_STR("Achievements", "Achievements Reconnected"),
TRANSLATE_STR("Achievements", "All pending unlock requests have completed."), Host::OSD_INFO_DURATION); TRANSLATE_STR("Achievements", "All pending unlock requests have completed."), s_game_icon);
} }
}); });
} }
@ -1445,7 +1444,7 @@ void Achievements::SetHardcoreMode(bool enabled, bool force_display_message)
MTGS::RunOnGSThread([enabled]() { MTGS::RunOnGSThread([enabled]() {
if (ImGuiManager::InitializeFullscreenUI()) if (ImGuiManager::InitializeFullscreenUI())
{ {
ImGuiFullscreen::ShowToast(std::string(), Host::AddIconOSDMessage("hardcore_status", ICON_PF_DUMBELL,
enabled ? TRANSLATE_STR("Achievements", "Hardcore mode is now enabled.") : enabled ? TRANSLATE_STR("Achievements", "Hardcore mode is now enabled.") :
TRANSLATE_STR("Achievements", "Hardcore mode is now disabled."), TRANSLATE_STR("Achievements", "Hardcore mode is now disabled."),
Host::OSD_INFO_DURATION); Host::OSD_INFO_DURATION);
@ -1858,7 +1857,7 @@ void Achievements::ConfirmHardcoreModeDisableAsync(const char* trigger, std::fun
MTGS::RunOnGSThread([trigger = TinyString(trigger), callback = std::move(callback)]() { MTGS::RunOnGSThread([trigger = TinyString(trigger), callback = std::move(callback)]() {
if (!FullscreenUI::Initialize()) if (!FullscreenUI::Initialize())
{ {
Host::AddOSDMessage(fmt::format(TRANSLATE_FS("Cannot {} while hardcode mode is active.", trigger)), Host::AddOSDMessage(fmt::format(TRANSLATE_FS("Cannot {} while hardcore mode is active.", trigger)),
Host::OSD_WARNING_DURATION); Host::OSD_WARNING_DURATION);
callback(false); callback(false);
return; return;
@ -2931,7 +2930,8 @@ void Achievements::LeaderboardFetchNearbyCallback(
if (result != RC_OK) if (result != RC_OK)
{ {
ImGuiFullscreen::ShowToast(TRANSLATE("Achievements", "Leaderboard download failed"), error_message); ImGuiFullscreen::AddNotification("leaderboard_dl_fail", Host::OSD_INFO_DURATION,
TRANSLATE("Achievements", "Leaderboard Download Failed"), error_message, s_game_icon);
CloseLeaderboard(); CloseLeaderboard();
return; return;
} }
@ -2950,7 +2950,8 @@ void Achievements::LeaderboardFetchAllCallback(
if (result != RC_OK) if (result != RC_OK)
{ {
ImGuiFullscreen::ShowToast(TRANSLATE("Achievements", "Leaderboard download failed"), error_message); ImGuiFullscreen::AddNotification("leaderboard_dl_fail", Host::OSD_INFO_DURATION,
TRANSLATE("Achievements", "Leaderboard Download Failed"), error_message, s_game_icon);
CloseLeaderboard(); CloseLeaderboard();
return; return;
} }