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

OSD: Fix Recording Icon

This commit is contained in:
KamFretoZ 2024-03-04 06:10:55 +07:00 committed by refractionpcsx2
parent e5de4c8f10
commit e3c745cf9b
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/include/IconsFontAwesome5.h vendored
View File

@ -706,7 +706,6 @@
#define ICON_FA_RANDOM "\xef\x81\xb4" // U+f074 #define ICON_FA_RANDOM "\xef\x81\xb4" // U+f074
#define ICON_FA_RECEIPT "\xef\x95\x83" // U+f543 #define ICON_FA_RECEIPT "\xef\x95\x83" // U+f543
#define ICON_FA_RECORD_VINYL "\xef\xa3\x99" // U+f8d9 #define ICON_FA_RECORD_VINYL "\xef\xa3\x99" // U+f8d9
#define ICON_FA_RECORDING "\xef\xa3\x9a" // U+f8da
#define ICON_FA_RECYCLE "\xef\x86\xb8" // U+f1b8 #define ICON_FA_RECYCLE "\xef\x86\xb8" // U+f1b8
#define ICON_FA_REDO "\xef\x80\x9e" // U+f01e #define ICON_FA_REDO "\xef\x80\x9e" // U+f01e
#define ICON_FA_REDO_ALT "\xef\x8b\xb9" // U+f2f9 #define ICON_FA_REDO_ALT "\xef\x8b\xb9" // U+f2f9

1
3rdparty/include/IconsPromptFont.h vendored
View File

@ -343,6 +343,7 @@
#define ICON_PF_POPN_RED "\xE2\x8B\x88" #define ICON_PF_POPN_RED "\xE2\x8B\x88"
#define ICON_PF_SLOW_MOTION "\xE2\x8D\xBA" #define ICON_PF_SLOW_MOTION "\xE2\x8D\xBA"
#define ICON_PF_CONTROLLER_VIBRATION "\xE2\x88\x9A" #define ICON_PF_CONTROLLER_VIBRATION "\xE2\x88\x9A"
#define ICON_PF_CIRCLE "\xE2\x8D\x89"
#define ICON_PF_USB "\xE2\x8D\x9A" #define ICON_PF_USB "\xE2\x8D\x9A"
#define ICON_PF_MICROCHIP_ALT "\xE2\x8D\x9D" #define ICON_PF_MICROCHIP_ALT "\xE2\x8D\x9D"
#define ICON_PF_MICROCHIP "\xE2\x8D\x9E" #define ICON_PF_MICROCHIP "\xE2\x8D\x9E"

25
3rdparty/promptfont/promptfont.sfd vendored
View File

@ -23,7 +23,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0 OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0 OS2_UseTypoMetrics: 0
CreationTime: 1544355305 CreationTime: 1544355305
ModificationTime: 1708442685 ModificationTime: 1709506515
PfmFamily: 33 PfmFamily: 33
TTFWeight: 400 TTFWeight: 400
TTFWidth: 5 TTFWidth: 5
@ -65,7 +65,7 @@ NameList: AGL For New Fonts
DisplaySize: -48 DisplaySize: -48
AntiAlias: 1 AntiAlias: 1
FitToEm: 0 FitToEm: 0
WinInfo: 8778 38 14 WinInfo: 8816 38 14
BeginPrivate: 8 BeginPrivate: 8
BlueValues 29 [0 0 380 380 490 490 660 660] BlueValues 29 [0 0 380 380 490 490 660 660]
OtherBlues 39 [-210 -210 -180 -180 -160 -160 280 280] OtherBlues 39 [-210 -210 -180 -180 -160 -160 280 280]
@ -77,7 +77,7 @@ StemSnapV 13 [140 180 200]
ForceBold 4 true ForceBold 4 true
EndPrivate EndPrivate
TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 TeXData: 1 0 0 335544 167772 111848 513802 1048576 111848 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
BeginChars: 1114112 730 BeginChars: 1114112 731
StartChar: exclam StartChar: exclam
Encoding: 33 33 0 Encoding: 33 33 0
@ -35163,7 +35163,7 @@ SplineSet
271.154296875 368.845703125 278.845703125 347.692382812 296.154296875 347.692382812 c 2 271.154296875 368.845703125 278.845703125 347.692382812 296.154296875 347.692382812 c 2
934.615234375 347.692382812 l 2 934.615234375 347.692382812 l 2
EndSplineSet EndSplineSet
Validated: 524321 Validated: 33
EndChar EndChar
StartChar: uni235B StartChar: uni235B
@ -35250,6 +35250,23 @@ SplineSet
684.724609375 425.833984375 l 1 684.724609375 425.833984375 l 1
684.724609375 600.990234375 l 2x84 684.724609375 600.990234375 l 2x84
EndSplineSet EndSplineSet
Validated: 1
EndChar
StartChar: uni2349
Encoding: 9033 9033 730
Width: 1000
HStem: -168.333 916.666<363.706 636.294>
VStem: 41.667 916.666<153.706 426.294>
LayerCount: 2
Fore
SplineSet
41.6669921875 290 m 0
41.6669921875 543.130859375 246.869140625 748.333007812 500 748.333007812 c 0
753.130859375 748.333007812 958.333007812 543.130859375 958.333007812 290 c 0
958.333007812 36.869140625 753.130859375 -168.333007812 500 -168.333007812 c 0
246.869140625 -168.333007812 41.6669921875 36.869140625 41.6669921875 290 c 0
EndSplineSet
Validated: 524289 Validated: 524289
EndChar EndChar
EndChars EndChars

BIN
bin/resources/fonts/promptfont.otf
View File

Binary file not shown.

4
pcsx2/ImGui/ImGuiManager.cpp
View File

@ -488,8 +488,8 @@ ImFont* ImGuiManager::AddFixedFont(float size)
bool ImGuiManager::AddIconFonts(float size) bool ImGuiManager::AddIconFonts(float size)
{ {
// clang-format off // 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,0xf7c2,0xf7c2,0xf815,0xf815,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8da,0xf8da,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,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,0xf7c2,0xf7c2,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,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 }; 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 // clang-format on
{ {

4
pcsx2/ImGui/ImGuiOverlays.cpp
View File

@ -634,7 +634,7 @@ __ri void ImGuiManager::DrawInputRecordingOverlay(float& position_y, float scale
// Status Indicators // Status Indicators
if (g_InputRecording.getControls().isRecording()) if (g_InputRecording.getControls().isRecording())
{ {
DRAW_LINE(standard_font, TinyString::from_fmt(TRANSLATE_FS("ImGuiOverlays", "{} Recording Input"), ICON_FA_RECORDING).c_str(), IM_COL32(255, 0, 0, 255)); DRAW_LINE(standard_font, TinyString::from_fmt(TRANSLATE_FS("ImGuiOverlays", "{} Recording Input"), ICON_PF_CIRCLE).c_str(), IM_COL32(255, 0, 0, 255));
} }
else else
{ {
@ -658,7 +658,7 @@ __ri void ImGuiManager::DrawVideoCaptureOverlay(float& position_y, float scale,
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_RECORDING; static constexpr const char* ICON = ICON_PF_CIRCLE;
const TinyString text_msg = TinyString::from_fmt(" {}", GSCapture::GetElapsedTime()); const TinyString text_msg = TinyString::from_fmt(" {}", GSCapture::GetElapsedTime());
const ImVec2 icon_size = standard_font->CalcTextSizeA(standard_font->FontSize, std::numeric_limits<float>::max(), const ImVec2 icon_size = standard_font->CalcTextSizeA(standard_font->FontSize, std::numeric_limits<float>::max(),
-1.0f, ICON, nullptr, nullptr); -1.0f, ICON, nullptr, nullptr);