From 0384d9c29f18fcfd520bf8d2c4eb76953ced35da Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Mon, 25 Mar 2024 17:47:34 +0700 Subject: [PATCH] OSD: Minor adjustment to basic blending notification --- pcsx2/ImGui/FullscreenUI.cpp | 2 +- pcsx2/ImGui/ImGuiManager.cpp | 2 +- pcsx2/Patch.cpp | 4 ++-- pcsx2/VMManager.cpp | 15 ++++++++------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 8f76546c42257..2c82846697f15 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -2805,7 +2805,7 @@ void FullscreenUI::DrawBIOSSettingsPage() DrawFolderSetting(bsi, FSUI_ICONSTR(ICON_FA_FOLDER_OPEN, "Change Search Directory"), "Folders", "Bios", EmuFolders::Bios); const std::string bios_selection(GetEditingSettingsInterface()->GetStringValue("Filenames", "BIOS", "")); - if (MenuButtonWithValue(FSUI_ICONSTR(ICON_FA_MICROCHIP, "BIOS Selection"), + if (MenuButtonWithValue(FSUI_ICONSTR(ICON_PF_MICROCHIP, "BIOS Selection"), FSUI_CSTR("Changes the BIOS image used to start future sessions."), bios_selection.empty() ? FSUI_CSTR("Automatic") : bios_selection.c_str())) { diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index 34a8a1651cf10..b0be046e047bf 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -488,7 +488,7 @@ ImFont* ImGuiManager::AddFixedFont(float size) bool ImGuiManager::AddIconFonts(float size) { // clang-format off - static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf021,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02b,0xf02b,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04b,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf06e,0xf06e,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf084,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c8,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf11b,0xf11c,0xf121,0xf121,0xf129,0xf12a,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1b3,0xf1b3,0xf1c9,0xf1c9,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf21e,0xf21e,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2bd,0xf2bd,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f1,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf462,0xf462,0xf466,0xf466,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf547,0xf547,0xf54c,0xf54c,0xf552,0xf553,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf815,0xf815,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; + static constexpr ImWchar range_fa[] = { 0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf021,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02b,0xf02b,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03e,0xf04b,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf06e,0xf06e,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf084,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c8,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf11b,0xf11c,0xf121,0xf121,0xf129,0xf12a,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1b3,0xf1b3,0xf1de,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf21e,0xf21e,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2bd,0xf2bd,0xf2d0,0xf2d0,0xf2f1,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf462,0xf462,0xf466,0xf466,0xf51f,0xf51f,0xf543,0xf543,0xf547,0xf547,0xf54c,0xf54c,0xf552,0xf553,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf794,0xf794,0xf815,0xf815,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; static constexpr ImWchar range_pf[] = { 0x2198,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21f3,0x21f3,0x21f7,0x21f8,0x21fa,0x21fb,0x221a,0x221a,0x227a,0x227d,0x22bf,0x22c8,0x2349,0x2349,0x235a,0x235e,0x2360,0x2361,0x2364,0x2367,0x237a,0x237b,0x237d,0x237d,0x237f,0x2380,0x23b2,0x23b5,0x23cc,0x23cc,0x23f4,0x23f7,0x2427,0x243a,0x2443,0x2443,0x2460,0x246b,0x248f,0x248f,0x24f5,0x24fd,0x24ff,0x24ff,0x2605,0x2605,0x2699,0x2699,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; // clang-format on diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index 4d9d00257d7a5..6cd7f8eb5ad47 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -719,12 +719,12 @@ void Patch::UpdateActivePatches(bool reload_enabled_list, bool verbose, bool ver { if (!message.empty()) { - Host::AddIconOSDMessage("LoadPatches", ICON_FA_FILE_CODE, + Host::AddIconOSDMessage("LoadPatches", ICON_FA_BAND_AID, fmt::format(TRANSLATE_FS("Patch", "{} are active."), message), Host::OSD_INFO_DURATION); } else { - Host::AddIconOSDMessage("LoadPatches", ICON_FA_FILE_CODE, + Host::AddIconOSDMessage("LoadPatches", ICON_FA_BAND_AID, TRANSLATE_SV( "Patch", "No cheats or patches (widescreen, compatibility or others) are found / enabled."), Host::OSD_INFO_DURATION); diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp index 5aec05a4af061..a4479eb67b51c 100644 --- a/pcsx2/VMManager.cpp +++ b/pcsx2/VMManager.cpp @@ -53,6 +53,7 @@ #include "common/Timer.h" #include "IconsFontAwesome5.h" +#include "IconsPromptFont.h" #include "cpuinfo.h" #include "discord_rpc.h" #include "fmt/core.h" @@ -2980,8 +2981,8 @@ void VMManager::WarnAboutUnsafeSettings() } if (EmuConfig.GS.AccurateBlendingUnit <= AccBlendLevel::Minimum) { - append(ICON_FA_BLENDER, - TRANSLATE_SV("VMManager", "Blending is below basic, this may break effects in some games.")); + append(ICON_FA_PAINT_BRUSH, + TRANSLATE_SV("VMManager", "Blending Accuracy is below Basic, this may break effects in some games.")); } if (EmuConfig.GS.HWDownloadMode != GSHardwareDownloadMode::Enabled) { @@ -2991,30 +2992,30 @@ void VMManager::WarnAboutUnsafeSettings() } if (EmuConfig.Cpu.FPUFPCR.GetRoundMode() != FPRoundMode::ChopZero) { - append(ICON_FA_MICROCHIP, + append(ICON_PF_MICROCHIP, TRANSLATE_SV("VMManager", "EE FPU Round Mode is not set to default, this may break some games.")); } if (!EmuConfig.Cpu.Recompiler.fpuOverflow || EmuConfig.Cpu.Recompiler.fpuExtraOverflow || EmuConfig.Cpu.Recompiler.fpuFullMode) { - append(ICON_FA_MICROCHIP, + append(ICON_PF_MICROCHIP, TRANSLATE_SV("VMManager", "EE FPU Clamp Mode is not set to default, this may break some games.")); } if (EmuConfig.Cpu.VU0FPCR.GetRoundMode() != FPRoundMode::ChopZero) { - append(ICON_FA_MICROCHIP, + append(ICON_PF_MICROCHIP, TRANSLATE_SV("VMManager", "VU0 Round Mode is not set to default, this may break some games.")); } if (EmuConfig.Cpu.VU1FPCR.GetRoundMode() != FPRoundMode::ChopZero) { - append(ICON_FA_MICROCHIP, + append(ICON_PF_MICROCHIP, TRANSLATE_SV("VMManager", "VU1 Round Mode is not set to default, this may break some games.")); } if (!EmuConfig.Cpu.Recompiler.vu0Overflow || EmuConfig.Cpu.Recompiler.vu0ExtraOverflow || EmuConfig.Cpu.Recompiler.vu0SignOverflow || !EmuConfig.Cpu.Recompiler.vu1Overflow || EmuConfig.Cpu.Recompiler.vu1ExtraOverflow || EmuConfig.Cpu.Recompiler.vu1SignOverflow) { - append(ICON_FA_MICROCHIP, + append(ICON_PF_MICROCHIP, TRANSLATE_SV("VMManager", "VU Clamp Mode is not set to default, this may break some games.")); } if (!EmuConfig.EnableGameFixes)