From d93a25459cdefba940f254b4c5f54fd7d9cdaf11 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Thu, 8 Oct 2009 16:32:58 -0700 Subject: [PATCH] simplify construction of the recovery progress bar Instead of six separate images for the left end, right end, and tiled center portion of the full and empty progress bars, just use two images: a full bar and an empty bar. Draw the left side of the full bar and the right side of the empty one, moving the boundary rightward to "fill" the bar. This makes recovery trivially smaller, and allows fancier images to be used as progress bars. Support paletted PNG images as resources. --- minui/resources.c | 11 ++++-- res/images/indeterminate1.png | Bin 2249 -> 1919 bytes res/images/indeterminate2.png | Bin 2251 -> 1912 bytes res/images/indeterminate3.png | Bin 2254 -> 1917 bytes res/images/indeterminate4.png | Bin 2249 -> 1912 bytes res/images/indeterminate5.png | Bin 2246 -> 1902 bytes res/images/indeterminate6.png | Bin 2262 -> 1914 bytes res/images/progress_bar_empty.png | Bin 148 -> 0 bytes res/images/progress_bar_empty_left_round.png | Bin 220 -> 0 bytes res/images/progress_bar_empty_right_round.png | Bin 211 -> 0 bytes res/images/progress_bar_fill.png | Bin 117 -> 0 bytes res/images/progress_bar_left_round.png | Bin 195 -> 0 bytes res/images/progress_bar_right_round.png | Bin 192 -> 0 bytes res/images/progress_empty.png | Bin 0 -> 361 bytes res/images/progress_fill.png | Bin 0 -> 286 bytes ui.c | 34 ++++++------------ 16 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 res/images/progress_bar_empty.png delete mode 100644 res/images/progress_bar_empty_left_round.png delete mode 100644 res/images/progress_bar_empty_right_round.png delete mode 100644 res/images/progress_bar_fill.png delete mode 100644 res/images/progress_bar_left_round.png delete mode 100644 res/images/progress_bar_right_round.png create mode 100644 res/images/progress_empty.png create mode 100644 res/images/progress_fill.png diff --git a/minui/resources.c b/minui/resources.c index 7ecfeef..3d2c727 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -97,9 +97,10 @@ int res_create_surface(const char* name, gr_surface* pSurface) { int color_type = info_ptr->color_type; int bit_depth = info_ptr->bit_depth; int channels = info_ptr->channels; - if (bit_depth != 8 || (channels != 3 && channels != 4) || - (color_type != PNG_COLOR_TYPE_RGB && - color_type != PNG_COLOR_TYPE_RGBA)) { + if (!(bit_depth == 8 && + ((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) || + (channels == 4 && color_type == PNG_COLOR_TYPE_RGBA) || + (channels == 1 && color_type == PNG_COLOR_TYPE_PALETTE)))) { return -7; goto exit; } @@ -118,6 +119,10 @@ int res_create_surface(const char* name, gr_surface* pSurface) { surface->format = (channels == 3) ? GGL_PIXEL_FORMAT_RGBX_8888 : GGL_PIXEL_FORMAT_RGBA_8888; + if (color_type == PNG_COLOR_TYPE_PALETTE) { + png_set_palette_to_rgb(png_ptr); + } + int y; if (channels == 3) { for (y = 0; y < height; ++y) { diff --git a/res/images/indeterminate1.png b/res/images/indeterminate1.png index 264bf27e53e30bbf9b4bffad2a46235ae3bee6a0..90cb9fba97be67f21bb8c1a3560967daeb89afaf 100644 GIT binary patch delta 1915 zcmV->2ZZ>^5&sU58Gi!+005q1pt=A60Z>p(R7Hx9ieqVGV_jppy1BW!xw*Qzt*))D zs;#Z6t*xf5rKY8&rlqB#rK6;yqokvpo}8ALmfhONvZK|Q$HvOZ%F4~kiiv*C&Cbrx&VSO;($dq?($&(|)7IA2 z*4Ee7go1>GhJ=cSii(VijEanmj*O6ukdTs)l#-N`nv|B9mYkTJoSK}Ro}8neqobsw zrJ|*!rlqB-rKzf^t){K5s;#ZAt*x-Fv97VPu(7eSv9YwVwX(Ifw6(RiwYj*txw^Tz zyt%!)y}Z1U>4 zudlPO*IaT?0000ObW%=JnVI0sKmeKGK+FI@nLyy+K!4fl>e-n zG<|9weeH*%qu-o4LjL${Jow?OKa%?|&r9c}()r8%{r%*22^Z%tll$VIpO?0i$-pN& z$vk|zV1Hj}?St9oQQ`l^;7T)o<~Has&pOCVN;iM6_-p)nhmaPZXBGd+$Dckh9)7(Q zOT^=SvuK(Hb1RXE$NGgr(JU0U5;6FNVzFTMOH2X0c@OfXWeBfr$ z&o7w7^Ya!yduTi|&o*OwdwZQT(>xO$+dLz6rhRC0b1z0dTw+MW#|_~@1Uz(yc}SD> zo-n2`a3z!dP$sT|S!lZ0WT`r6t$oQ?Jo0@%+($i^iKnDY){l(G`F#GxuXJAI`P?D> z*nc?89p-XxccanhMox4zy1PsIQ2Ed~`rRNT`WBKj{I@K@V^*~Gb2;W|me0oSuFU#c zWoln%Vz10f2fDLCGP=Q1I*8W3WCpyi|2toJd9Fj_H$HEErt{{mY2*3RCr{}-|B23X zs3#$<{J%pw?7yeR;&uPWcbNaJ-|hV5oqt_McH^D_>5Mz__y zy}Y`*y1cq+DNVn(t!`KQ(5+h%^mE$<1A=^#iof)=_HUTSY>V}kFfCy&{Y>^lnb;f5 zLNj#J^*d;-eaTlm@_j$tM?Kd~w|@m*Y2$Y~um0lm>aJeWWZ zb3NDfGL34zmUVIAWvUJ3PsZ6QU98**`(#(y_uLgTKqg9SpDwcQgfr{aI?a;pxmm?< zPQ9jll}Y*IiPE}5qZ-PjixoEMz2c*@=2unyEa)8WL(r1zgIBx8#>ib%>3=NTkxM62 zsaC2PmoG@eCp~gAWLGjEM8gLJrjp@NpNGEy!#UvT1PtecVxE0Jlc8W1nt6tT4$#_H z{dH&f=pcS*Ht4DHshVMroJFZ(RnjBJ89Ku`$jH8}$KEz}B`L^NMww*4~N!hkzJ5H)pvP9c<$|64v<=81OX?tBe zU@SGOdHBp&GHW~RryOB;7d9zArSmQ9<$<*hq8XB&DpUDtui{lV$$#`23}DtuujM<& zJ$xE-e)o7E^bX2anLd}HO`jh8avHXc&#P?B$sCe~pJGYxfIeV+rkaP3&zEw_X?}l{ zSrUfdLD{nAdKY|^Sw=p`u;vaUhu$SYX~?0&e;=Z?@9^J^;t@*kz9gN8ysMI;tu{R) z#lz>nMc#GK_`sWty?;rzQESwe{Dm`FHtO}pax$5CWBBx~1i~AyYPCi^OD1Xf^%cuW zhDK{k&*$O0V{g2~?9v;P^s;rj$ZB1y@wd+;@Hw;EsMl6dn3WE6$6J!DWg%U3s5Mw? zADhNr!223sde}vs$6PMU-{xF_do~Q?%Wp2G7Z(>t?Pj}u1ax&VJ!&?a?IS4mn@#qo z7snyZ{;@E}G`hwgLr$mAlsRR;*~YBsc00%yUor`A9;sQ?VJdy#LsAFuTv_>`gU(?c z?&Iela|QSxeq`ML{M%pD|IF(D@VlYE`0o4r{{RWF9~4u|e2xGB002ovPDHLkV1i-z B228k2#`rcK~#9!?VI0g6jv0-=TFPu5y(Rbc?iLW z5`2(gA7lw+S!xg)j4o1Lv&Dr~6O+=&MsY)xil&&5q!tQ!_Mf<&b9c_&@0>mN$E>zg zn1|z?-TB<_{ho8r%p{{`+uiMK_-Z)w_g`;6{ds<3&M(f*`G48D84ic0-|L(Hlm2)t zj_DjRF7i3KMw#si{$k9k`n~ZS(z4t|1^qL@YyPD^`qA`5d`$l=;J=sP|4aPH`n*ci zkNN3Uv<9Ax0L<$=}+T-+I~2jB45dC`G);p=HpgA&d{}<<$uiVKK|+R;MKsK zoaPt&>A5*MJAbh;91Kl<-t@bDJKE@tM&gNe{At1WMvR+Nd}f|Fsn5KfQ|Qwj$kTn2+i6vGW5tB!Br&;6wG7-uZJ%{oU9V_1CYj z_jIji+Yh(5?3WMoO+FZ1^d}$3VT<~3EbNXoo{D-<@W62d^(Ege_(Hd&FLXGJY>)}5J{B#3;x{3At_=WY9`h*#BkU9RG1#3i=M2ny>kq|0em%?DpN;rhT_*XkC`d!H$V+|VHCFnU`TF>nJ|AoT zF<&j%KdvG3P2ofJjOoYfDficxudg3)9p=#!eSfF1zJBoWF@0Y>Q~js#|5p8d{(aXM z@!9QLxv&yX`}w5b-<5*CtNEI*`EQrc9`_!b)(aTg~6UtZF18=@5JnmOj{ZKuR zl>J?+*bhqWt)B;-5?k^g>IWYm)A!Xg)qjll^>fwwYyIQ%AGm(A!@xx^e@+7ePlI1m<#Ir_?SLv zNZ(i=Up=)oG(TJ)%@6aauhmo257m=vjgRT`K2-HD>mTxu z^-t{|t>3WzA^+O-$b5D3>U} zj_EsOaHMm{vcB|z`pAa-qkf2w=~K-#|1w`5C68-JeXftjG9Rm_reCF=a(`3vmAvMO z&LJD>hZrBz_tih-U)DcGziR)4t}oUnUiuI5*}<>*1c=QaH_gg-D{9cWny>kq|91Io z)g4t+on4P^Hv%kA$wZ{#C$>9>9@ju)cO?r6w(jXvsC}3@;<11D^0&jJ#h~Dkv&m$zkeqBIpW{x z?^f&Qs{MnWnm3zj?@#y-?N>f#3-hA}X|6Y2F*)cv+du__VK3rm1zU`K(P(o@ywpd2 z9(d5Ev82Bk;ibOtG~tK!m0XkjOZ|1lPb(qcUBRdL(dsXJss1(nlzM9YkectJ(r?oL zyvKh^KS(~NAL{>DKTG}fK!1Nun{R4=hUyQ!md(!1j=q>1O``u{V<$Z+7Flb$^Axl5 zvuQDHA`nY^y4vqBJD9mBL&a=nQ#D0l=;<@a{s~@N**9hw)_kY2cui6jHgMX_J z{U$w8zhUj2f5i*)G5rZYP#>>@{hc)o_|;)u8)?(H2vV?HBY|&4AnEFAKKrL|4_gA>Y3t4<{58o1M6G@jCWS2b#PN z^HSe#g2I-b1aSA2chZ=DsW0!mrTRP@U-WVg))UuI@9g49;D4Te1s~h53H?w#!N1hk zp7gPPaO=R65_B(KHk+xdC`Nljp=Lk|F&+;C{r W2NFsW*fZw<0000;}8Gi!+005q1pt=A60ZmX$R7JbAkGZ!oR}8!NS7B!p6nM#>d9W$;!&j%FfNs&d<)$(bCe>(tpy`($>?~*45V5*Vd<} zp2fkugo1>GhJ=cSii(VijEanmj*O6ukdTs)l#-N`nv|B9mYkTJoSK}Ro}8neqobsw zrJ|*!rlqB-rKzf^t){K5s;#ZAt*x-Fv97VPu(7eSv9YwVwX(Ifw6(RiwYj*txw^Tz zyt%!)y}Z1VMfl;F1|0r~m*3!%0LzR9Hvl zmhFGib`-_qoSRcO_uSSpt!s*I2DGj%eF#zr0bC0fgd~8{LMhn#@c+NuJ@?*Ul78H) z?PY)X;+vCm&pjdi@X@+;)B5xAqsNb4@0ZK_<^6kvkMDuX<$I#<3COon2chxy53!)PlZLDiz&Qv2ABW_F2Vcvd=;+@-9&w$^5p4u37S6pfAzt!(0tS@Y2ushVG;3i7;5 z-`uwDxO;o<;_9ls+H&`V?bX#qBBO)pUyIOQWF&^p$bLI!qr2?KEI#BHk1HNK&SX86 z$uaRPc#&|m#VES6(IsE~$dC1OAAPRYo(sS59qYSooR`1TdC7Qn_)F_kVWUvk*jRW- zM}N4mu(CqDp*k39p+KIMm4yP|AbsWG0weT?%0@5X@azKP#wVGLSu>4pGO<@?r30Hj z5w0X1gpDqli9hCl&lkTu*NXMv<6nF}KA>~O*t&oJ!!tfF?$dek?Ag;4tNvSx)B68p zY`Uy}_{{U4`SZ?CKig$xGMQcH$rHzMc7HR=ndMyqx+Gp+7M+;Rd+3hyemRp_CWii= z5FY5e%0|y{j?V5PQD$Q%OIp`VbkJGpkl97z6K9vubPzVWWF~&Y(m9>aeZ;TNYaMlt zj&>%K$?4>Dhq$u?oJ@9(j#4_^*ggeLw&5p+X}iOoQ`Uuz-s!MkGvOCcM?9yL-+$pu z)-{u4-mA09jHlb^up^nwM(;?z`jM~xj_!(ka#8WKe7bF29KL#WcrhLykB^U)kH>U* z@yh66x^WK6cnl9Qo6g0iP7uH*4J{L0qbcYo7)_mqBDJ@qvf@gMqTq$y4{&IdhP&(+$cbR1aGQGu1Vd^81JZn-0T# zDs%3`!s$Ml0^nzY5%vH-(?~FJIgDL5iDI5XmUbTEiVviVljxm^4=;ACyj`*R& zLphacfZ@=gS#K&H?DD4A6o06$nUxCVuqEjb2IQv&Ibg4c4pj%1p3!lGa>S1f{4DVF zVh@)fy;8~XV`+ZZ3cB5H&~?gmoS+-frQ-?X2I-#Xz|n=rD_>?F&grc2LuZdCv*dza z_Qb=xhHJY2b=isL)hp!{xeWNBI(_irE`yWRm=3Z*u~Y9pM@*%uCJ^c^Fe<& z7z}5PTCF~#UlY1quYWgc_4UE951oFM>a!tT4EwW2z22A&aD#L*u_x-!YqeS<_Ct@z z-N$ULF(ae}^BQJ_XEpxy;l-kJW;CzY8ufK-G99p~KUgQM&#{R*kOgdXe+GBrkC}dj zc^BDhbLos<^V*CnP`Abn>)KD7CnGv1o6Y7ya}zWgZ5}ia4sA9;q#qoxelj{qG3!n7 zoQ$@bm;9u|4W`U3)<;{I6+YQY@Bz&DNgr^^P5fc uykA_iuK)7$ANqf0{eSq?;O~F<_WC~w$ro+5;w{<$000028k2$D%eK~#9!?VI0g6iE=r=TFPu5%3{|JcMu$ zNAN*{FR}!(ESE*RU~~~RWW@A=vy$77R@o9;o@IG(FBaX9Nq`p4YS{^Revon4b&oAGdL&cB{x zyO>;<^T|2hgMTq>omt;)cW3-0gZ-0_b6WLDd1n~)3x<8DaLE{*;=4ad89SakBryBqdxJ>3&jzw@5m?eCqp$i zYP^nmpwBR7_crrn>rL^b)dTp~ykNWmeYp=dKe7HJcz<91Wj)Kh`too0xGnOppRbQ_ z)|1_*yW2SFY1SZ!L0Z&b&ZliM?d>7R7?sahOiYr$V8&tE(@tp_c0@4-Fn z=^9%9MLOxz=Uj8~&;$SB(+6yvCq0+GOu1aV}G25>)3j5@gaRzK4bmI@c&l+UH)C? z3;N{4`!q@2G>E(R)COa~@K*5^U-8$IPu{+JYoP7#?VHAL4Yloe_6>2C?=ZezlK1Jq zDapU9_-MZVll1qheE#S4T>m-ym5k5EhT6`v9aCGcncAJKtYq9C0JUuE@u z`CM1__pD?+5PzqpdP4qG`1jR=ix26$@)_$t#JlRbZ2qW9WX7+@26|{a zk9N%3?KRtKw`;bCG0sEJd19#%&s&T>Uw;E$KyZflFed$TUV4Ht&T>D%Y5Fccqz^qb z&A%_7(!a|O^_m~zxxSW9P2ZPKuC48_FJ2$7vGAGv$ar1()cBA-&rKQsGXFmRe2v)p z(dtdssLQ{mO?=XN*fN9Rz>J0?Y;XaDS`d zh2}^XD!$??{`&FB;(zj@Sy@^!&^H@R(>v;!{&C;-^+w&SET`j3i`eKI zdKl{;rR;HU+NX1xo6Q18b79P0uKchZlQNN+Wg0b$@xz`kPjCh($D!n zn)z4rxy16x<7N5G<;mkm%@62r`t^PJ%;lf$k&{1)(=U@xidXv4yp-9mLVrC6{9FA- zxq2>JKbB`_Ea>02UumB#E=(s-Pn&@4aN5^5>Q*?{7BW8LsA179czCJLc`*;x=B(wH z0=(2$*qook*_@nytbeJ$p!hk8h_@m57(ZJ6mx^8r{x$uWd}{R&8}E`*Z_@vU!+%UY zNIs@4% z5v@;yfd92ab8r#HlRosdjap8>d)UQ$(g$6WKFxu3NT24|b%+=G=wD&U4={WV>XVO! zuz#sv@Wb+B<7JwBE%;{?9xwEiAI(o;zlaz6M01?_o_vC5%n{3v=6@x+9*AfD`5u6V zWGNO|56~bc>4oO|^b3Aiew_ZrK4|Af`r&KE#;cu2+J_t;nSanqFo^Vm8hr-C_P^d` z4THGB4kMe3Njm5`dASDHw?&%XlRmgU=Slx6ycRPSwI|+?f2pteAx?{z`;z)J$K^-c zFV1W6x_DPU=}VN)!GEGtyp*j67ccdBEFu3g2A95Xe|`Ra_2$ZFj33Pl*QeUKO8$XQ z(myWwQ`>%%YEOFc`sB%evkO0T z==oEd`w97%`tqAMm!HGg#>poi@A;Eh{bmVfZ5 z?k6qA;!i^CNh$Lx^QrM6eLD1V4X=NZOa7$C!{w@H#^?4cdm8hf6!FZ6dBjV7tri^n zb(!>zd)x4Gz`kHuUa>E%@I}C8_9Ec8H+ylA-s3My_*{5N01VB6YkIMQFBz5>i~8(E zlGR^c$Is*ztkr^nnTw-UebqqoaK8! zeq_8Z9>(lTRPmxm+hdo$mQQ+-WVN$>urDH&c%Ahi_KB{MXDsrY&B8wMdf;9pAJWIa z<7V~7eaHHb;@OK}ZNIp8te@;Ws`V^ilpp8)tLJy-XMZ~xyc*2C9`(O(-QO~6H`mPS z&DC6kdoVV7HNuwi*uy=^(KU<_2R$_6{@*#bSSMF1c|1x~p z`iaRu)kA6M{HE+jIO}lW;rHq1KD~eWZEx?9|96$oB7XO{;w!%5|4;m7+P2fNIXLV8 Y02p=>R(+CcOaK4?07*qoM6N<$f)?}fQ2+n{ diff --git a/res/images/indeterminate3.png b/res/images/indeterminate3.png index 891a0009586bc0ebb1b3f0b614c74019fd06ce1d..ba10dfa5323889dc196445ec8e30fc853ba4709b 100644 GIT binary patch delta 1913 zcmV-<2Zs305&aI38Gi!+005q1pt=A60aH*+R7JbAk8^c%b9HmPyu7)(xv{jdv97VL zs;#A_rKP5&mY9~7n3jZwgoK8KgocE&si3~Swbs|x*45U{$+p(h*3!|^&d<)m!@|P9 z!o0b>wX?OnxxBo;yu!c2!okAA!@|bJ#>U6S%E`*g&C1Tr&VSC&&eGA+($mt?)za3} z*4EY5*4NgAf`o*Igo=iWij0bkij0hojF60wkdly;l9ZI1l$My5oS2-Pnw*@ToTHwj zqokvyqNSy#rKPH+sj8{1rmd~2t*x%Dt+1`JuCcMOv9YqTv9z(ZvbD9ewY9djxwyHx zy1BW$xxKo*ynnpBy}Z4>zP-Y{!ot47!otGE#J{nurCMEDT47paU1MWmV`F7wV`*b+ zWov6`Yin(5b8&NXb#rrhb9;4rdwF|%eS3s`goKHNiiwJfkBX3wkd~E}mYbHGo1CMe zqpz*6ud}a?^$eo`000_vQchFZ%m6?@nczSGKtKTCnSVg)>Y3o#%$eXoK$)t1?Y95` z1;0r|K~z{r<(Aod+Ex_A)g@`V?`i8bwkZO~;FL681HnRUDFH8O*{Mxzw%AVo|EJEJ zbFU;feM%oK^YFW)Idew9$7ko>C(d8q;=}ca>o2_n@8ICzCGg=Q7%$Nm59AQ&_Cf!CZo6F~OjbtK`Y~*see3p75c}zz>d+fT&!~#Sx^~AAY?iizPBOmyw=d<~2 zgR_l%7MNd1;ILrXbrTJ43U$p)Cfs8ZXSDCWauf50Z6owHI- z@)x9n^!(u?=a=l$r+Ce~ao3$!Zp7npcmAo>$#SC+$AKO&^>{-)q8qk)R{WeL!LJ@7 zJZ_LFdL)y3!&!;U&I98?2g_F1eB+mc)pb|2C-jC?5dP7*|9n@j=fC2*U3}kJi@n|1 zd4KX`XJ;-JQ^xBpc+KeK*c<@Y+}c_!_LdIlK=DwI8MgYI*f|@Ek#R$212&mfx0&3l zv)W-!>O7eP1|5{Gu9=}f;Q!87zdqNRv%0$a=6AW?tll~i*(aerNJq09cBcq0`zAQOr7R*G>28>-%-DI+Znbi(hyf3(M9duB(x@Lxc%i1}bFMZT+ zp4Yk9J32Z!+PxTEj7H!S@aWhv=hlf|g^Wo6& z<@x#f@ci8B2|Tx>-YNIS*cp8ZgvOw z>rX2<%s_alPDgjJSuIsW$KR&tg7Dyw=^M5>Je5*KGW*>=W|2u$kK`a$b(4wwa>lUj zfS@pQ(50sm>{Xpf*3S)L=V+fnH&d=yzuDDuI^9mU+ubadilt2ej+>=YsehIrKvhJ(3TW#i|FH(jlCcNcyQ0O$V~oO@G^&Iy2Wup#VSPo0#VM%bn8w_sy2)&fk>gFoVmox$Vhk*#xrrT6f^2nqkfVM+ zi98EEQo_#4Gonr*9p-zEpK3PS&1N&@d7htY6Whup=)UiHDavH;Ca39Xn_26pE}pi| zLZ$Bc>XBVwnN`-zHuw6TdcqFM)TNyIrLyQ|uko91ni+VQ$wS(|k$>+ycMJIZTJqWR z^T1n*KfEsm51$kDvCsEQ-qKdOfX{vmrVcF7gAXUo_tg5S^ZiB6*q6^w7KleagH}6T zu)C<6%og*pm!G}uFyW?F6W=F~-!u7sC|li^?~U>ES-3$vw`AAE!*?+y7I_x=F3PUE z&YfyyI_UQYy}`6xDSzYFq~F7FR<2YkvmSN)DpktW3=F;AAXBN9D`4swAU$2&nU<@8 zpL%IZH)hM#a(TwYL65V_y`KE~WI|msyMz7|F;$t>4%I0W`-3SEzlQA4n+aRJRIW}T z2mXNZD=fRv8Reuif6dGA%i8|zj`Q(1wfffC+1abJSKGCEt#Y;n!nIw)wJrMDmgq1< zSoFGjc;|*6dVLG-SInu`MaN;wGHwNa)io1`t(uuN9qQVLdR;rvPquo!R^JXgM>*Oj z$VUb9ydQk#eE!q-f13Z9&Hv%IgTMIls}KJHQVu*vh{Q3f00000NkvXXu0mjfb}Jw@ delta 2253 zcmV;;2r~Em4$cvf8Gi-<0061HP>28k2$e}hK~#9!?VI0D6iF1u`_bk(NW36~3qtl{ zL%cA=8!{nbLKb3NB1+7z2#J#&L}bj4J4hH7jYioBfsJ=u`x3Q%YWmcCedg4kMt8F$ zeQ~Uwsb78l)u~fGGo@x*+gn+u-D&)>zw+h9Z(F9b(=mg?fq%LD`_f!qT)K8J7}&m? z9koSJAF|YvMu~@ORiF5FM;()--xj>)UtygeO+UoP^xFad7YY8q#gEKSJ5fL8=b|E? zqMw@2oj|>%tglc1I{vR)5AAErSMu6?!~U=Gc0Jc<&|c5-KN@?_e)+o9-ZJ^M>1=ll zUH1?B=JNc~oPV94xwhZ$8|J7b*75ya#5S$;Xfe zY9cT7DXjjs?uYf=m}0){Bj#V~Gwb~H$LH(xx3@|xwWQA+k15U9!?SnG7x~9^O4j$} z)2;FO*=W5&^YzpN-pBgs_e-qJ|6yNcWj*k^X?#py`hRx$N%fz=hw?A$8EZe5f97Q^ zc=p%F+)pFx_xkI0(32wII`10}_&iE1z31gAsh`hA!Tgg1eaS2LaQZN2%n$NX|8ubk zo<#hgC-O1`|BKdr4~H=dUpEP=~eet*K9oAP=oq%rW7?_^EH1X`K#>1rw``z)2Vs> z^10b~xMAb|!}~V)b@yf0G88@@uc;4tijcnKsik`&gF$_)%i~Bx`apeTH9u0HSsx$M zCk@TJoG*vu@gCZIQ}|FmWBRdt%Jucl*H;hBYk!_N|L7@J4?aGo@5^VZ{}le;%D>OQ zZ+{V=eR!YWsEFsC{3iGAt3iFp)_l#^{LSODx9{E>8z;l|S^Jq;{%Kha>T~=%;9C{> zkp4+U{$0%{^C#a)zg6e+KdE;LPZaXhHca!0`D8je|L zmVd@t{z&jrA9?h1r09$LIQ~fR3r*FN~J^2aE_gMH}2+TKy$MveJ zAIj&VvcAU^>jBo-@rtLC|4=>n_?W&gpQ-+1ysw_C=3lEHpZ~!A&F1gUo6X0Y=HShN zjlr9NZRrO;^)>G{UCYEGuES?Nd4gY>n0YWkskqPDiaq4|b*&cDXWdf>cj`PBHBKDEC5hy2U@hx}vy zQ|m{oH*IY-|Jr`!>umncyqUW*XEq+?H|ZakUcYBs3VM(Fn89m}UwgD>`#G4Wh=1uz zp0t?bF|3cA^n<+A$FU**nx_>1l4n->mn{32JiX`h!}-ztpl&Fintqjh%Jog1ujF|Q z`_Vjw>LJF*^nLjc`Iq@m(XU!Rq5UQIrOc;~&*py22NbdP^P1`X-YW&YhfK}ae9hln zKAZhv)?lpOTeW|8he7X2uI6jL=6`PTgxrm zH#;+1Zu2p%m6qx5bxUJN13A3*=}R9xhWZ@4r|V-&ysEFT=%?g=dDZ#w@iG09|Gkla zHJ{UvPn<90bBy))QS$@2_34N5S<3(ZFh4YH{*PU-_eSe1XzdNeWjE?FpbZZDt+?sH&?M-%y0XxHJE;Vi6#N>nx z97|e`-7WLX@L1IE>~?I}q%O8bK46SZ(&8|w^uK~w-)=I{biB}KPoyDPo(t%qrMeXZtv{z*nfJB>4)+O*L6XzYuYc{q8F-+Uuc?m@!1z8TUg%pMSn0?9{(<|r`R=Frm-_ZMQ;|>fjq_!F zYVE-a>nm#@=j-G7UfMwqAKawqYx#7CR(wzkxv>XH%6z@`z`V#KzvhEr^uz~+vL3Ae zl~t9G>D%A9#X8V?rFBa1pTxsKu(n=U&scM6JGZ&*T>_%QvCb$efh*O%!lS1st2q$$xD6qq}7A;FZq~0v($2aQvFxq ztJY6S{zkDDLi;z5k9l7s%m2s*$AiYF_piR3{CODux5|qN|Ms}%Yrf|HPyAIL>v=Tt bO`rV(4x|z!CSsV?00000NkvXXu0mjfA)NvE diff --git a/res/images/indeterminate4.png b/res/images/indeterminate4.png index 7a6415149b52da5eef9bb2c15181597a5a8033ac..ad5d9a5429afa83c4f48bac0f2bd815f58f7d81c 100644 GIT binary patch delta 1908 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 delta 2245 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 Ta4TG900000NkvXXu0mjf#`58_ diff --git a/res/images/indeterminate6.png b/res/images/indeterminate6.png index ddd9e7384c2342e6fc5a6160ada2d9a919b673e4..c0c66386a911cc023dbc70cacec8aaa0d47617e3 100644 GIT binary patch delta 1910 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 diff --git a/res/images/progress_bar_empty_left_round.png b/res/images/progress_bar_empty_left_round.png deleted file mode 100644 index dae7d5d138e560c4caae88c944a1f47ee220aee5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmV<203-j2P)T8*MnwRMmkdyF*WHZWhMa;GYNpP)>5miwG7Qq|Io}NAY!Hi zV5CDx#}Fcfv3k*H=ElbA1qRw=V`JF*-q&7L8N2Q7rM7jhUAg{v|M)z8ozDB){rx}b WdRTB|6M*9Y0000| diff --git a/res/images/progress_bar_empty_right_round.png b/res/images/progress_bar_empty_right_round.png deleted file mode 100644 index 5427088234104c2dda96a8c3f60d64cd6dd1ee56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!{!3HEfez(s7QnNf=977}|Sr01uH3tf?9e8-Y zOP8zp0YeOLuj*bFsrbuF+FDjOJYbmWDsWHTOw-uzp1qy_@ynmTR+Sc8$gQ*eyZp`S z<*s>0gJX*rEAA-q%nbRO-yLw}{2vBqRmKf#w|>dW)}8&(CcVvzNl8nXAzH1)C&#HJ zfGuM4l}!?5W!vV;vM$>d9o}6Ne&6)Z*1Fa0zuVXQ-20~g`+B`tL|7~*^V35>S2B3I L`njxgN@xNA*1l0< diff --git a/res/images/progress_bar_fill.png b/res/images/progress_bar_fill.png deleted file mode 100644 index 37c04b4f4636b004f8c111fe6350318e85e90fb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{H!2~1^=N$M3q&N#aB8wRqxP?HN@zUM8KR`is zPZ!4!j_b)k>gP5-{GX~}$A5Hr;|~j=d+bMdFQ|~7a<4_DOlFNZ!xC3zmwVb5&jPhD Nc)I$ztaD0e0szRaBg_B* diff --git a/res/images/progress_bar_left_round.png b/res/images/progress_bar_left_round.png deleted file mode 100644 index e72af47d4a9457c666dc3219e13db017724bd248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!{!3HEfez(s7QeB=djv*44bNdwem<$D6_pf;) zYQZFQT5!UgMe0sU0vs$&EvCK^fq{-eoliN=rfsh5Sa?(+&PYGsNRqMYXzhxd{#u9i zCfqp`{6hA6tIi3h(l5p@wNo68j%Y}!T?~-^H^tH9h_A_-lFX&+V|lkeR2O&t`sP{O uslw1-TYo1Czj`26&HlwA*SWXu7elMiqV3zi`C0*8#o+1c=d#Wzp$P!XbV#uP diff --git a/res/images/progress_bar_right_round.png b/res/images/progress_bar_right_round.png deleted file mode 100644 index d04c980b93d5f770625451d997c1d861eae83dc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!{!3HEfez(s7Qth5Djv*4^$$#qN9z6f7ANRD& z%v;^y-~KZn=09XVzW??7ybtD zIhDvz$hY|PpMzSP`6JKk<;d(X+QE2xLTZA{hBIn9M)q|De;Q|({q22Jx}mtP=J}8E sH;svgkG~&gvOjNcuC<-#t~Db=MSu9?2?r+I0-eO*>FVdQ&MBb@0BI~wfB*mh diff --git a/res/images/progress_empty.png b/res/images/progress_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..4cb4998dd9d67bf76156db33a352d290f97410f2 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^e}GtogBeK9OIolCNYw@Sgt!)$76VaoW^!_D^43jT z*REQ-cG=pcianor=_js|Ns9jO)WqMklWMOGiB10DbuD*nKfm~yeV@g&6zW6 z4p8ONWlNW?S_;&-b=}se*r=$)D4=P{iOI>S$v~5{Q?s)(v$J!viwi+^6;~ElS5{Zo zR`=BQoOw2f5$F=0k|4j}g0I(pUxN?~fBpZk0LA+}T^vIq4nMufF4kngz;bbEi`c{q zF1`y_sNDJA^i1w|zCpf%>%V1FxH$uDJVlwFep1>xWrf@pEuPOOX4;)&t}@m1n*8cw zscd=;kNfRy=3a&}54o1CW2mnRT7G=Ggx!%1Z*MzlwjExZw^Zct!nvkX)?D5Y745ZA xdS;?+zR{B7ey=-jTvuGlg?+cP&zJx%oq*-h(v zPmt`ENP-cx6hXMQlM&v_4`YzzSuP1fwgx2A{2@VQOQ x ? gProgressBarFill : gProgressBarEmpty)[CENTER_TILE]; - gr_blit(s, 0, 0, gr_get_width(s), gr_get_height(s), dx + x, dy); - x += gr_get_width(s); + if (pos > 0) { + gr_blit(gProgressBarFill, 0, 0, pos, height, dx, dy); + } + if (pos < width-1) { + gr_blit(gProgressBarEmpty, pos, 0, width-pos, height, dx+pos, dy); } - - s = (pos > x ? gProgressBarFill : gProgressBarEmpty)[RIGHT_SIDE]; - gr_blit(s, 0, 0, gr_get_width(s), gr_get_height(s), dx + x, dy); } if (gProgressBarType == PROGRESSBAR_TYPE_INDETERMINATE) {