From 233dfd2b2cdcbd8d9f9490146095a6c4c44c4072 Mon Sep 17 00:00:00 2001 From: Daniel Bernard Date: Mon, 8 Oct 2018 20:05:37 -0500 Subject: [PATCH] Switch to smaller charge and battery icons, remove unneeded scale code --- Makefile.pc | 7 ++++++- common/menu.c | 9 ++------- data/battery_icon.bin | Bin 179200 -> 600 bytes data/charging_icon.bin | Bin 158720 -> 540 bytes resources/battery_icon.png | Bin 876 -> 188 bytes resources/charging_icon.png | Bin 3350 -> 380 bytes 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.pc b/Makefile.pc index 78a9870..dad81b1 100644 --- a/Makefile.pc +++ b/Makefile.pc @@ -26,7 +26,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \ build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \ build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o \ build_pc/theme_icon_dark.bin.o build_pc/theme_icon_light.bin.o \ - build_pc/charging_icon.bin.o \ + build_pc/charging_icon.bin.o build_pc/battery_icon.bin.o \ #build_pc/tahoma24.o build_pc/tahoma12.o build_pc/interuimedium20.o build_pc/interuimedium30.o build_pc/interuiregular14.o build_pc/interuiregular18.o gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) `pkg-config freetype2 --cflags` $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ `pkg-config freetype2 --libs` -lm -lz -lconfig -lturbojpeg $(EXTRA_LDFLAGS) -I. -iquote $(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@ @@ -95,6 +95,11 @@ build_pc/charging_icon.bin.o : data/charging_icon.bin @echo $(notdir $<) @$(bin2o) +build_pc/battery_icon.bin.o : data/battery_icon.bin + mkdir -p $(dir $@) + @echo $(notdir $<) + @$(bin2o) + clean: rm -rf build_pc/ test test.* diff --git a/common/menu.c b/common/menu.c index 31657fa..c6b61b2 100644 --- a/common/menu.c +++ b/common/menu.c @@ -337,9 +337,6 @@ void menuStartupPath(void) { } } -uint8_t *charging_icon_small; -uint8_t *battery_icon_small; - void menuStartup(void) { menuScan(rootPath); @@ -349,8 +346,6 @@ void menuStartup(void) { theme_icon_small = downscaleImg(theme_icon_dark_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24); else theme_icon_small = downscaleImg(theme_icon_light_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24); - charging_icon_small = downscaleImg(charging_icon_bin, 155, 256, 9, 15, IMAGE_MODE_RGBA32); - battery_icon_small = downscaleImg(battery_icon_bin, 175, 256, 10, 15, IMAGE_MODE_RGBA32); computeFrontGradient(themeCurrent.frontWaveColor, 280); //menuCreateMsgBox(780, 300, "This is a test"); } @@ -441,9 +436,9 @@ void drawCharge() { int tmpX = GetTextXCoordinate(interuiregular14, 1180, chargeString, 'r'); DrawText(interuiregular14, tmpX - 15, 0 + 47 + 10 + 21, themeCurrent.textColor, chargeString); - drawIcon(1180 - 11, 0 + 47 + 10 + 6, 10, 15, battery_icon_small, themeCurrent.textColor); + drawIcon(1180 - 11, 0 + 47 + 10 + 6, 10, 15, battery_icon_bin, themeCurrent.textColor); if (isCharging) - drawIcon(tmpX - 35, 0 + 47 + 10 + 5, 9, 15, charging_icon_small, themeCurrent.textColor); + drawIcon(tmpX - 32, 0 + 47 + 10 + 6, 9, 15, charging_icon_bin, themeCurrent.textColor); } void drawBackBtn(menu_s* menu, bool emptyDir) { diff --git a/data/battery_icon.bin b/data/battery_icon.bin index 651b502fa76426d7c61ae1cebbf9469439a0bca1..75936fade2be697638ca5fa98bfbaa6fe14aa17a 100644 GIT binary patch literal 600 scmZQzfP>XQ)_*h%5<>@s)XfEI0O9*UjBXxC3?`2*H_FEhuOS;I0MOuyTL1t6 literal 179200 zcmeI(u?>JQ5Cg!>#L%q3c#sT0WhqW^ky0V-*Xt-51U3NS2@>X`)%@uVL*k!jPFK=a+-CR*8fn9bx^72-8 z+07Mo64+(;Pu@KroP3`-pa0eN?_llyWEX2TF6@8-1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=IMl!g81Cev diff --git a/data/charging_icon.bin b/data/charging_icon.bin index ea98019ec9bb72489b52b4dea3cd0febf3b0e76e..634fb1227c5a1cf7160988fe86efbcc4816437ec 100644 GIT binary patch literal 540 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 N&KQ5sq85O_e*q+VlwSY< diff --git a/resources/battery_icon.png b/resources/battery_icon.png index a33daaacd3cc00b1e81732e3f6ccc3014545c008..5c89f729081c6e9519bb40e9b9cb17f8ad138627 100644 GIT binary patch delta 137 zcmaFEwue!%Gr-TCmrII^fq{Y7)59eQNQ2n?9Be@H?*BNxiHedu41(0 zP2Hct($mE;L}OxdfI+am`KEND>s-vH#v`#h{q j@=>|lqjr893O0tfTAIegP?#VkgfK4j`!ENa+CbISV`@ ziy0WTH9(m0V)2}lKtah8*NBqf{Irtt#G+J&^73-M%)IR4`Q0PeEmxB wyv(zYH~ETeq)!l~pLm-_RT2{)BP^84wKb9qFIVic2j&b0Pgg&ebxsLQ0J{i->i_@% diff --git a/resources/charging_icon.png b/resources/charging_icon.png index 279b089448cd6c263e394d3bad9d3adce6263206..22295906675708e3b4b52cd165ce3203c8c046a9 100644 GIT binary patch delta 330 zcmV-Q0k!^?8vFtwiBL{Q4GJ0x0000DNk~Le000090000F2nGNE05-_w4Ur)l3kegs-m@tM#SG&D2_ zY}>YNkFc=tN1Td|9XodF%9ShJ5)u+uu_}s*iCMR6*Dh5C1_lOEQPIN~?#Rl@%3)z) z`Om<>@SlN!;eTair3Q+E>gs9>5fPEUFa^li)z$SbLqkJm0B2A;?AbGI4GoR&R#sLPSWRJIU|`VD(D+tfUT%j|L3MSte13j@ cAuf3UR1R1XV+hFhu>b%707*qoM6N<$g3mdMasU7T delta 3323 zcmXAsdpr}~|HtjtW|+AoX;`A>=h`Gn)23}Mg%63`vJhezMLuK~m*j3p4 zC6&9}79UObBJ^>o$fxh>_t!b^_v7(?p7-m0&ig#h`3cNX+MoEBjky$D2`(lkCS_?s zv=@!}VqyR>*e=nm{2{oNy}FO0B=5@)6UhYiTFqpERJJ*KH<6PGTY(iD;>k_kv_VR=-Lk9IE`9Xdw zeiS=Pec?}R90XqQEF8N4**c>oOTvmrWQ39TfrAVZYX(WEwJu;+y!X=+^j=%u8&W9;RWqp&4^`CZSxp&IsUBV0$a0cv|Y50 zbg!QC+ox_*UCtG*9kH`9@rvxdyyOYj$>rn=VNeXZypK5d&!Ry4vOw0r7Z&O$VpRJ&IKC?%m6pU`T+!xWsp}6mNWC{t^bCYd;zEqp+-KC?}DZ%2QDB zFc8qKeVX23DIOyYd3Ay~<+ZO5!&>fbeT0nB5Rk2}!Ohn~Z12beXI4WTO>eC$)E4RJ zW-%eW_pA#iKSd$DTUvi+a&hOzweoNFABz(lpMAh+9=qv%EJdGH;=a=w$Z$E5E8q>p zc}yypE7^`z`%0YFLY_%qy`4bt*U)N`m zE>dUGuvoVIET{o_?OfD}=TH4hi-z>hGF@ru50WeucJ2(mPdA<09fOmcH<4%(XSm_# zLXeMt#`ti-X6$=R;p&QhV8O2udnL+LiYLTOQ(}s;I z4Z>{?QGVu8DZBCGV7O~lHzC#--i|M!jiST(g;#w8n+X(4VPhl-=X$Lf$giA=uhY0E zs@r0LjSVl^+R;a@@QTdltj{?pM7dFaLGEfeu&A3=-M7s$VsMR|&e_JHuEHjoQU@J` zjug2?vm5AkQS`o|!@NnJ%~ZVPsc;{;o)^#9GjM3>QS+<|=;|A>ntZZeX`|NVT`_e% zfNI}+*xlEp2}!JyLMq*HB5klG?J&=`zko$=Fxm5W`t@LCXPh;@^9VjKa6L*u!J zxUx}lVYLkHAPbeG%5T(_z8!B&mH8g;*#<)a)hmQWfi9Z0sk=5A=BaviX>6+DI2ePp z{`n&v7PeZ?Q#zOrxkfg6k=nfL#Inn{*&}Y~nWt?TD$m+H0x|`n<1Z{K&e3wt=UDz! z+z#Z{%OkKt@KUP16CAoX;|ki(X=*|2`HCQvAr1cG{i@*>wI!tWK;spJ$O>-Be5AO| z8L2|7n&7(k6!*-dOe<&^7*+86lX!S}gE#MXkD&iaeE!8*-L?JJl2zzpc>^ zUNlp)bLh&+61cD^0V2abTM+u%cP2QX@j=(^JURETq@|PJXFgYPSERS=Bt9}9@d|lS zbrOk#R&!rT6{`-PeP-d`7*dg0Tg|f008~aOUNODB<~(^IpCI&>Wqe$JH}lQfK03N= zi(mQVHn&*4rc;6aeLCO@>sn(mrlzQ`$s{?zI+E zP%C>kjMhb}N7Hvk8a=iuw%WMAIhSW_GaWo6ECU|Si9uqp%?tv%+EW?nBcu!Tds-28 z>H9&1-2)oIYC(cqWB>Yy8K?Dv_^2nO01_FZ*T zPGj=yG^@nQ?{-jv1UMf`SCz?`X6-Pm79U$YWsbtZSeJQ8VVYO%rRGt$#GP@y$!Vv1 zs#O2$kZsG%&x;3TrNIfWm*2M(iRzN`mjTk@>z9|#JW#dmfU+K|Bx!`HFAj;3eX53Z zOa2r5Xj1y9;qViBCZl}I1^=2Q)c-BT6IlGyX}Yh8<^-#ZswT~RJqN7DuaM-MQm4i)HXCREDF~CY;7iEVn+sp%q}rcM8RrP z6p%h|>XBz8Jd$8f14N(^7lp(2_*~#zQc8{q2T$>DW`6|L_tQV!{v2SMc*S%xOMP4vc{awX_tNmfN-MGh< zh1Rr_g_o7|-T?V)Q}IU$l-cPIq$K zUXC;;27Llu;LnRSW?yHZF?q^dBfNG8khPomj6DVjKxcE2+AwqeCORpVR0PV4EUU-xy(b+N8ngV5#s zx@L7{6SNY1hGNBy*o42(7HP6Q{7}li;;d|-#yYiPBY=ZnWyFN-?_>+c-wa@o>ZdIi zgib{t$Pwk`G@7bDe`Ot3oGpt;k_4X%T@hG)oZe!2Vf2v>Y{AkohW&ZgfOPOJ5~1{WJmpB}lE8jt+7VD(&T@j0Px-8kTy8xZN(7Xn z5V{ECAep@E9zG6(lqc0L2#a|NfPQ!IqYWxUb2H!`(-xrTyeIQG)-~D&qQccR`+n#F zZMBTsv)i#;0kKSGm7KSSLr2Q+qlU*es5R>Wa4=4-DQrZO7b{ANTaHA~k=L`k3*@`` z$|=_^8Zh8R+Nv~VZ8TQ9&@Hm1L+aIbpwMq_Y^HSAque1ZsvyZ^_Uw_kS+2m8(WUA| zQ`5O{uygFcI3VFoZmKmpSB363q?S;m6K)&<%}v;@B}EW@T#E_9wbmva3G@T>wPj?5 ztdwPu{jT@$%P+hc3olvm`#K>hn$hSFLJ6K1>y^1T zZ$-R4nr<@x7xA<9fr7E1Q!EC)?$W`9lud1Yo!{Q;1^Q%Hz>-V|%2P)Z8i%xO-VIZc zUVW+NrLe#_*N*uNBOZOs^eEerfdCJKU0+Z8F`!42j|16Ks(r!e8C=j0PmH}3th1Ys zreRm(s;1>2p$2rv2f=;1Zg2b7CX8O{l(&Z_6LW2%%Wx2?QagjjRyDUD@e3}+XQ*oi z8H9DSfUJ*6`#wdV+ioLtsCgAt7?tU$4c&54f9^nGE~jp)!@;Ge5mgWI+UGe`>>7)_JAiqRJ~}I=#669B$SNvWI*4_7u5%EJ++?=1YzO z%}iF4?P9Zm46{QECA(ocyF{<+;Rh+5wS~Tpg_xu&MS-7D86JH?A9B8DmFyY=WUcll z?49>(0GJ4F9lXxA!Yk^cB*hL1I~j7_5>5u|wc+)b>`Kq%aPN*Ol!yWiAm@j+$gYxS zTC}aQpAo2vu<#=s3-JDU<|uuHFGf4DnqsF@N;9kX6y@6zs9AbdH8Ht