From afe9ef9aa51e1f61e10a58c1419924ee89cfc2f7 Mon Sep 17 00:00:00 2001 From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Sun, 14 Mar 2021 05:23:52 +0100 Subject: [PATCH] Display `Loading Screenshot...` if fetching. ALSO: Add Stack Theme and increase the depth of the grid selector from 2 to 3. --- assets/gfx/sprites/download.png | Bin 951 -> 641 bytes assets/gfx/sprites/info.png | Bin 894 -> 612 bytes assets/gfx/sprites/search.png | Bin 1032 -> 669 bytes assets/gfx/sprites/settings.png | Bin 1120 -> 726 bytes assets/gfx/sprites/sort.png | Bin 978 -> 669 bytes include/common.hpp | 2 +- include/gui/gfx.hpp | 1 + romfs/lang/en/app.json | 1 + source/gui/gfx.cpp | 36 ++++++++++++++++++++++++++++++-- source/menu/screenshotMenu.cpp | 7 +++++++ source/menu/settings.cpp | 4 ++-- source/menu/sideMenu.cpp | 10 ++++----- source/utils/animation.cpp | 2 +- source/utils/download.cpp | 8 ++----- 14 files changed, 54 insertions(+), 17 deletions(-) diff --git a/assets/gfx/sprites/download.png b/assets/gfx/sprites/download.png index e9e316883574303acbe8619c5d8998171cbd90db..daecc555d64cd84afe47993794b404187d8c9a8b 100644 GIT binary patch delta 599 zcmV-d0;v7B2Z05UHGcv&Nkl9rFvZx0Siq_JL!YZhUAXX33KU76T zJgQgkz3f53egID%^xKHl9ty1&Z3}|6s|Y<*Q4mTIr7cqS@sLTGt()CUV!DEPATXJ{ z`Q^zZnIuw4NlD57jpYph_Di}Z>7t|o*Zoz}oTMo;`(m$i@5ut`{wL0{D?ZF6KK>D^hSWhg{6lqT~kuf?UkGw8yOk zINr^0Ub(YE1TSR}$(>d0v=KNZX;{)BNoR6O`J4qNB&|xCHM0*vdjl7Mmx1@yE1>R{ z*Ma-a0O!-n-G3o`o_hvVy^JdGJTPMexSeL?vP{B5z(L?6@E$k-3}?vM00uh=hF;c~ zBfzM)J____%$o6?DxTbFNkggbgEr@;))}E9shKfr1UTsj#blK$f^8RHu&)OqN%Y4J zUvRAlB1x>q4PS7+2O>$##SLF@K~f_i)sA<_`vlx-=aTr_3G9<}L(x4npw=&+1v7g@ z^!Yw5=}>4w%!;JTX0}Z9_2R$AwiNxI&Ptjzv&}Sv7YuL=SZ*^aE5PwW4jM`u$$v*K l2B-l`ZYl21t)!%+mETz*&SRXf7hV7W002ovPDHLkV1fwBA3^{C delta 912 zcmV;B18@9+1-A!~HGczaNkl1wkKe<$ilaor6Y?OvV6)zAoBTA=> z5i3ZIl8&heD!6kgy0P9Cb|Jb^P;luYxG*;t-fBg%h@dnx(S>a-MFlSuG<7CT#l)O* zUKgF2+$QFnOf(DU+04&>zVH1X&VS}yph=S^P5$3lqX8qQet+%o7FrJ?%Yb?+vF9;O zhr5&s{S z@8kBkBnx;7-+yF_asUP?j5iYY#N)kUxj&K$$+gzwBKihz@A^7cZQRgMdTi@TYqC6I zXT=sY?&icnK9xKe=V6R`xUylp%lu*3F~NmUZt6%TbvBXU*i1QX zkzNP(Cs_2P!8-sl9zkT{HX2L`dorK)XEqg_D3phUhJQ(NpOYQmeW`OGm$Lw1a#Ag& zt4bdVyC-%AT0rj6e8wN!P_T05K2IbEAZ6Rz-RZ@@bkb00p538PHw&9el!F$Wx$I!S zU#!lo`jb?)HR%%qYim8X80Z#YudscQxYY~V&LzzO+a>9>l`}QLiQ?>yB)jHn1R;vT z<*X>gEq}Ht+Dew-z{vE)ed`3JmMzKs8#u!K%i|hR_fE*v!%Wv!$2CEN($47A!Q6%F zaQV7%Zd;zS+kqlYSI0HMd|zh~>`dGcLnn~3VQ9VGa~e)n8QDGaR_DQoCN{9I1w z(|+wmVtI?rkA!bj^1iLd4l2MdqF| zvzo)I``}<^_s51E-AvMq;atvwD6}s;3%?yNl#Z>f884JxGQ2Y$?#o=x0yBm;lSB5* z+BfcXZ!?F}{wsz(1pKm5QiPT&nPFw>dFObp7HT{TyilnLR`=B9XUT^08UNL_2U_Y? zAAe5!qi;|C@O~=g-)kZZ)+1D_b-2{!we5aPlfZR|yH`XUto;6n?15^J&}g;5umE&E zf~ooW^6|%Wdlu@sH2hsWK2y4$h)H12nnOQ1EH{|;ziTAFVL_-Xxh-%CQ2IK^gHGcvbNkltun%KQ6256bZ5G5O}8R*prNa$>(=R8^xUeJCj95P zl+Hj~(t@OGk}gZ?WIuhCv?u9}q^Hig?XusuK2(q@ zqYo_AA$AeiOb`p%0H($zH%D65%IE{L&RS4ALx{MoH@mDRnna4 z>EgH|=}uG+;D#|9&w&@lzKd1mTG*y`H5X&e(El9;|C2>id{efm-6=V*%2i3rBk#gj z2n#QP8DJK8Wq*vZ9s0OHt}W?M(pf_W#=$_+CFk6a;|t*wFX->dNz%E@;Wwe+eBuE2 zC2b_e7;*@+HIopy>zrGWB%mw51hX*Y5N7a#F{mVc&Yd47#A)Xnr&W@Ff>5xzm2WxU z@{Le%uR)PAcJqx;u-l+W8L#t=Q1F?gpUt_PV4$E(4u1(|yRRor8U;MgR}rcBEnaI# zrii=Yg(AUCN$=}-IYCd-gGzS-ONN!m0Wg&vpA7x4M?DUHYZ%Ly?1*JOI^XzA^bLc> z(!($F;=wOI_iL2<2uz#g0?9fu*-MtoNp^sHW0YIRI;|r_7xB9m_uA3RyVMVu=k@0U=Cp=CVD8En{++OVO_-457x7e$-97TiVgLXD07*qo IM6N<$g0Z<5KmY&$ delta 854 zcmV-c1F8Jv1pWq)HGcy$NklfqbA0aS3P@`f5G_U;Dx1t2QL0dJRpgta6yb3B6?916KtzStQR!3=I&Io2HOzjM_rl+jcs*;TC9Y4~MTesdcw2e98nuKRV?70l)e7EvyQ zkVBaXod;*ebNT*y9W{cst)_@x3+*P{w2mf@S*b({LEi)HAO;xbtMGV@u3f zBDj2Q6wBo;%Uzj6JHGyD@EmcwDQW(m96(#_hnaRacmxIGaFYv+0@FV;e$tEs-0ZiHlo(ZMBY5)KL07*qoM6N<$f`Rmx00000 diff --git a/assets/gfx/sprites/search.png b/assets/gfx/sprites/search.png index fc3252d416e030afa17db2d86435fa8bcb1c63fc..dcb5226d2159a4577681e09692e1cf9f3a562b17 100644 GIT binary patch delta 627 zcmV-(0*w8L2%QCxHGcw9NklENhN?cgGgr69NzL_r+X!9f&Ubh1#CL`21EMXIQq&rg_f7T=A{ zI11!qf9WX>aMX+|T_H8gW(-IwBsInX4w!MZ8zN6T-h42rF%IyP8IJ_x?AE9^|C-bo z2l(EMi@`X%Wi!goxnHT$fO&K3egpXwSvg?M1?>bmN4=j5RV`XMtC!uZ zWD>|p;B0XK+*@E87>=O+KV$?t1uO!qK-DW;29|&`nA5uFkfv}B7z4&>b8vbJ86w~i z@WO+94IJ(@+du6W$X46^u-9BoY61DP*G#(8r1OslW4o*L7rpC|Cdh N002ovPDHLkV1mb6Ctv^o delta 993 zcmV<710MXH1&9ccHGc!WNkln_aBYz%E3E_F^^lqNV}1m}oUo zYSTj{VQGn{CiYMzv56NCwxsc*p7h|U>OrGHBXq%orb^SU2QG9M&_fSR)U+v91990> zYXUOg^T5CkI0G|Vq%q-t`re!O{_~sp=9~EjwzQ=!ttpAy(0_k%s?l+3I#l%qK^|6g zhd=`O72zt%x2Ozt?MeNzsepr{vkmGjybkgjaMwEJ3Y>ApoakMXd`sI5zW=Dj%{qjZ1P7Mu5Cpt|7RfO@izNZ3o%5>NM|kWl|?L z9MHRSXIH`X8Gnb~&gS%$zzZ6kZLkUVq$tPzeS-F6Gxeu846uLv=6#M`xD2Gd)I7q= zU9IU)q8Ja1m)nii0bl>$#?sc=mi{3Qpb0zR=)x(VIU@3ER5*acEvfT@b^!BUDrpVx z#eoY2?7ukGh;q!A>dUsKK8kCe&D4)5yyZ(hn=6!_x_@mz$EoQ6YP`@j4!v>Vmh@M0 z?pcNU1BVh|7ijM4VyoKnH&+p(G<^NJJpvbPJp(+=ug8^(;xaR&W)A7K=nm0T(CwC z9BxUSk7GVKI{S!q+=4)@m%5Z~O+79m8r388TYqenUSQ4(6UOR5ZhYpMIB@E?U;E$` zI35RXO~B4f>Sqype5o{+b7zV(r#}7h_j|(nJ}7E3H&#Ao9k&4N@*TQv946wxL4*x! zu2_B>^o>>NDMW`9b3t8qQcS`H+vKg*F5tmHGo@$}Jm1-zE^inhz+kcTiX!g=kzcUO zNPlo0*ikKH=oI^v&D5VZmNwvA47f{HdCoXIhEQ0}3K?q|9-5d*MKOu}+qt-(lSAIF z;Y&}r^IB$K_mg#{pq@uXSyx P00000NkvXXu0mjf{VetZ diff --git a/assets/gfx/sprites/settings.png b/assets/gfx/sprites/settings.png index 23c51b820b31d53e4b0f15f5a4ba40685a8ffb83..97234221252734e12ed55822711c83dd7ea3bfea 100644 GIT binary patch delta 685 zcmV;e0#g0p2-XFVHGcw&Nkl3`u2v$ZxV-o{b2O666 z;hzE?F!UKr36KhC32vE0P=$cNe&7~R4Rkqfh;c07Jp^0@_8B~K4f=saztG#jb70iB zRe(Dso1;^A0q4h#08fEs-?j+!_X7AV5bQhfEduVZz5vZY+jK14g&qJ>bv}<}U5Wtu zB)yk(DEhId>3^f7!_K*O=gquLGOo>slccJobx$!5aH0qEc}bI!PDwiLuj@VdTrceb z%tWl4U%-_DuL7=-JBw5Sf)zB+&d?g6a=!#R^#=2tK9`3>AB+njL% z#=JqE%Gb-P&y9db8@Ln=)@8mBFgI5zz{!Be>$0(yVt*m@=wpiAP~VlZfn~+QWrYiZ z;WBeW-x@F$;gbpI^9wh${s879{9YCKw8%E3?Tr9~6z{rDl_quIn$c?(7_b1oG#Wyd zgoBVCE+$dWbbIW`@okmPVpTgOJp?8tJ(AS$_lK2zGS5VK*#umSnDItyyqo8LDz`pJ zI_jKTlYe^Fr5Rt3O>Gucho-vW3PpBq$Ws$o>f!Z$B|9$U=}Gi-SbJz%_P`^)&5<31 zthxl16bR)HGo~wfZl8`+0k$)(B3e>y$y`50ynYbzFq}9HUK_IiIMtep=s!| zloB8n&=TA-iJ(#e-;}f?>0L^Ijrf5%BI&HMA10W){q3KUK1rH$&LshEYs>2osd@Aq TS}sU700000NkvXXu0mjfx#38b delta 1082 zcmV-A1jYN-1>gvfHGc#ZNklT3bMFPN>lzocCKx-lXn)Dn4hpvc$P=J|1qeUG zaHs5I&x!vHurWQqRpjZoJcf+&<5u^nwbn4!8n_%y3kj2S;cm-RB1^D@-oyelHfO1k zZ3U_1;!@%y;*^VXHop676PA`LaC2W&%3VJO26!wce#Jyzn0frv+^rssoj1@t_Gqc= zVsvbZa{af57mFP#k^zTu>g2HoJeMXFfv;ORFR+54yI2w%GYc;Qcnv^c zR_(~+c7L(3BTey!)0`5}AK`WhyxRIH|4Ow=*Y6DdB_SyQZ`P;hXGu-~2<$F-IFbeq z00bTZ6b9%K+*2v#KaPrx{Vg7_HXZ}yg!xPuXVLXdhP3byu8Gh(c)`tBmh(|k!%R2?7Ow--0(TISK1UAIyecygdr7>OIxm}x#G;b3Aea?+zYSna#{&(-$8 z3YsnRP#QP@AaJ1WG$U8C4fk%UT+)N4TJQPofi@%HN(VQo4FnE1oaT_k5t{B<;OaN0 zL4OJNrB4;EU>_6@gLENhU2Lw;M}U+kUl9tSwPrV82g!?i*>iOm(-@E)qEJ8Te|TFP{nUx~_Ts1Cvm0Bt+W^!~g&Q07*qoM6N<$g0*G@ A*8l(j diff --git a/assets/gfx/sprites/sort.png b/assets/gfx/sprites/sort.png index 519d04ed505f6708693bdece783c1b4f8936088e..79dd41123442de2849d227719e55566eb3ed96ca 100644 GIT binary patch delta 627 zcmV-(0*w9A2b~3wHGcw9Nkl!2M1aIth$r%sIkFjfUn9WPdC)A?dB8_rT!{sXHS5 z;n2iPfRd&yXGGFe#@x;dC<3eAH2na!1m=!Mrg%KGZk9JVCCLXWN;;n*za<3$0z+y{ z=?6)R_I#}qP`*On;5kX_o8q3NhxR-P9Lt?5tAOXWc76lHz;WQO+3p17x4Z^J;KqQO z4ZI9|wYFxqpMSviP638YaoLO8Ch4fPL9^|ZR0=JaRYT33z@Vhd*8L{wT_j{u(jG}y zBt6QVE=@oISg>ii6yv{PzBei3baV}l0;dyv1Hc(zU(W#ZP`CahJ<+BIY`Tlr1(a0( zw8ZI^bM9q+NE?+32%M1gv`NScu-iGenjcm}AyYgr>3?Gr|EEsDwIsj+FKjo~fKvfE z-TTY{SG_`aWBdi+B5*JS5IAJda2LG69yf`biNI8Wa>Q1SzyZv(1Gfv9w}BRb11a&9Nb$9l zex+qND{MIH4fX^mc`f!59s`-Aw&6x;oT%gU3)tEsWP5N{WIv5FVVu5DKiDSaCqV|m zxj@JfNpZKgnxxOpx#g7nilm#K>9%w3R!Hrx377_61J`@a(pO(u^bbUIl|A{Jw8{Vg N002ovPDHLkV1gxdD%=17 delta 939 zcmV;c162H-1=0tQHGcz#Nkl^8fl;-Z38>cREW{i7l| zwRo^tmNxF56bH%-0Jhz*nN`*sfg8K&0g2F`YhDbRwCp3a_FygzK6A>O9u z*sJ)PL)Uf#=&Ky8*Yt~J%yd(GvkDEEbryz2*xQH|W77f;_LIWz+4A2ZTyiMG_ zt^B=GD8RWnwSNQ}Q+fs{0Vuo@6<9-|02lk+XMy^nkRvFc0-)@+PcA(Y6&!>F6!hi# zWBH%h$`>Byhkyd2ruR~0bc6uRIqt(CPuC*t+g#~8V~TeS@avZ6Ge2C6-!?#1|G=tG z?gk#J|IE5&s})O3MZ|~IE}6-wsp7s+5B~t1HJ07L5P!mpz-JNgwFgY>#9A)bM^AV? zJvNwY&S#zC8z8faM7AHco#H(^|M<}H9x~maj(~Qd_?V)ZHkOslyl$Bu zk$-#0b$?wQr?@Iy6gb=3A?KokgAgM)Jw8+hMjElIihauc4%h|wV)(B`1qUJD!DiV% zmuINKA#h~>=++;b^T&SIzN=;TnV3=iX>xSirB3Z-ez|;~Q8gzvZAs?$?2v0~^Ifgt ztg|qT>fw6$S2bRFYprK_$vrBNtN7Nr+8w5~Y=5ViGOFfTf!y+vdo;+?HkQlG;{_$s6UjrU%m(Gcz(L3<{^s~XzaNjSzrA_t zRjOBhn||tn<#zS!MlvK^Xuw{`E|d-`G9-nene^D;d;eFz8`{vV>OY+sGv%nS?zsQ} N002ovPDHLkV1jLQ+~)uQ diff --git a/include/common.hpp b/include/common.hpp index 9ec1b19..ff6cc8b 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -37,7 +37,7 @@ #define _STORE_PATH "sdmc:/3ds/Universal-Updater/stores/" #define _META_PATH "sdmc:/3ds/Universal-Updater/MetaData.json" -#define _THEME_AMOUNT 1 +#define _THEME_AMOUNT 2 #define _UNISTORE_VERSION 4 inline std::unique_ptr config; diff --git a/include/gui/gfx.hpp b/include/gui/gfx.hpp index 053a676..5c37db3 100644 --- a/include/gui/gfx.hpp +++ b/include/gui/gfx.hpp @@ -74,6 +74,7 @@ namespace GFX { void DrawTime(); void DrawBattery(); void HandleBattery(); + void DrawIcon(const int Idx, int X, int Y, float ScaleX = 1, float ScaleY = 1); }; #endif \ No newline at end of file diff --git a/romfs/lang/en/app.json b/romfs/lang/en/app.json index 0b0f326..42139af 100644 --- a/romfs/lang/en/app.json +++ b/romfs/lang/en/app.json @@ -87,6 +87,7 @@ "LAST_UPDATED": "Last updated", "LICENSE": "License", "LIST": "List", + "LOADING_SCREENSHOT": "Loading Screenshot...", "LOADING_SPRITESHEET": "Loading Spritesheet %i of %i...", "MEDIATYPE_NAND": "MediaType NAND", "MEDIATYPE_SD": "MediaType SD", diff --git a/source/gui/gfx.cpp b/source/gui/gfx.cpp index 47695d6..02e1000 100644 --- a/source/gui/gfx.cpp +++ b/source/gui/gfx.cpp @@ -43,7 +43,7 @@ std::vector GFX::Themes = { C2D_Color32(25, 30, 53, 255), // Entry Outline. C2D_Color32(28, 33, 58, 255), // Box Inside. C2D_Color32(108, 130, 155, 255), // Box Outside. - BLACK, // Box Unselected. + BLACK, // Box Selected. C2D_Color32(28, 33, 58, 255), // Progressbar Out. C2D_Color32(77, 101, 128, 255), // Progressbar In. C2D_Color32(51, 75, 102, 255), // Searchbar. @@ -54,6 +54,28 @@ std::vector GFX::Themes = { C2D_Color32(28, 33, 58, 255), // Mark Unselected. C2D_Color32(28, 33, 58, 255), // Downlist Preview (Top). C2D_Color32(173, 204, 239, 255) // SideBar Icon Color. + }, + /* Stack Theme. */ + { + C2D_Color32(44, 48, 64, 255), // Bar. + C2D_Color32(52, 56, 64, 255), // BG. + C2D_Color32(22, 24, 32, 255), // Bar Outline. + C2D_Color32(216, 228, 228, 255), // Text. + C2D_Color32(60, 63, 113, 255), // Entry bar. + C2D_Color32(42, 46, 54, 255), // Entry Outline. + C2D_Color32(60, 63, 113, 255), // Box Inside. + C2D_Color32(42, 46, 54, 255), // Box Outside. + C2D_Color32(102, 105, 170, 255), // Box Selected. + C2D_Color32(42, 46, 54, 255), // Progressbar Out. + C2D_Color32(60, 63, 113, 255), // Progressbar In. + C2D_Color32(60, 63, 113, 255), // Searchbar. + C2D_Color32(42, 46, 54, 255), // Searchbar Outline. + C2D_Color32(60, 63, 113, 255), // Sidebar Selected. + C2D_Color32(42, 46, 54, 255), // Sidebar Unselected. + C2D_Color32(60, 63, 113, 255), // Mark Selected. + C2D_Color32(42, 46, 54, 255), // Mark Unselected. + C2D_Color32(52, 60, 76, 255), // Downlist Preview (Top). + C2D_Color32(102, 105, 170, 255) // SideBar Icon Color. } }; @@ -85,7 +107,7 @@ void GFX::DrawBox(float xPos, float yPos, float width, float height, bool select Gui::Draw_Rect(xPos, yPos, width, height, GFX::Themes[GFX::SelectedTheme].BoxInside); // Draw middle BG. if (selected) { - static constexpr int depth = 2; + static constexpr int depth = 3; Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Top. Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Left. @@ -196,4 +218,14 @@ void GFX::HandleBattery() { } } } +} + +/* + Draws the sidebar icons blended with the SideBarIconColor. +*/ +void GFX::DrawIcon(const int Idx, int X, int Y, float ScaleX, float ScaleY) { + C2D_ImageTint tint; + C2D_PlainImageTint(&tint, GFX::Themes[GFX::SelectedTheme].SideBarIconColor, 1.0f); + + C2D_DrawImageAt(C2D_SpriteSheetGetImage(sprites, Idx), X, Y, 0.5f, &tint, ScaleX, ScaleY); } \ No newline at end of file diff --git a/source/menu/screenshotMenu.cpp b/source/menu/screenshotMenu.cpp index 553ec9e..242561d 100644 --- a/source/menu/screenshotMenu.cpp +++ b/source/menu/screenshotMenu.cpp @@ -47,6 +47,13 @@ void StoreUtils::DrawScreenshotMenu(const C2D_Image &img, const int sIndex, cons Gui::ScreenDraw(Top); Gui::Draw_Rect(0, 0, 400, 240, GFX::Themes[GFX::SelectedTheme].BGColor); + if (sFetch) { + Animation::QueueEntryDone(); + GFX::DrawBottom(); + Gui::DrawStringCentered(0, 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("LOADING_SCREENSHOT"), 310); + return; + } + if (!canDisplay) { Animation::QueueEntryDone(); diff --git a/source/menu/settings.cpp b/source/menu/settings.cpp index d91a93e..23993a5 100644 --- a/source/menu/settings.cpp +++ b/source/menu/settings.cpp @@ -90,7 +90,7 @@ static const std::vector dirStrings = { "CHANGE_3DSX_PATH", "3DSX_I static const std::vector languages = { "Bruh", "Deutsch", "English", "Español", "Français", "Italiano", "Magyar", "Polski", "Português (Brasil)", "Русский", "Украïнська", "日本語" }; static const std::string langsTemp[] = { "br", "de", "en", "es", "fr", "it", "hu", "pl", "pt-BR", "ru", "uk", "jp"}; -static const std::vector ThemeNames = { "THEME_DEFAULT" }; +static const std::vector ThemeNames = { "THEME_DEFAULT", "Stack" }; /* Main Settings. @@ -195,7 +195,7 @@ static void DrawGUISettings(int selection) { Gui::DrawString(47, 151, 0.4f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("CUSTOM_FONT_DESC"), 265, 0, font, C2D_WordWrap); Gui::Draw_Rect(40, 196, 280, 24, (selection == 2 ? GFX::Themes[GFX::SelectedTheme].MarkSelected : GFX::Themes[GFX::SelectedTheme].MarkUnselected)); - Gui::DrawString(47, 200, 0.5f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("ACTIVE_THEME") + ": " + Lang::get(ThemeNames[GFX::SelectedTheme]), 210, 0, font); + Gui::DrawString(47, 200, 0.5f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("ACTIVE_THEME") + ": " + (GFX::SelectedTheme == 0 ? Lang::get(ThemeNames[GFX::SelectedTheme]) : ThemeNames[GFX::SelectedTheme]), 210, 0, font); } diff --git a/source/menu/sideMenu.cpp b/source/menu/sideMenu.cpp index 66c6f4a..a38980e 100644 --- a/source/menu/sideMenu.cpp +++ b/source/menu/sideMenu.cpp @@ -54,12 +54,12 @@ void StoreUtils::DrawSideMenu(int currentMenu) { } } - GFX::DrawSprite(sprites_info_idx, sidePos[0].x, sidePos[0].y); - GFX::DrawSprite(sprites_download_idx, sidePos[1].x, sidePos[1].y); + GFX::DrawIcon(sprites_info_idx, sidePos[0].x, sidePos[0].y); + GFX::DrawIcon(sprites_download_idx, sidePos[1].x, sidePos[1].y); Animation::DrawQueue(sidePos[2].x, sidePos[2].y); - GFX::DrawSprite(sprites_search_idx, sidePos[3].x, sidePos[3].y); - GFX::DrawSprite(sprites_sort_idx, sidePos[4].x, sidePos[4].y); - GFX::DrawSprite(sprites_settings_idx, sidePos[5].x, sidePos[5].y); + GFX::DrawIcon(sprites_search_idx, sidePos[3].x, sidePos[3].y); + GFX::DrawIcon(sprites_sort_idx, sidePos[4].x, sidePos[4].y); + GFX::DrawIcon(sprites_settings_idx, sidePos[5].x, sidePos[5].y); Gui::Draw_Rect(40, 0, 1, 240, GFX::Themes[GFX::SelectedTheme].BarOutline); } diff --git a/source/utils/animation.cpp b/source/utils/animation.cpp index 115d278..645dd48 100644 --- a/source/utils/animation.cpp +++ b/source/utils/animation.cpp @@ -139,7 +139,7 @@ extern bool QueueRuns; extern std::deque> queueEntries; void Animation::DrawQueue(int x, int y) { - GFX::DrawSprite(sprites_queue0_idx + frame, x, y); + GFX::DrawIcon(sprites_queue0_idx + frame, x, y); Gui::DrawStringCentered(x + 20 - 160, y + 11, 0.6f, GFX::Themes[GFX::SelectedTheme].SideBarIconColor, QueueSystem::Wait ? "!" : std::to_string(queueEntries.size()), 0, 0, font); } void Animation::QueueAnimHandle() { diff --git a/source/utils/download.cpp b/source/utils/download.cpp index 8fc491a..07e5e17 100644 --- a/source/utils/download.cpp +++ b/source/utils/download.cpp @@ -425,12 +425,8 @@ Result downloadFromRelease(const std::string &url, const std::string &asset, con result_sz = 0; result_written = 0; - if (assetUrl.empty() || ret != 0) { - ret = DL_ERROR_GIT; - - } else { - ret = downloadToFile(assetUrl, path); - } + if (assetUrl.empty() || ret != 0) ret = DL_ERROR_GIT; + else ret = downloadToFile(assetUrl, path); return ret; }