From 3874f1f77a15cca06259d9a70f3f5e12bf8bd34c Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 24 Jan 2021 02:31:38 +0100 Subject: [PATCH] HighDPI actions UI icons. --- Content.Client/UserInterface/ActionsUI.cs | 22 +++--- Resources/Textures/Interface/Nano/gear.svg | 59 ++++++++++++++- .../Interface/Nano/gear.svg.192dpi.png | Bin 0 -> 1460 bytes .../Interface/Nano/gear.svg.192dpi.png.yml | 2 + .../Textures/Interface/Nano/gear.svg.png | Bin 612 -> 0 bytes .../Textures/Interface/Nano/left_arrow.svg | 67 ++++++++++++++++- .../Interface/Nano/left_arrow.svg.192dpi.png | Bin 0 -> 736 bytes .../Nano/left_arrow.svg.192dpi.png.yml | 2 + .../Interface/Nano/left_arrow.svg.png | Bin 395 -> 0 bytes .../Interface/Nano/lock.svg.192dpi.png | Bin 0 -> 869 bytes .../Interface/Nano/lock.svg.192dpi.png.yml | 2 + .../Textures/Interface/Nano/lock.svg.png | Bin 446 -> 0 bytes .../Interface/Nano/lock_open.svg.192dpi.png | Bin 0 -> 915 bytes .../Nano/lock_open.svg.192dpi.png.yml | 2 + .../Textures/Interface/Nano/lock_open.svg.png | Bin 557 -> 0 bytes .../Textures/Interface/Nano/right_arrow.svg | 70 +++++++++++++++++- .../Interface/Nano/right_arrow.svg.192dpi.png | Bin 0 -> 850 bytes .../Nano/right_arrow.svg.192dpi.png.yml | 2 + .../Interface/Nano/right_arrow.svg.png | Bin 449 -> 0 bytes 19 files changed, 213 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/Interface/Nano/gear.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/gear.svg.192dpi.png.yml delete mode 100644 Resources/Textures/Interface/Nano/gear.svg.png create mode 100644 Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png.yml delete mode 100644 Resources/Textures/Interface/Nano/left_arrow.svg.png create mode 100644 Resources/Textures/Interface/Nano/lock.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/lock.svg.192dpi.png.yml delete mode 100644 Resources/Textures/Interface/Nano/lock.svg.png create mode 100644 Resources/Textures/Interface/Nano/lock_open.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/lock_open.svg.192dpi.png.yml delete mode 100644 Resources/Textures/Interface/Nano/lock_open.svg.png create mode 100644 Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png create mode 100644 Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png.yml delete mode 100644 Resources/Textures/Interface/Nano/right_arrow.svg.png diff --git a/Content.Client/UserInterface/ActionsUI.cs b/Content.Client/UserInterface/ActionsUI.cs index c0c6085279..2c275398e7 100644 --- a/Content.Client/UserInterface/ActionsUI.cs +++ b/Content.Client/UserInterface/ActionsUI.cs @@ -122,23 +122,25 @@ namespace Content.Client.UserInterface hotbarContainer.AddChild(settingsContainer); settingsContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1 }); - _lockTexture = resourceCache.GetTexture("/Textures/Interface/Nano/lock.svg.png"); - _unlockTexture = resourceCache.GetTexture("/Textures/Interface/Nano/lock_open.svg.png"); + _lockTexture = resourceCache.GetTexture("/Textures/Interface/Nano/lock.svg.192dpi.png"); + _unlockTexture = resourceCache.GetTexture("/Textures/Interface/Nano/lock_open.svg.192dpi.png"); _lockButton = new TextureButton { TextureNormal = _unlockTexture, SizeFlagsHorizontal = SizeFlags.ShrinkCenter, SizeFlagsVertical = SizeFlags.ShrinkCenter, - SizeFlagsStretchRatio = 1 + SizeFlagsStretchRatio = 1, + Scale = (0.5f, 0.5f) }; settingsContainer.AddChild(_lockButton); settingsContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 2 }); _settingsButton = new TextureButton { - TextureNormal = resourceCache.GetTexture("/Textures/Interface/Nano/gear.svg.png"), + TextureNormal = resourceCache.GetTexture("/Textures/Interface/Nano/gear.svg.192dpi.png"), SizeFlagsHorizontal = SizeFlags.ShrinkCenter, SizeFlagsVertical = SizeFlags.ShrinkCenter, - SizeFlagsStretchRatio = 1 + SizeFlagsStretchRatio = 1, + Scale = (0.5f, 0.5f) }; settingsContainer.AddChild(_settingsButton); settingsContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1 }); @@ -160,10 +162,11 @@ namespace Content.Client.UserInterface _loadoutContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1 }); var previousHotbarIcon = new TextureRect() { - Texture = resourceCache.GetTexture("/Textures/Interface/Nano/left_arrow.svg.png"), + Texture = resourceCache.GetTexture("/Textures/Interface/Nano/left_arrow.svg.192dpi.png"), SizeFlagsHorizontal = SizeFlags.ShrinkCenter, SizeFlagsVertical = SizeFlags.ShrinkCenter, - SizeFlagsStretchRatio = 1 + SizeFlagsStretchRatio = 1, + TextureScale = (0.5f, 0.5f) }; _loadoutContainer.AddChild(previousHotbarIcon); _loadoutContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 2 }); @@ -176,10 +179,11 @@ namespace Content.Client.UserInterface _loadoutContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 2 }); var nextHotbarIcon = new TextureRect { - Texture = resourceCache.GetTexture("/Textures/Interface/Nano/right_arrow.svg.png"), + Texture = resourceCache.GetTexture("/Textures/Interface/Nano/right_arrow.svg.192dpi.png"), SizeFlagsHorizontal = SizeFlags.ShrinkCenter, SizeFlagsVertical = SizeFlags.ShrinkCenter, - SizeFlagsStretchRatio = 1 + SizeFlagsStretchRatio = 1, + TextureScale = (0.5f, 0.5f) }; _loadoutContainer.AddChild(nextHotbarIcon); _loadoutContainer.AddChild(new Control { SizeFlagsHorizontal = SizeFlags.FillExpand, SizeFlagsStretchRatio = 1 }); diff --git a/Resources/Textures/Interface/Nano/gear.svg b/Resources/Textures/Interface/Nano/gear.svg index ccb451d706..a4b4256d6e 100644 --- a/Resources/Textures/Interface/Nano/gear.svg +++ b/Resources/Textures/Interface/Nano/gear.svg @@ -1,3 +1,58 @@ - - + + + + + + image/svg+xml + + + + + + + diff --git a/Resources/Textures/Interface/Nano/gear.svg.192dpi.png b/Resources/Textures/Interface/Nano/gear.svg.192dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..90d434da82eea1e82292531ba2969e72a3904e5b GIT binary patch literal 1460 zcmV;l1xxygP)XVAKw3den*FAZF*W%HgZwNZKf4iC2+u@>y5}sRdxWQF9oPiKYGXl zA2%IjIZy>GOxfCwqCkmcW}zzYm(ZYFVUH2^f;p~2w>ljoXcg#OkXgXcL28`EP@PKD z{?Kpat)W$|+eYf&Y#O9UFX)DBWp-Wb>Ln)&WH!c9?Kj}N7J-FDYE|Oc3QX@e2Fy_0 zrdvQ>DNx`KMIUXpb)ADiUr-{MsaNGKqG!vA=;KX|bvp|JflA!AZ2`i!?Ou>=@Wjm!@pp=AaXCmx*R8dshItyrIbAOMwAsYOLES@M_3D9EK?X1jBlV zJxu=k+TUzzKD-o|ew`U^T7csLYl^k)Q^UE)jZsw|3~q8Fvc6CwYtxf_q#l@{qFvca zw|U*m^{2wQ*H$h%9ZP05iL$oe%ZWb+=nCfKd{Jw1Ue#pd{AyLH1{MP&`ZA}xukIQB z=CWnI;U*0>Gtr6CTWK6`27Ow~39KHb%;TTW|YFw1r6011| zd|P15r%|T0)&OG)j5#MBe;9zK#@g*36{8fL1*`=A3|Gt%ksGRk;PLi*6`sTBUENprjBJiCI(%XJtbMWv=ma|Bw(WM%C;C1bR(aOk59}l) zYiqu8DCZQAyae6(#b~BPvaCn|?6_dQsMPjPN;g7`U!j7hs2nYp{0lFNH$!ru4nyWSzo2 zgHZ2F+1lBWKmdtkdbX;3PX6p=8F;{Qf*eqEp9n`mdmJ)WRI9)|06ICMdALruhq=w# zMMnz)0mPDRFNo>}kdHBLz305YecUeK#zC&Om^wYo0w@06s4b1fayT4AW;P(D~NJVBJRe?WPA!$0jUb24lGv?bzr&zYsS9FHVHp0 zcV&)E`((_J1hD`f@PJk7nS_Rnd0xgXQ3*AuM|iY@zA>lNH%2l=|E#wGN5?`a}Z(b;F#A9-v}h-9FJ=SEoRXdoeW=6|ci^ zB|p2SjTN^k)U=5R@K1Bye)se|;qR8`uDrU}i?GOF*a5e%j=8ws2n*k;V`-~K)-}3TA zS_`0zVLSyNUu@4r>wW*7Z44rls9Ogs20*Y$#c_bC%4!5rXBZSx)IWRF&sK@-8!X*B z-#5xm)E#dNd@4LEv^Mc}w46x0GL%+jJBt(*%ol6^Fery-G6@JT_(>{mWr z*aG}vdq?)DA^Imo4<^Y=t=ujFaOVB?dqhN^*y|t{XvcH2)J@x-!KuFL2)E?>7+K(* z)AxyX;NS%X(`)S0OQM_wmAS%Hq}u+alq)g`gYYdDGda>}?Z6+3kO{v2JJgMg+E$6S yVJblG*ZVPn8WtJ#%3l=(9sskDe*kQT0&W3)neCmX&TGd20000 - + + + + + + image/svg+xml + + + + + + + + diff --git a/Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png b/Resources/Textures/Interface/Nano/left_arrow.svg.192dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..6539a6cb7d0e7c60a8f2219f998a128717a8ff66 GIT binary patch literal 736 zcmV<60w4W}P)@A0yQkHpW<)#isKjav#`LRfC>b`jkKl8ME`#dn8* zW16Ef2qW1Abp{6`a}WXCVtmC0#-#UpD!uqzqENZ=d@(@BT@(JYT3%TLW1iM#{rRh& zuW?{|o}Lm*y84a%s$Bk>J&4BKR?nZGQZ$tppB1DtXiXoeM10i>9Oq%PT7d_kXY!N} zI_`UNV_?9ZsYJM>fiaJEcxv^kat#OopiF3Bu_I|Ne^`(3GK2Q^(O~25pzZl2fSoyA zzM&dT#=}oQbR*&bmSe_FH|_~eB8=w6e+%5JwHBI_@yO%Nh(qZnS9L#G{U-c+=7)C} zCvH)XgixzJ>mG+E${sCLBTk@uB~I>v2LUtj)XPz)%JDJ8}< zTy{*$8Wa$Xxvk_b+5S8=E6AN1>+7&FCR>TYnm0MoXFm&C_058G0&_rvqAAbc_t7zK zOSwwQRJP00009a7bBm000#! z000#!0ilZzLjV8(8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10T@X{ zK~yM_m6E+m15pr#&)nV3N-PCQVWX&xmE;v{^cloRlnB-llDIcqSH(_=R>Az*iLa11 zu(pa=SP6Dk!n*fZh>}3EF;jns;X5;ee@+mzS17!cNno*fH#?J#jtD6M@YQ&fQqj#F zKmGM=AzJ|V0AS<>tvgvO_8O2ykj8Uf8=qKMa;)mRgP<|(Ohleo+8hLRPrOZIwm$%% zWEubf7XS){x;LLm9Y&TRz(++Vdm8ROjoR)8rnNzf8bKeB{qr#YkW|92G?SpAz?sSS z-ru5if!qMRJ+3x;T6fmQ1%_HGm%DQ+6<0wV{79$tfb_CsRe$PQ6E01u=vGcdE&#lc ptcl3|)UPoy@aJc`t16DKz5&E~av}B!%RK-9002ovPDHLkV1jUCp-2D# diff --git a/Resources/Textures/Interface/Nano/lock.svg.192dpi.png b/Resources/Textures/Interface/Nano/lock.svg.192dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..6e30dbb3949823a10afd98c08f6392ca4543d166 GIT binary patch literal 869 zcmV-r1DgDaP)F@$3F(gYR|4RB8P#MXHQj*V+?B18#Ce(E~v7a68-$o1!(=ZuyZBZ0)6R z!hL%VI(K9et&7)}HH^1Vfc>^@PRQvEV8O^@sc3459#8ExsRe+9_ciKA5l*E;0a|RN z-7{_@(Cs_7x}xIP#Ef7O+3Fj1PY@SNhmPRouM`gXN+nZ^r>sp2S5}^!s<6tp;)~Xn zcV!9#Xo6FKOOBm$>(j!aN#VKpZyn`UHYh-IbMzDNG&vS!URu~d$>@UX$QB;T`{5&z znQ38Q@~8$c)R&tpz2nUZDYuigXQm}Qvm0S#2dl;q^Ez8r(Y*pI29N2)cZ7&6&#wNW2I1=L`NUMmEIjqqCdpqstQgIzxo> zd4MI_Xd~B?qk{*_z81*ah@iIvgB3cP>Lb@u>(*MQ$mzgfVBA-v7~Ta23oNwu(wHw1 z^<;5iFi@1xp6b+MEOxFK(S6xWl+C|`!6>y=b*G_QC)( v+ifq^P%3Z-@B%Ws5NYY|>M0Ls{><_d+0*{dYYl{A00000NkvXXu0mjfB-f>( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Nano/lock.svg.192dpi.png.yml b/Resources/Textures/Interface/Nano/lock.svg.192dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Nano/lock.svg.192dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Nano/lock.svg.png b/Resources/Textures/Interface/Nano/lock.svg.png deleted file mode 100644 index 148cc20f5eb2004a815e20c143646362e6804f7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446 zcmV;v0YUzWP)ISl0BtEtYX2A3jlHhJpotH6F5i6#wwL0ZBI>&=XqGy`5SlGkrg!8(|PIpr3F zx0?mNg&~6%3^ESLOTaea?3}qTVgA3$(rPbaeifmK>BC=@+MMg{0gM40jF)=4x17p< z#tOqM+hSEQUj&+DALE?+5px3D5T_6I?gr`pTZp9`>G|DO?j!X8+KC(BG%=~jpaYob oF+B{KZ73JhZz?3PS>8|gU#tm?A;vW8DgXcg07*qoM6N<$f|l*G%m4rY diff --git a/Resources/Textures/Interface/Nano/lock_open.svg.192dpi.png b/Resources/Textures/Interface/Nano/lock_open.svg.192dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..729c820aa07e293fe294ab06a468f1b04cd50d80 GIT binary patch literal 915 zcmV;E18n?>P)PcF=CKV2XiJmYq7!DjXY7J^a44Bw1sU8SiG}y2U z40LJH7!PnVz(N{(G$A1*kjS5de-0i5V+aj;*<#|&h-ACn?VFzmw(M@~>u$IE4)q3$0r$OIn zV!ap``OwZaHyc_g_)D{iVQOvOJD9K(7<>!SUn6Gxfet?PMx&^OFkOs-X>D zvXle%M&*v&aVC@R$K!V(sD{1^O!szcca|6P@7s4Wxvr=C8t`&8R0&KtVC~4g#r!4; zjN$D%Xy}ZLL_q;go!UR=3?qQ6hJs4y?TAhvA%#~K+5$f`J1hVbHho*rA0N##wHz&j zjnKEycIeG!(3;oOysCXszR1Jno5X9Sl6U}fb3v(9utD$Z0vB1gY_PTO-)|Mxj-n4& z%xWm7Z1&tnHST#ZOV;;NQgypTWJfi5L6J|u&5JX?=5oV#8^8w+oL%cD<-7>*v94QMn|W5 zVgr{$c?)>zzazTdOO)S?4J?@6s4+#Kjt#8hevV9JByw!U;PGSW%P7|tS<=;<9l8=5 z7(@fFGKlDx3ip5+gfEK!tQ`c=rqk=R>^ipgqayHe^=n(J@5)?#V84smV&%~j2^4l^ zj^tnLBt(@>_5Chpivo~2oG;Mg!+WI?DCCZ%pD_pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10lG;< zK~y-6jg-4<6j2n$f9K9P!Zt#Pl_3a0K`et!1e*m5A%(SRCQ)LMPDs$~hRg2kN_s8A zMpnolU=cydqw&%B?gX1OTKNDQ!OiYD7MsBAI+MxQ-S2$A`*H7uD`aSCY3)=HotQ@C zjG$k;f4fgtSLc5Z=VaKZ`1UnZ+WrbP?mEIHnsu-Z`+h@2#}o3$|rJxCq3Dc{czXQ@~#0XLr(mvlefI z>|u5}?GH3JYP08t?;y4HH(+2c0N$^aIz;D#o&-QHL<|B{Jc9{pLqQ z9s)lQ9yERYDJz$I=4LHk02cD*xy{E_=s*onw7k61K3fE+=>!N4G{ng()b1d1AFQ}e v`d@&-OM(9Hf!Y*D+(AlR#a=gSbI<+(e+in41SQmE00000NkvXXu0mjfhuriS diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg b/Resources/Textures/Interface/Nano/right_arrow.svg index eff5fdff21..b01f7192fb 100644 --- a/Resources/Textures/Interface/Nano/right_arrow.svg +++ b/Resources/Textures/Interface/Nano/right_arrow.svg @@ -1,3 +1,69 @@ - - + + + + + + image/svg+xml + + + + + + + + diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png b/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..00badb55509603d86755b2c5b1c10d071139f999 GIT binary patch literal 850 zcmV-Y1FigtP)5$i{MI8S9W3DbyZuPiM61#X%@B9d6Sou zNoG0=!8FB1shMX}vMKH&s4M@V8=+LJlu(M&S|}nIVQS)ZGWWQcc}kOtN#FEa9`5~p z_q=m?mtdrJBA=h>=N{oO4yEpETq%appsJ?3FKF|SVG~WiPPn^62_5&cmZc^@2F`Uw&p>yjK31Y@I`(?)cvct??2Yv&34H;Sg zz|G5r;i-LKl1R|*Mtx;$V7hgy=Lv*KU`b$;h@2^g(H8}co=zl)saE&Qmq&Ah-pO|0 za{z-E#M}8GoSH5aPCuMT5OZ9!bLCQQXZu>q&+RPPE9ul+A&ib5JUH2tNDxylWoH-a z_djJw9;gEw1gk#S-*+(xquq%G%eZaW;%qVT-!llKUGV1#u*W*3KMbkX=j#(EPabOA zwcwaW+nl!vu$Ma}4>n^<{z#>=|JQikng#j%On<7Up?G^c-Y@W#cXGI*x$l>+U$sD0 z-L2N<*F+lcVQd62xQ~*yv)tZ);_2VEVtp z|F;9x)0>*!Rm|Jo&IK{xV_N>mc=^q%t2x{q1*)fdmwfu&rkA6@x=#7LH#c~E?2T_% z6CAVR69r+ktLZbB3>j&M%MFYJ8F%g3wT9o;f%mo}2x|dY{HXjT@P67YR8-%&xz^wn z0)fguRpXOZiovSpe!AP>6@m_P;$&!Cv!5jmj)`aRyC8=%?%MWlh6AJ#CR>djtycHU ccQZKVZ}71gCxf)9oB#j-07*qoM6N<$g6D&lL;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png.yml b/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Nano/right_arrow.svg.192dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Interface/Nano/right_arrow.svg.png b/Resources/Textures/Interface/Nano/right_arrow.svg.png deleted file mode 100644 index 4a75a88e761fc9690062eb2543e59c777801e74a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmV;y0Y3hTP)JP00009a7bBm000#6 z000#60kN{bl>h($8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ZvIo zK~yM_jgK))n^6>opL3I_q(gr}9Yhfn95Omc!Tf}7f@0$0U`r(u>izP0iA{8fh;ef8 zOCnCXic9I*p%gL}itgef4pxii9tROb{j|?|-simMU`x@rQmHx2e_{}_UVPgwMH|K9 z*4x(w0AvCslk83%2VvurbI!adbWEpRDNm1q%!1Be``(|{MWZh?0Ekw~)B9I{lS6_Y z;Q4ODXwTZ{U5s!?tu}e_wVZe2WdtNmg5N>7?dIm{-2h_4NIS+4th$+_=S~P*lvPh1 zNP#TIKKBR#RE%CG;}Sv87*NBydVMcw?fmRwWpnf6zb8VWu=A!TeZ8P)5p+LgOuuuv zll%DtLB)p64{)=l$SH>Lip&3ayf6u1I+C$rqXqP->X+(rt_7mcooWC?WEbIA%5)7@ rm-EfI@Lhv)=o5+0D{ksfT<9UU5JYw#j{~@+00000NkvXXu0mjf@59FN