Qt: Add Popn icon to Input OSD

This commit is contained in:
KamFretoZ 2024-01-05 20:34:41 +07:00 committed by refractionpcsx2
parent a14376abb6
commit 150d8d3214
5 changed files with 135 additions and 119 deletions

View File

@ -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"

Binary file not shown.

View File

@ -2,109 +2,111 @@
<svg id="Musica_pop" data-name="Musica pop" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 840 550">
<defs>
<style>
.cls-1 {
opacity: .18;
}
.cls-2 {
.cls-1, .cls-2, .cls-3, .cls-4 {
fill: #fff;
}
.cls-3 {
.cls-5 {
fill: #ffcf1f;
}
.cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8, .cls-9, .cls-10, .cls-11, .cls-12, .cls-13, .cls-14, .cls-15 {
.cls-5, .cls-6, .cls-7, .cls-8, .cls-9, .cls-10, .cls-11, .cls-12, .cls-13, .cls-14, .cls-15, .cls-16, .cls-17 {
stroke-miterlimit: 10;
}
.cls-3, .cls-6, .cls-7, .cls-8, .cls-10, .cls-11, .cls-12, .cls-13 {
stroke-width: 3px;
}
.cls-3, .cls-6, .cls-7, .cls-8, .cls-11, .cls-12, .cls-13 {
.cls-5, .cls-8, .cls-9, .cls-10, .cls-12, .cls-13, .cls-14 {
stroke: #4d4d4d;
}
.cls-4 {
stroke: #ff553f;
}
.cls-4, .cls-5, .cls-9, .cls-10, .cls-14, .cls-15 {
fill: none;
}
.cls-4, .cls-5, .cls-9, .cls-14, .cls-15 {
stroke-width: 17px;
}
.cls-5 {
stroke: #109400;
}
.cls-6 {
fill: #f40600;
}
.cls-8 {
fill: #0028b4;
}
.cls-16 {
fill: #bdbdbd;
}
.cls-9 {
stroke: #0052f4;
}
.cls-10 {
stroke: #8a8a8a;
}
.cls-11 {
fill: #f0f0f0;
}
.cls-12 {
fill: #00741a;
}
.cls-13 {
fill: #f5f5f5;
}
.cls-17 {
opacity: .32;
.cls-5, .cls-8, .cls-9, .cls-10, .cls-12, .cls-13, .cls-14, .cls-17 {
stroke-width: 3px;
}
.cls-18 {
font-family: Roboto-Black, Roboto;
font-size: 12px;
font-weight: 800;
}
.cls-19 {
letter-spacing: -.02em;
}
.cls-14 {
stroke: #ffed9f;
.cls-6 {
stroke: #ff553f;
}
.cls-20 {
.cls-6, .cls-7, .cls-11, .cls-15, .cls-16 {
stroke-width: 17px;
}
.cls-6, .cls-7, .cls-11, .cls-15, .cls-16, .cls-17 {
fill: none;
}
.cls-19 {
letter-spacing: -.06em;
}
.cls-15 {
stroke: #f5f5f5;
.cls-7 {
stroke: #109400;
}
.cls-21 {
.cls-2 {
opacity: .5;
}
.cls-8 {
fill: #f40600;
}
.cls-3 {
opacity: .24;
}
.cls-20 {
letter-spacing: -.01em;
}
.cls-10 {
fill: #0028b4;
}
.cls-21 {
fill: #bdbdbd;
}
.cls-11 {
stroke: #0052f4;
}
.cls-12 {
fill: #f0f0f0;
}
.cls-22 {
opacity: .75;
}
.cls-13 {
fill: #00741a;
}
.cls-14 {
fill: #f5f5f5;
}
.cls-23 {
letter-spacing: 0em;
}
.cls-15 {
stroke: #ffed9f;
}
.cls-16 {
stroke: #f5f5f5;
}
.cls-24 {
opacity: .36;
}
.cls-25 {
fill: #d1d1d1;
stroke: #000;
stroke-linecap: round;
@ -112,72 +114,85 @@
stroke-width: 4px;
}
.cls-23 {
.cls-4 {
opacity: .31;
}
.cls-26 {
fill: #7f001c;
}
.cls-24 {
.cls-27 {
font-family: Roboto-Black, Roboto;
font-size: 13.24px;
font-weight: 800;
}
.cls-28 {
letter-spacing: -.03em;
}
.cls-17 {
opacity: .49;
stroke: #8a8a8a;
}
</style>
</defs>
<g id="By_Maxihplay" data-name="By Maxihplay">
<path id="fundo_controle" data-name="fundo controle" class="cls-22" d="m716.42,472.1H123.58c-51.9,0-82.14-46.22-68.5-99.51l61.63-233.75c8.82-34.45,46.61-60.95,84.85-60.95h436.88c38.25,0,76.03,26.49,84.85,60.95l61.63,233.75c13.64,53.29-16.6,99.51-68.5,99.51Z"/>
<path id="fundo_controle" data-name="fundo controle" class="cls-25" d="m732.99,503.41H107.01c-56.55,0-99.5-59.99-84.64-118.79L96.46,120.83c9.61-38.01,50.78-74.24,92.46-74.24h462.16c41.67,0,82.85,36.23,92.46,74.24l74.09,263.79c14.87,58.8-28.09,118.79-84.64,118.79Z"/>
<g id="sombra_inferior" data-name="sombra inferior">
<path class="cls-16" d="m759.69,284.59l11.51,69.11c13.13,46-15.97,79.9-65.91,79.9H134.86c-49.94,0-79.03-33.89-65.91-79.9l11.78-68.63-23.56,85.8c-13.57,52.25,16.51,97.56,68.12,97.56h589.56c51.61,0,81.68-45.31,68.12-97.56l-23.28-86.27Z"/>
<line class="cls-10" x1="521.91" y1="434.01" x2="318.09" y2="434.01"/>
<path class="cls-21" d="m757.16,177.42l40.52,186.36c8.83,58.35-28.4,86.84-82.82,86.84H125.3c-54.41,0-91.21-34.06-82.82-86.84l40.19-186.36-58.02,205.29c-14.78,57.64,27.99,116.64,84.22,116.64h622.4c56.24,0,99.01-58.99,84.22-116.64l-58.35-205.29Z"/>
<line class="cls-17" x1="531.04" y1="451.07" x2="308.96" y2="451.07"/>
</g>
<g id="botoes_cores" data-name="botoes cores">
<g id="baixo">
<circle class="cls-12" cx="288.13" cy="362.05" r="53.35" transform="translate(-75.47 75.88) rotate(-13.28)"/>
<circle class="cls-6" cx="420" cy="362.05" r="53.35" transform="translate(-132.99 403.03) rotate(-45)"/>
<circle class="cls-12" cx="551.87" cy="362.05" r="53.35" transform="translate(-94.37 496.27) rotate(-45)"/>
<circle class="cls-11" cx="683.74" cy="362.05" r="53.35" transform="translate(-64.89 166.78) rotate(-13.28)"/>
<path class="cls-11" d="m156.26,308.7c-17.62,0-33.24,8.54-42.96,21.71-6.53,8.85-10.39,19.8-10.39,31.65,0,29.46,23.89,53.35,53.35,53.35s53.35-23.89,53.35-53.35-23.89-53.35-53.35-53.35Z"/>
<ellipse class="cls-13" cx="276.31" cy="363.27" rx="58.13" ry="58.86"/>
<ellipse class="cls-8" cx="420" cy="363.27" rx="58.13" ry="58.86"/>
<ellipse class="cls-13" cx="563.69" cy="363.27" rx="58.13" ry="58.86"/>
<ellipse class="cls-12" cx="707.38" cy="363.27" rx="58.13" ry="58.86"/>
<path class="cls-12" d="m132.62,304.41c-19.2,0-36.22,9.42-46.81,23.95-7.12,9.77-11.33,21.84-11.33,34.91,0,32.51,26.03,58.86,58.13,58.86s58.13-26.35,58.13-58.86-26.03-58.86-58.13-58.86Z"/>
</g>
<g id="cima">
<circle class="cls-8" cx="354.07" cy="235.36" r="53.35" transform="translate(-44.6 87.64) rotate(-13.28)"/>
<circle class="cls-8" cx="485.93" cy="235.36" r="53.35" transform="translate(-24.1 412.54) rotate(-45)"/>
<circle class="cls-3" cx="617.8" cy="235.36" r="53.35" transform="translate(14.53 505.79) rotate(-45)"/>
<circle class="cls-3" cx="222.2" cy="235.36" r="53.35" transform="translate(-48.13 57.35) rotate(-13.28)"/>
<ellipse class="cls-10" cx="348.16" cy="223.49" rx="58.13" ry="58.86"/>
<ellipse class="cls-10" cx="491.84" cy="223.49" rx="58.13" ry="58.86"/>
<ellipse class="cls-5" cx="635.53" cy="223.49" rx="58.13" ry="58.86"/>
<ellipse class="cls-5" cx="204.47" cy="223.49" rx="58.13" ry="58.86"/>
</g>
</g>
<g id="brilho">
<g id="brilho_menor" data-name="brilho menor" class="cls-17">
<circle class="cls-15" cx="179.25" cy="370" r="8.58"/>
<circle class="cls-5" cx="311.37" cy="370" r="8.58" transform="translate(-76.68 81.44) rotate(-13.28)"/>
<circle class="cls-4" cx="443.48" cy="370" r="8.58" transform="translate(-73.14 111.79) rotate(-13.28)"/>
<circle class="cls-5" cx="575.6" cy="370" r="8.58" transform="translate(-93.04 515.38) rotate(-45)"/>
<circle class="cls-15" cx="707.71" cy="370.63" r="8.58"/>
<circle class="cls-14" cx="641.66" cy="251.6" r="8.58"/>
<circle class="cls-9" cx="509.54" cy="251.6" r="8.58" transform="translate(-44.18 123.8) rotate(-13.28)"/>
<circle class="cls-9" cx="377.42" cy="251.6" r="8.58" transform="translate(-67.36 340.57) rotate(-45)"/>
<circle class="cls-14" cx="245.31" cy="251.6" r="8.58"/>
<g id="brilho_menor" data-name="brilho menor" class="cls-24">
<ellipse class="cls-16" cx="157.67" cy="372.04" rx="9.35" ry="9.47"/>
<ellipse class="cls-7" cx="301.63" cy="372.04" rx="9.35" ry="9.47"/>
<ellipse class="cls-6" cx="445.59" cy="372.04" rx="9.35" ry="9.47"/>
<ellipse class="cls-7" cx="589.55" cy="372.04" rx="9.35" ry="9.47"/>
<ellipse class="cls-16" cx="733.5" cy="372.74" rx="9.35" ry="9.47"/>
<ellipse class="cls-15" cx="661.52" cy="241.42" rx="9.35" ry="9.47"/>
<ellipse class="cls-11" cx="517.57" cy="241.42" rx="9.35" ry="9.47"/>
<ellipse class="cls-11" cx="373.61" cy="241.42" rx="9.35" ry="9.47"/>
<ellipse class="cls-15" cx="229.65" cy="241.42" rx="9.35" ry="9.47"/>
</g>
<g id="brilho_maior" data-name="brilho maior" class="cls-1">
<circle class="cls-2" cx="182.25" cy="372" r="8.58"/>
<circle class="cls-2" cx="314.37" cy="372" r="8.58" transform="translate(-77.06 82.18) rotate(-13.28)"/>
<circle class="cls-2" cx="446.48" cy="372" r="8.58" transform="translate(-73.52 112.53) rotate(-13.28)"/>
<circle class="cls-2" cx="578.6" cy="372" r="8.58" transform="translate(-93.57 518.09) rotate(-45)"/>
<circle class="cls-2" cx="710.71" cy="372.63" r="8.58"/>
<circle class="cls-2" cx="644.66" cy="253.6" r="8.58"/>
<circle class="cls-2" cx="512.54" cy="253.6" r="8.58" transform="translate(-44.55 124.54) rotate(-13.28)"/>
<circle class="cls-2" cx="380.42" cy="253.6" r="8.58" transform="translate(-67.9 343.28) rotate(-45)"/>
<circle class="cls-2" cx="248.31" cy="253.6" r="8.58"/>
<g id="brilho_maior" data-name="brilho maior" class="cls-22">
<ellipse class="cls-1" cx="160.94" cy="374.24" rx="9.35" ry="9.47"/>
<ellipse class="cls-3" cx="304.9" cy="374.24" rx="9.35" ry="9.47"/>
<ellipse class="cls-3" cx="448.86" cy="374.24" rx="9.35" ry="9.47"/>
<ellipse class="cls-3" cx="592.81" cy="374.24" rx="9.35" ry="9.47"/>
<ellipse class="cls-1" cx="736.77" cy="374.95" rx="9.35" ry="9.47"/>
<ellipse class="cls-2" cx="664.79" cy="243.62" rx="9.35" ry="9.47"/>
<ellipse class="cls-4" cx="520.84" cy="243.62" rx="9.35" ry="9.47"/>
<ellipse class="cls-4" cx="376.88" cy="243.62" rx="9.35" ry="9.47"/>
<ellipse class="cls-2" cx="232.92" cy="243.62" rx="9.35" ry="9.47"/>
</g>
</g>
<g id="botoes_gota" data-name="botoes gota">
<g id="sombra">
<path id="B" class="cls-7" d="m320.13,118.15c-6.48-1.76-12.86,1-15.12,9.45-2.61,9.71,3.91,32.34,3.91,32.34,0,0,16.95-16.26,19.56-25.97,1.86-6.94-1.86-14.06-8.35-15.82Z"/>
<path id="A" class="cls-7" d="m263.87,144.12c-1.86,6.94,1.86,14.06,8.35,15.82,6.48,1.76,12.86-1,15.12-9.45,2.61-9.71-3.91-32.34-3.91-32.34,0,0-16.95,16.26-19.56,25.97Z"/>
</g>
<g id="botao">
<path id="B-2" data-name="B" class="cls-13" d="m320.13,113.55c-6.48-1.76-12.86,1-15.12,9.45-2.61,9.71,3.91,32.34,3.91,32.34,0,0,16.95-16.26,19.56-25.97,1.86-6.94-1.86-14.06-8.35-15.82Z"/>
<path id="A-2" data-name="A" class="cls-13" d="m263.87,139.52c-1.86,6.94,1.86,14.06,8.35,15.82,6.48,1.76,12.86-1,15.12-9.45,2.61-9.71-3.91-32.34-3.91-32.34,0,0-16.95,16.26-19.56,25.97Z"/>
<path id="B" class="cls-9" d="m319.86,101.2c-4.93-3.86-15.2-.94-20.32,6.55-4.61,6.75-7.36,23.1-8.33,29.84-.19,1.33,1.02,2.27,2.16,1.66,5.72-3.04,19.42-10.78,24.03-17.53,4.21-6.15,7.4-16.67,2.47-20.53Z"/>
<path id="B-2" data-name="B" class="cls-14" d="m317.84,99.05c-4.93-3.86-11.46-3.28-16.58,4.21-4.02,5.88-6.62,19.05-7.87,26.8-.43,2.67,2.02,4.55,4.28,3.3,6.53-3.62,17.43-10.25,21.44-16.12,4.21-6.15,3.66-14.32-1.27-18.18Z"/>
<path id="A" class="cls-9" d="m246.17,118.73c-4.21,6.15-3.66,14.32,1.27,18.18,4.93,3.86,11.46,3.28,16.58-4.21,4.76-6.97,7.54-24.16,8.42-30.46.14-1-.91-1.74-1.81-1.27-5.43,2.86-19.73,10.84-24.46,17.76Z"/>
<path id="A-2" data-name="A" class="cls-14" d="m246.89,114.24c-4.21,6.15-3.66,14.32,1.27,18.18,4.93,3.86,11.46,3.28,16.58-4.21,4.35-6.36,7.04-21.23,8.15-28.57.29-1.89-1.44-3.22-3.05-2.35-6.21,3.36-18.61,10.6-22.95,16.95Z"/>
</g>
</g>
<text class="cls-18" transform="translate(222.2 113.55)"><tspan x="0" y="0">SELE</tspan><tspan class="cls-21" x="27.45" y="0">C</tspan><tspan class="cls-24" x="35.15" y="0">T</tspan></text>
<text class="cls-18" transform="translate(335.17 159.94)"><tspan x="0" y="0">S</tspan><tspan class="cls-20" x="7.51" y="0">T</tspan><tspan x="14.37" y="0">A</tspan><tspan class="cls-19" x="22.55" y="0">R</tspan><tspan class="cls-24" x="30.08" y="0">T</tspan></text>
<path id="marca" class="cls-23" d="m619,112.15l-31.06,30.76c-5.12,5.07-12.87,8.02-21.07,8.02h-114.8v-38.78h166.93Z"/>
<text class="cls-27" transform="translate(202.5 90.95) scale(.99 1)"><tspan x="0" y="0">SELE</tspan><tspan class="cls-20" x="30.28" y="0">C</tspan><tspan class="cls-28" x="38.78" y="0">T</tspan></text>
<text class="cls-27" transform="translate(325.6 142.14) scale(.99 1)"><tspan x="0" y="0">S</tspan><tspan class="cls-19" x="8.29" y="0">T</tspan><tspan class="cls-23" x="15.86" y="0">A</tspan><tspan class="cls-18" x="24.88" y="0">R</tspan><tspan class="cls-28" x="33.19" y="0">T</tspan></text>
<path id="marca" class="cls-26" d="m634.86,89.41l-33.84,33.94c-5.57,5.59-14.02,8.85-22.96,8.85h-125.09l2-42.78h179.89Z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

@ -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
{

View File

@ -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()
{