Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-21 21:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc: Change various icons

Browse source
This commit is contained in:
Stenzek 2024-08-25 23:17:05 +10:00
parent 307f3bb9e3
commit b6228aced7
No known key found for this signature in database
9 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/resources/fonts/TwitterColorEmoji-SVGinOT.ttf.zst Normal file
View file

Binary file not shown.

3
src/core/achievements.cpp
View file

@ -33,6 +33,7 @@
#include "util/platform_misc.h" #include "util/platform_misc.h"
#include "util/state_wrapper.h" #include "util/state_wrapper.h"
#include "IconsEmoji.h"
#include "IconsFontAwesome5.h" #include "IconsFontAwesome5.h"
#include "IconsPromptFont.h" #include "IconsPromptFont.h"
#include "fmt/format.h" #include "fmt/format.h"
@ -2486,7 +2487,7 @@ void Achievements::DrawAchievement(const rc_client_achievement_t* cheevo)
// Just use the lock for standard achievements. // Just use the lock for standard achievements.
case RC_CLIENT_ACHIEVEMENT_TYPE_STANDARD: case RC_CLIENT_ACHIEVEMENT_TYPE_STANDARD:
default: default:
right_icon_text = is_unlocked ? ICON_FA_LOCK_OPEN : ICON_FA_LOCK; right_icon_text = is_unlocked ? ICON_EMOJI_UNLOCKED : ICON_FA_LOCK;
break; break;
} }

22
src/core/game_database.cpp
View file

@ -27,6 +27,7 @@
#include <sstream> #include <sstream>
#include <type_traits> #include <type_traits>
#include "IconsEmoji.h"
#include "IconsFontAwesome5.h" #include "IconsFontAwesome5.h"
Log_SetChannel(GameDatabase); Log_SetChannel(GameDatabase);
@ -458,13 +459,13 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
#define APPEND_MESSAGE(msg) \ #define APPEND_MESSAGE(msg) \
do \ do \
{ \ { \
messages.append("\n \u2022 "); \ messages.append("\n \u2022 "); \
messages.append(msg); \ messages.append(msg); \
} while (0) } while (0)
#define APPEND_MESSAGE_FMT(...) \ #define APPEND_MESSAGE_FMT(...) \
do \ do \
{ \ { \
messages.append("\n \u2022 "); \ messages.append("\n \u2022 "); \
messages.append_format(__VA_ARGS__); \ messages.append_format(__VA_ARGS__); \
} while (0) } while (0)
@ -650,7 +651,7 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
else if (settings.gpu_pgxp_enable && settings.gpu_pgxp_vertex_cache) else if (settings.gpu_pgxp_enable && settings.gpu_pgxp_vertex_cache)
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"gamedb_force_pgxp_vertex_cache", ICON_FA_EXCLAMATION_TRIANGLE, "gamedb_force_pgxp_vertex_cache", ICON_EMOJI_WARNING,
TRANSLATE_STR( TRANSLATE_STR(
"GameDatabase", "GameDatabase",
"PGXP Vertex Cache is enabled, but it is not required for this game. This may cause rendering errors."), "PGXP Vertex Cache is enabled, but it is not required for this game. This may cause rendering errors."),
@ -664,11 +665,10 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
#ifndef __ANDROID__ #ifndef __ANDROID__
APPEND_MESSAGE(TRANSLATE_SV("GameDatabase", "PGXP CPU mode enabled.")); APPEND_MESSAGE(TRANSLATE_SV("GameDatabase", "PGXP CPU mode enabled."));
#else #else
Host::AddIconOSDMessage( Host::AddIconOSDMessage("gamedb_force_pgxp_cpu", ICON_EMOJI_WARNING,
"gamedb_force_pgxp_cpu", ICON_FA_MICROCHIP, "This game requires PGXP CPU mode, which increases system requirements.\n"
"This game requires PGXP CPU mode, which increases system requirements.\n" ICON_FA_EXCLAMATION_TRIANGLE " If the game runs too slow, disable PGXP for this game.",
" If the game runs too slow, disable PGXP for this game.", Host::OSD_WARNING_DURATION);
Host::OSD_WARNING_DURATION);
#endif #endif
} }
@ -677,7 +677,7 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
else if (settings.UsingPGXPCPUMode()) else if (settings.UsingPGXPCPUMode())
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"gamedb_force_pgxp_cpu", ICON_FA_MICROCHIP, "gamedb_force_pgxp_cpu", ICON_EMOJI_WARNING,
TRANSLATE_STR("GameDatabase", TRANSLATE_STR("GameDatabase",
"PGXP CPU mode is enabled, but it is not required for this game. This may cause rendering errors."), "PGXP CPU mode is enabled, but it is not required for this game. This may cause rendering errors."),
Host::OSD_WARNING_DURATION); Host::OSD_WARNING_DURATION);
@ -720,8 +720,8 @@ void GameDatabase::Entry::ApplySettings(Settings& settings, bool display_osd_mes
if (!messages.empty()) if (!messages.empty())
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"GameDBCompatibility", ICON_FA_MICROCHIP, "GameDBCompatibility", ICON_EMOJI_INFORMATION,
fmt::format("{}{}", TRANSLATE_SV("GameDatabase", "Compatibility settings for this game have been applied:"), fmt::format("{}{}", TRANSLATE_SV("GameDatabase", "Compatibility settings for this game have been applied."),
messages.view()), messages.view()),
Host::OSD_WARNING_DURATION); Host::OSD_WARNING_DURATION);
} }

6
src/core/gpu.cpp
View file

@ -28,7 +28,7 @@
#include "common/small_string.h" #include "common/small_string.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "IconsFontAwesome5.h" #include "IconsEmoji.h"
#include "fmt/format.h" #include "fmt/format.h"
#include <cmath> #include <cmath>
@ -2526,7 +2526,7 @@ bool CompressAndWriteTextureToFile(u32 width, u32 height, std::string filename,
{ {
// Use a 60 second timeout to give it plenty of time to actually save. // Use a 60 second timeout to give it plenty of time to actually save.
osd_key = fmt::format("ScreenshotSaver_{}", filename); osd_key = fmt::format("ScreenshotSaver_{}", filename);
Host::AddIconOSDMessage(osd_key, ICON_FA_CAMERA, Host::AddIconOSDMessage(osd_key, ICON_EMOJI_CAMERA_WITH_FLASH,
fmt::format(TRANSLATE_FS("GPU", "Saving screenshot to '{}'."), Path::GetFileName(filename)), fmt::format(TRANSLATE_FS("GPU", "Saving screenshot to '{}'."), Path::GetFileName(filename)),
60.0f); 60.0f);
} }
@ -2577,7 +2577,7 @@ bool CompressAndWriteTextureToFile(u32 width, u32 height, std::string filename,
if (!osd_key.empty()) if (!osd_key.empty())
{ {
Host::AddIconOSDMessage(std::move(osd_key), ICON_FA_CAMERA, Host::AddIconOSDMessage(std::move(osd_key), ICON_EMOJI_CAMERA,
fmt::format(result ? TRANSLATE_FS("GPU", "Saved screenshot to '{}'.") : fmt::format(result ? TRANSLATE_FS("GPU", "Saved screenshot to '{}'.") :
TRANSLATE_FS("GPU", "Failed to save screenshot to '{}'."), TRANSLATE_FS("GPU", "Failed to save screenshot to '{}'."),
Path::GetFileName(filename), Path::GetFileName(filename),

11
src/core/hotkeys.cpp
View file

@ -23,6 +23,7 @@
#include "common/timer.h" #include "common/timer.h"
#include "IconsFontAwesome5.h" #include "IconsFontAwesome5.h"
#include "IconsEmoji.h"
#include <cmath> #include <cmath>
@ -536,12 +537,12 @@ DEFINE_HOTKEY("AudioMute", TRANSLATE_NOOP("Hotkeys", "Audio"), TRANSLATE_NOOP("H
SPU::GetOutputStream()->SetOutputVolume(volume); SPU::GetOutputStream()->SetOutputVolume(volume);
if (g_settings.audio_output_muted) if (g_settings.audio_output_muted)
{ {
Host::AddIconOSDMessage("AudioControlHotkey", ICON_FA_VOLUME_MUTE, Host::AddIconOSDMessage("AudioControlHotkey", ICON_EMOJI_MUTED_SPEAKER,
TRANSLATE_STR("OSDMessage", "Volume: Muted"), 5.0f); TRANSLATE_STR("OSDMessage", "Volume: Muted"), 5.0f);
} }
else else
{ {
Host::AddIconOSDMessage("AudioControlHotkey", ICON_FA_VOLUME_UP, Host::AddIconOSDMessage("AudioControlHotkey", ICON_EMOJI_MEDIUM_VOLUME_SPEAKER,
fmt::format(TRANSLATE_FS("OSDMessage", "Volume: {}%"), volume), 5.0f); fmt::format(TRANSLATE_FS("OSDMessage", "Volume: {}%"), volume), 5.0f);
} }
} }
@ -552,7 +553,7 @@ DEFINE_HOTKEY("AudioCDAudioMute", TRANSLATE_NOOP("Hotkeys", "Audio"), TRANSLATE_
{ {
g_settings.cdrom_mute_cd_audio = !g_settings.cdrom_mute_cd_audio; g_settings.cdrom_mute_cd_audio = !g_settings.cdrom_mute_cd_audio;
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"AudioControlHotkey", g_settings.cdrom_mute_cd_audio ? ICON_FA_VOLUME_MUTE : ICON_FA_VOLUME_UP, "AudioControlHotkey", g_settings.cdrom_mute_cd_audio ? ICON_EMOJI_MUTED_SPEAKER : ICON_EMOJI_MEDIUM_VOLUME_SPEAKER,
g_settings.cdrom_mute_cd_audio ? TRANSLATE_STR("OSDMessage", "CD Audio Muted.") : g_settings.cdrom_mute_cd_audio ? TRANSLATE_STR("OSDMessage", "CD Audio Muted.") :
TRANSLATE_STR("OSDMessage", "CD Audio Unmuted."), TRANSLATE_STR("OSDMessage", "CD Audio Unmuted."),
2.0f); 2.0f);
@ -568,7 +569,7 @@ DEFINE_HOTKEY("AudioVolumeUp", TRANSLATE_NOOP("Hotkeys", "Audio"), TRANSLATE_NOO
g_settings.audio_output_volume = volume; g_settings.audio_output_volume = volume;
g_settings.audio_fast_forward_volume = volume; g_settings.audio_fast_forward_volume = volume;
SPU::GetOutputStream()->SetOutputVolume(volume); SPU::GetOutputStream()->SetOutputVolume(volume);
Host::AddIconOSDMessage("AudioControlHotkey", ICON_FA_VOLUME_UP, Host::AddIconOSDMessage("AudioControlHotkey", ICON_EMOJI_HIGH_VOLUME_SPEAKER,
fmt::format(TRANSLATE_FS("OSDMessage", "Volume: {}%"), volume), 5.0f); fmt::format(TRANSLATE_FS("OSDMessage", "Volume: {}%"), volume), 5.0f);
} }
}) })
@ -582,7 +583,7 @@ DEFINE_HOTKEY("AudioVolumeDown", TRANSLATE_NOOP("Hotkeys", "Audio"), TRANSLATE_N
g_settings.audio_output_volume = volume; g_settings.audio_output_volume = volume;
g_settings.audio_fast_forward_volume = volume; g_settings.audio_fast_forward_volume = volume;
SPU::GetOutputStream()->SetOutputVolume(volume); SPU::GetOutputStream()->SetOutputVolume(volume);
Host::AddIconOSDMessage("AudioControlHotkey", ICON_FA_VOLUME_DOWN, Host::AddIconOSDMessage("AudioControlHotkey", ICON_EMOJI_MEDIUM_VOLUME_SPEAKER,
fmt::format(TRANSLATE_FS("OSDMessage", "Volume: {}%"), volume), 5.0f); fmt::format(TRANSLATE_FS("OSDMessage", "Volume: {}%"), volume), 5.0f);
} }
}) })

14
src/core/imgui_overlays.cpp
View file

@ -31,7 +31,7 @@
#include "common/thirdparty/SmallVector.h" #include "common/thirdparty/SmallVector.h"
#include "common/timer.h" #include "common/timer.h"
#include "IconsFontAwesome5.h" #include "IconsEmoji.h"
#include "fmt/chrono.h" #include "fmt/chrono.h"
#include "imgui.h" #include "imgui.h"
#include "imgui_internal.h" #include "imgui_internal.h"
@ -389,7 +389,7 @@ void ImGuiManager::DrawPerformanceOverlay(float& position_y, float scale, float
const bool rewinding = System::IsRewinding(); const bool rewinding = System::IsRewinding();
if (rewinding || System::IsFastForwardEnabled() || System::IsTurboEnabled()) if (rewinding || System::IsFastForwardEnabled() || System::IsTurboEnabled())
{ {
text.assign(rewinding ? ICON_FA_FAST_BACKWARD : ICON_FA_FAST_FORWARD); text.assign(rewinding ? ICON_EMOJI_FAST_REVERSE : ICON_EMOJI_FAST_FORWARD);
DRAW_LINE(standard_font, text, IM_COL32(255, 255, 255, 255)); DRAW_LINE(standard_font, text, IM_COL32(255, 255, 255, 255));
} }
} }
@ -397,7 +397,7 @@ void ImGuiManager::DrawPerformanceOverlay(float& position_y, float scale, float
else if (g_settings.display_show_status_indicators && state == System::State::Paused && else if (g_settings.display_show_status_indicators && state == System::State::Paused &&
!FullscreenUI::HasActiveWindow()) !FullscreenUI::HasActiveWindow())
{ {
text.assign(ICON_FA_PAUSE); text.assign(ICON_EMOJI_PAUSE);
DRAW_LINE(standard_font, text, IM_COL32(255, 255, 255, 255)); DRAW_LINE(standard_font, text, IM_COL32(255, 255, 255, 255));
} }
@ -508,7 +508,7 @@ void ImGuiManager::DrawMediaCaptureOverlay(float& position_y, float scale, float
ImFont* const standard_font = ImGuiManager::GetStandardFont(); ImFont* const standard_font = ImGuiManager::GetStandardFont();
ImDrawList* dl = ImGui::GetBackgroundDrawList(); ImDrawList* dl = ImGui::GetBackgroundDrawList();
static constexpr const char* ICON = ICON_FA_VIDEO; static constexpr const char* ICON = ICON_EMOJI_MOVIE_CAMERA;
const time_t elapsed_time = cap->GetElapsedTime(); const time_t elapsed_time = cap->GetElapsedTime();
const TinyString text_msg = TinyString::from_format(" {:02d}:{:02d}:{:02d}", elapsed_time / 3600, const TinyString text_msg = TinyString::from_format(" {:02d}:{:02d}:{:02d}", elapsed_time / 3600,
(elapsed_time % 3600) / 60, (elapsed_time % 3600) % 60); (elapsed_time % 3600) / 60, (elapsed_time % 3600) % 60);
@ -1155,7 +1155,7 @@ void SaveStateSelectorUI::LoadCurrentSlot()
else else
{ {
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"LoadState", ICON_FA_SD_CARD, "LoadState", ICON_EMOJI_FLOPPY_DISK,
IsCurrentSlotGlobal() ? IsCurrentSlotGlobal() ?
fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "No save state found in Global Slot {}."), GetCurrentSlot()) : fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "No save state found in Global Slot {}."), GetCurrentSlot()) :
fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "No save state found in Slot {}."), GetCurrentSlot()), fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "No save state found in Slot {}."), GetCurrentSlot()),
@ -1173,7 +1173,7 @@ void SaveStateSelectorUI::SaveCurrentSlot()
Error error; Error error;
if (!System::SaveState(path.c_str(), &error, g_settings.create_save_state_backups)) if (!System::SaveState(path.c_str(), &error, g_settings.create_save_state_backups))
{ {
Host::AddIconOSDMessage("SaveState", ICON_FA_EXCLAMATION_TRIANGLE, Host::AddIconOSDMessage("SaveState", ICON_EMOJI_WARNING,
fmt::format(TRANSLATE_FS("OSDMessage", "Failed to save state to slot {0}:\n{1}"), fmt::format(TRANSLATE_FS("OSDMessage", "Failed to save state to slot {0}:\n{1}"),
GetCurrentSlot(), error.GetDescription()), GetCurrentSlot(), error.GetDescription()),
Host::OSD_ERROR_DURATION); Host::OSD_ERROR_DURATION);
@ -1194,7 +1194,7 @@ void SaveStateSelectorUI::ShowSlotOSDMessage()
date = TRANSLATE_STR("SaveStateSelectorUI", "no save yet"); date = TRANSLATE_STR("SaveStateSelectorUI", "no save yet");
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"ShowSlotOSDMessage", ICON_FA_SEARCH, "ShowSlotOSDMessage", ICON_EMOJI_MAGNIFIYING_GLASS_TILTED_LEFT,
IsCurrentSlotGlobal() ? IsCurrentSlotGlobal() ?
fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "Global Save Slot {0} selected ({1})."), GetCurrentSlot(), date) : fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "Global Save Slot {0} selected ({1})."), GetCurrentSlot(), date) :
fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "Save Slot {0} selected ({1})."), GetCurrentSlot(), date), fmt::format(TRANSLATE_FS("SaveStateSelectorUI", "Save Slot {0} selected ({1})."), GetCurrentSlot(), date),

26
src/core/system.cpp
View file

@ -2,7 +2,6 @@
// SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0) // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
#include "system.h" #include "system.h"
#include "IconsFontAwesome5.h"
#include "achievements.h" #include "achievements.h"
#include "bios.h" #include "bios.h"
#include "bus.h" #include "bus.h"
@ -60,6 +59,9 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "common/threading.h" #include "common/threading.h"
#include "IconsEmoji.h"
#include "IconsFontAwesome5.h"
#include "cpuinfo.h" #include "cpuinfo.h"
#include "fmt/chrono.h" #include "fmt/chrono.h"
#include "fmt/format.h" #include "fmt/format.h"
@ -2589,7 +2591,7 @@ bool System::LoadState(const char* path, Error* error, bool save_undo_state)
INFO_LOG("Loading state from '{}'...", path); INFO_LOG("Loading state from '{}'...", path);
Host::AddIconOSDMessage( Host::AddIconOSDMessage(
"load_state", ICON_FA_FOLDER_OPEN, "load_state", ICON_EMOJI_OPEN_THE_FOLDER,
fmt::format(TRANSLATE_FS("OSDMessage", "Loading state from '{}'..."), Path::GetFileName(path)), fmt::format(TRANSLATE_FS("OSDMessage", "Loading state from '{}'..."), Path::GetFileName(path)),
Host::OSD_INFO_DURATION); Host::OSD_INFO_DURATION);
@ -2923,7 +2925,7 @@ bool System::SaveState(const char* path, Error* error, bool backup_existing_save
return false; return false;
} }
Host::AddIconOSDMessage("save_state", ICON_FA_SAVE, Host::AddIconOSDMessage("save_state", ICON_EMOJI_FLOPPY_DISK,
fmt::format(TRANSLATE_FS("OSDMessage", "State saved to '{}'."), Path::GetFileName(path)), fmt::format(TRANSLATE_FS("OSDMessage", "State saved to '{}'."), Path::GetFileName(path)),
5.0f); 5.0f);
@ -4508,7 +4510,7 @@ void System::WarnAboutUnsafeSettings()
{ {
if (g_settings.cpu_overclock_active) if (g_settings.cpu_overclock_active)
{ {
append(ICON_FA_MICROCHIP, append(ICON_EMOJI_WARNING,
SmallString::from_format( SmallString::from_format(
TRANSLATE_FS("System", "CPU clock speed is set to {}% ({} / {}). This may crash games."), TRANSLATE_FS("System", "CPU clock speed is set to {}% ({} / {}). This may crash games."),
g_settings.GetCPUOverclockPercent(), g_settings.cpu_overclock_numerator, g_settings.GetCPUOverclockPercent(), g_settings.cpu_overclock_numerator,
@ -4516,14 +4518,14 @@ void System::WarnAboutUnsafeSettings()
} }
if (g_settings.cdrom_read_speedup > 1) if (g_settings.cdrom_read_speedup > 1)
{ {
append(ICON_FA_COMPACT_DISC, append(ICON_EMOJI_WARNING,
SmallString::from_format( SmallString::from_format(
TRANSLATE_FS("System", "CD-ROM read speedup set to {}x (effective speed {}x). This may crash games."), TRANSLATE_FS("System", "CD-ROM read speedup set to {}x (effective speed {}x). This may crash games."),
g_settings.cdrom_read_speedup, g_settings.cdrom_read_speedup * 2)); g_settings.cdrom_read_speedup, g_settings.cdrom_read_speedup * 2));
} }
if (g_settings.cdrom_seek_speedup != 1) if (g_settings.cdrom_seek_speedup != 1)
{ {
append(ICON_FA_COMPACT_DISC, append(ICON_EMOJI_WARNING,
SmallString::from_format(TRANSLATE_FS("System", "CD-ROM seek speedup set to {}. This may crash games."), SmallString::from_format(TRANSLATE_FS("System", "CD-ROM seek speedup set to {}. This may crash games."),
(g_settings.cdrom_seek_speedup == 0) ? (g_settings.cdrom_seek_speedup == 0) ?
TinyString(TRANSLATE_SV("System", "Instant")) : TinyString(TRANSLATE_SV("System", "Instant")) :
@ -4537,19 +4539,21 @@ void System::WarnAboutUnsafeSettings()
{ {
if (g_settings.gpu_multisamples != 1) if (g_settings.gpu_multisamples != 1)
{ {
append(ICON_FA_MAGIC, append(ICON_EMOJI_WARNING,
TRANSLATE_SV("System", "Multisample anti-aliasing is enabled, some games may not render correctly.")); TRANSLATE_SV("System", "Multisample anti-aliasing is enabled, some games may not render correctly."));
} }
if (g_settings.gpu_resolution_scale > 1 && g_settings.gpu_force_round_texcoords) if (g_settings.gpu_resolution_scale > 1 && g_settings.gpu_force_round_texcoords)
{ {
append( append(
ICON_FA_MAGIC, ICON_EMOJI_WARNING,
TRANSLATE_SV("System", "Round upscaled texture coordinates is enabled. This may cause rendering errors.")); TRANSLATE_SV("System", "Round upscaled texture coordinates is enabled. This may cause rendering errors."));
} }
} }
if (g_settings.enable_8mb_ram) if (g_settings.enable_8mb_ram)
append(ICON_FA_MICROCHIP, {
TRANSLATE_SV("System", "8MB RAM is enabled, this may be incompatible with some games.")); append(ICON_EMOJI_WARNING,
TRANSLATE_SV("System", "8MB RAM is enabled, this may be incompatible with some games."));
}
} }
else else
{ {
@ -4558,7 +4562,7 @@ void System::WarnAboutUnsafeSettings()
if (!g_settings.apply_compatibility_settings) if (!g_settings.apply_compatibility_settings)
{ {
append(ICON_FA_GAMEPAD, append(ICON_EMOJI_WARNING,
TRANSLATE_STR("System", "Compatibility settings are not enabled. Some games may not function correctly.")); TRANSLATE_STR("System", "Compatibility settings are not enabled. Some games may not function correctly."));
} }

4
src/util/imgui_glyph_ranges.inl
View file

@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com> // SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0) // SPDX-License-Identifier: (GPL-3.0 OR PolyForm-Strict-1.0.0)
static constexpr ImWchar FA_ICON_RANGE[] = { 0xe06f,0xe06f,0xe086,0xe086,0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf049,0xf04c,0xf050,0xf050,0xf05e,0xf05e,0xf062,0xf063,0xf067,0xf067,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0a0,0xf0a0,0xf0ac,0xf0ad,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0e7,0xf0e7,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf140,0xf140,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf191,0xf192,0xf1ab,0xf1ab,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1eb,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf240,0xf240,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf4ce,0xf4ce,0xf500,0xf500,0xf51f,0xf51f,0xf538,0xf538,0xf545,0xf545,0xf547,0xf548,0xf57a,0xf57a,0xf5a2,0xf5a2,0xf5aa,0xf5aa,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf6cf,0xf6cf,0xf70c,0xf70c,0xf794,0xf794,0xf7a0,0xf7a0,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 }; static constexpr ImWchar FA_ICON_RANGE[] = { 0xe06f,0xe06f,0xe086,0xe086,0xf002,0xf002,0xf005,0xf005,0xf007,0xf007,0xf00c,0xf00e,0xf011,0xf011,0xf013,0xf013,0xf017,0xf017,0xf019,0xf019,0xf01c,0xf01c,0xf021,0xf021,0xf025,0xf025,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf050,0xf050,0xf05e,0xf05e,0xf062,0xf063,0xf067,0xf067,0xf071,0xf071,0xf075,0xf075,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0a0,0xf0a0,0xf0ac,0xf0ad,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0e7,0xf0e7,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf140,0xf140,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf191,0xf192,0xf1ab,0xf1ab,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1eb,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf240,0xf240,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf4ce,0xf4ce,0xf500,0xf500,0xf51f,0xf51f,0xf538,0xf538,0xf545,0xf545,0xf547,0xf548,0xf57a,0xf57a,0xf5a2,0xf5a2,0xf5aa,0xf5aa,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6cf,0xf6cf,0xf70c,0xf70c,0xf794,0xf794,0xf7a0,0xf7a0,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0x0,0x0 };
static constexpr ImWchar PF_ICON_RANGE[] = { 0x2196,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21c7,0x21ca,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21ed,0x21ee,0x21f7,0x21f8,0x21fa,0x21fb,0x227a,0x227f,0x2284,0x2284,0x235e,0x235e,0x2360,0x2361,0x2364,0x2366,0x23b2,0x23b4,0x23ce,0x23ce,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243e,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x2717,0x2717,0x278a,0x278e,0x27fc,0x27fc,0xe001,0xe001,0xff21,0xff3a,0x1f52b,0x1f52b,0x0,0x0 }; static constexpr ImWchar PF_ICON_RANGE[] = { 0x2196,0x2199,0x219e,0x21a1,0x21b0,0x21b3,0x21ba,0x21c3,0x21c7,0x21ca,0x21d0,0x21d4,0x21dc,0x21dd,0x21e0,0x21e3,0x21ed,0x21ee,0x21f7,0x21f8,0x21fa,0x21fb,0x227a,0x227f,0x2284,0x2284,0x235e,0x235e,0x2360,0x2361,0x2364,0x2366,0x23b2,0x23b4,0x23ce,0x23ce,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243e,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x2717,0x2717,0x278a,0x278e,0x27fc,0x27fc,0xe001,0xe001,0xff21,0xff3a,0x1f52b,0x1f52b,0x0,0x0 };
static constexpr ImWchar EMOJI_ICON_RANGE[] = { 0x0,0x0 }; static constexpr ImWchar EMOJI_ICON_RANGE[] = { 0x2139,0x2139,0x23e9,0x23ea,0x23f8,0x23f8,0x26a0,0x26a0,0x1f3a5,0x1f3a5,0x1f4be,0x1f4be,0x1f4c2,0x1f4c2,0x1f4f7,0x1f4f8,0x1f507,0x1f507,0x1f509,0x1f50a,0x1f50d,0x1f50d,0x1f512,0x1f513,0x0,0x0 };

3
src/util/imgui_manager.cpp
View file

@ -537,7 +537,7 @@ bool ImGuiManager::LoadFontData()
s_icon_pf_font_data = std::move(font_data.value()); s_icon_pf_font_data = std::move(font_data.value());
} }
if (s_emoji_font_data.empty() && false) if (s_emoji_font_data.empty())
{ {
std::optional<DynamicHeapArray<u8>> font_data = std::optional<DynamicHeapArray<u8>> font_data =
Host::ReadCompressedResourceFile("fonts/TwitterColorEmoji-SVGinOT.ttf.zst", true); Host::ReadCompressedResourceFile("fonts/TwitterColorEmoji-SVGinOT.ttf.zst", true);
@ -600,7 +600,6 @@ bool ImGuiManager::AddIconFonts(float size)
} }
} }
if constexpr (false) // Not yet used
{ {
ImFontConfig cfg; ImFontConfig cfg;
cfg.MergeMode = true; cfg.MergeMode = true;