From 150d8d3214661d43df9b8e1d45b86376c6292faf Mon Sep 17 00:00:00 2001 From: KamFretoZ <14798312+kamfretoz@users.noreply.github.com> Date: Fri, 5 Jan 2024 20:34:41 +0700 Subject: [PATCH] Qt: Add Popn icon to Input OSD --- 3rdparty/include/IconsPromptFont.h | 1 + bin/resources/fonts/promptfont.otf | Bin 211172 -> 212272 bytes pcsx2-qt/resources/images/Popn.svg | 249 +++++++++++++++-------------- pcsx2/ImGui/ImGuiManager.cpp | 2 +- pcsx2/SIO/Pad/PadPopn.cpp | 2 +- 5 files changed, 135 insertions(+), 119 deletions(-) diff --git a/3rdparty/include/IconsPromptFont.h b/3rdparty/include/IconsPromptFont.h index 17fe5def7e..35fb26e4ba 100644 --- a/3rdparty/include/IconsPromptFont.h +++ b/3rdparty/include/IconsPromptFont.h @@ -330,6 +330,7 @@ #define ICON_PF_ACHIEVEMENTS_PROGRESSION "\xE2\x8E\xB2" #define ICON_PF_ACHIEVEMENTS_MISSABLE "\xE2\x8E\xB3" #define ICON_PF_ACHIEVEMENTS_WIN "\xE2\x8E\xB4" +#define ICON_PF_POPN_CONTROLLER "\xE2\x8A\xBF" #define ICON_PF_POPN_BLUE_LEFT "\xE2\x8B\x80" #define ICON_PF_POPN_BLUE_RIGHT "\xE2\x8B\x81" #define ICON_PF_POPN_GREEN_LEFT "\xE2\x8B\x82" diff --git a/bin/resources/fonts/promptfont.otf b/bin/resources/fonts/promptfont.otf index 5bf2041c16148117a23f533226ff5ae7c9f7058e..4a61fa10f736244019378deca4c888143473ed51 100644 GIT binary patch delta 30930 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

N9f)Vf@|d!2Xc zB-OcD_q&+JG4o=!#oVr!t6trD4eG6q%^O=H))d?w@z$*qfJyB zQ=7$Y{o8hIJGSjtZGUc?+OC^p#3^w!Ak04(Hj?qtD%o}-{@AJ$eZT1ByE}6@x?UDz zqbwPp4x=xLxjwa(%yi$M?SgR{!Ri=fh`Nai*tP9cKf59u!v(RrHAn oIrm=sq747C{{O#@z)C**a&V)1uDVY}_4n#N0gm7rK1cZf0e#m#q5uE@ delta 29993 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 - + - - + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + - SELECT - START - + SELECT + START + \ No newline at end of file diff --git a/pcsx2/ImGui/ImGuiManager.cpp b/pcsx2/ImGui/ImGuiManager.cpp index 35774925a6..41d7fdbc72 100644 --- a/pcsx2/ImGui/ImGuiManager.cpp +++ b/pcsx2/ImGui/ImGuiManager.cpp @@ -485,7 +485,7 @@ 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,0xf01c,0xf01c,0xf021,0xf021,0xf023,0xf023,0xf025,0xf025,0xf027,0xf028,0xf02e,0xf02e,0xf030,0xf030,0xf03a,0xf03a,0xf03d,0xf03d,0xf04a,0xf04c,0xf04e,0xf04e,0xf050,0xf050,0xf052,0xf052,0xf059,0xf059,0xf05e,0xf05e,0xf063,0xf063,0xf065,0xf065,0xf067,0xf067,0xf06a,0xf06a,0xf071,0xf071,0xf077,0xf078,0xf07b,0xf07c,0xf084,0xf085,0xf091,0xf091,0xf0ac,0xf0ad,0xf0b0,0xf0b0,0xf0c5,0xf0c5,0xf0c7,0xf0c9,0xf0cb,0xf0cb,0xf0d0,0xf0d0,0xf0dc,0xf0dc,0xf0e2,0xf0e2,0xf0eb,0xf0eb,0xf0f1,0xf0f1,0xf0f3,0xf0f3,0xf0fe,0xf0fe,0xf110,0xf110,0xf119,0xf119,0xf11b,0xf11c,0xf121,0xf121,0xf133,0xf133,0xf140,0xf140,0xf144,0xf144,0xf14a,0xf14a,0xf15b,0xf15b,0xf15d,0xf15d,0xf188,0xf188,0xf191,0xf192,0xf1c9,0xf1c9,0xf1dd,0xf1de,0xf1e6,0xf1e6,0xf1ea,0xf1eb,0xf1f8,0xf1f8,0xf1fc,0xf1fc,0xf242,0xf242,0xf245,0xf245,0xf26c,0xf26c,0xf279,0xf279,0xf2d0,0xf2d0,0xf2db,0xf2db,0xf2f2,0xf2f2,0xf2f5,0xf2f5,0xf302,0xf302,0xf3c1,0xf3c1,0xf3fd,0xf3fd,0xf410,0xf410,0xf466,0xf466,0xf500,0xf500,0xf517,0xf517,0xf51f,0xf51f,0xf543,0xf543,0xf545,0xf545,0xf547,0xf548,0xf552,0xf552,0xf56d,0xf56d,0xf5a2,0xf5a2,0xf5e7,0xf5e7,0xf65d,0xf65e,0xf6a9,0xf6a9,0xf756,0xf756,0xf7c2,0xf7c2,0xf807,0xf807,0xf815,0xf815,0xf818,0xf818,0xf84c,0xf84c,0xf8cc,0xf8cc,0xf8d9,0xf8d9,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,0x227a,0x227d,0x22c0,0x22c8,0x23b2,0x23b4,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,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,0x227a,0x227d,0x22bf,0x22c8,0x23b2,0x23b4,0x23f4,0x23f7,0x2427,0x243a,0x243c,0x243c,0x2443,0x2443,0x2460,0x246b,0x24f5,0x24fd,0x24ff,0x24ff,0x278a,0x278e,0xe001,0xe001,0xff21,0xff3a,0x0,0x0 }; // clang-format on { diff --git a/pcsx2/SIO/Pad/PadPopn.cpp b/pcsx2/SIO/Pad/PadPopn.cpp index dcfbae8ee2..2471fe296e 100644 --- a/pcsx2/SIO/Pad/PadPopn.cpp +++ b/pcsx2/SIO/Pad/PadPopn.cpp @@ -29,7 +29,7 @@ static const InputBindingInfo s_bindings[] = { }; const Pad::ControllerInfo PadPopn::ControllerInfo = {Pad::ControllerType::Popn, "Popn", - TRANSLATE_NOOP("Pad", "Pop'n Music"), ICON_PF_GAMEPAD, s_bindings, {}, Pad::VibrationCapabilities::NoVibration}; + TRANSLATE_NOOP("Pad", "Pop'n Music"), ICON_PF_POPN_CONTROLLER, s_bindings, {}, Pad::VibrationCapabilities::NoVibration}; void PadPopn::ConfigLog() {