From b86c9235c58393f3499f1d9fdeb278251cca5a13 Mon Sep 17 00:00:00 2001
From: xolatile <xolatile@proton.me>
Date: Sun, 19 May 2024 04:52:43 -0400
Subject: [PATCH] Fixed borders in fill bars...

---
 source/main.adb                   |   6 ++++--
 ui/goblin/fill_bar_right.png      | Bin 365 -> 334 bytes
 ui/goblin/tiny_fill_bar_left.png  | Bin 416 -> 502 bytes
 ui/goblin/tiny_fill_bar_right.png | Bin 385 -> 354 bytes
 ui/main/fill_bar_left.png         | Bin 412 -> 413 bytes
 ui/main/tiny_fill_bar_left.png    | Bin 362 -> 382 bytes
 6 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/main.adb b/source/main.adb
index e4df73a..a54371e 100644
--- a/source/main.adb
+++ b/source/main.adb
@@ -315,8 +315,10 @@ begin
 		end loop;
 		--
 		resource.draw_points  (player.resources, (preview_width - 4 * icon * resource.count) / 2, (if view_list (map_preview_panel) then icon else 0));
-		--~ui.draw_fill_bar      ((preview_width - 320) / 2, 4 * (if view_list (map_preview_panel) then icon else 0), 320, 0.6);
-		--~ui.draw_tiny_fill_bar ((preview_width - 160) / 2, 5 * (if view_list (map_preview_panel) then icon else 0), 160, 0.8);
+		--~ui.draw_fill_bar      ((preview_width - 320) / 2,       4 * (if view_list (map_preview_panel) then icon else 0), 320, 0.0);
+		--~ui.draw_tiny_fill_bar ((preview_width - 160) / 2,       5 * (if view_list (map_preview_panel) then icon else 0), 160, 0.0);
+		--~ui.draw_fill_bar      ((preview_width - 320) / 2 + 400, 4 * (if view_list (map_preview_panel) then icon else 0), 320, 1.0);
+		--~ui.draw_tiny_fill_bar ((preview_width - 160) / 2 + 400, 5 * (if view_list (map_preview_panel) then icon else 0), 160, 1.0);
 		--
 		signal_list (signal_mode).all;
 		--
diff --git a/ui/goblin/fill_bar_right.png b/ui/goblin/fill_bar_right.png
index 23995d37817892e7faacd5a0a25b6c0d9b22cd38..539e94098c5ced7d53319a86b4eb29f97c1b3c09 100644
GIT binary patch
delta 286
zcmV+(0pb4b0?q=EIe!32L_t(Y$IX@94TCTYgfEB%vVvF03O7q;=n7qd6}m!JU<I$h
z2=t-+wg~L-QcDO4k?(RoLxMz%aFz}T)_2>S;I6L6XcY-L`5j0Ey58obK}G2R<OEpS
z8z?>p5`9jBH)M%EksuM{cG0{*5|7){7newTx?7Qhr-b%p*MF`#lcVW!hb$tHMCkAV
zUj^S<prw>`|K#M%=A^N}NrEJD&Wo7UiK#`Zy1RSYWzOImzMZNGwiB4A>M{e8OIuVG
z<T}3P)gh<f-A`9AhrES);MM;kEBw@fh#Y=s-Sc6FSN)4T@TvpH0|$V1yTB`S1;2IR
kSm4zTtnfPm0T=&LZwAZ2Xkx_;F#rGn07*qoM6N<$f*HApI{*Lx

delta 317
zcmV-D0mA;y0__5jIe#BXL_t(Y$IX?&afL7pM4uTNpar!+3#!F6q=mHL7Se)Rpar!+
z3FJV`guw|i|ME5C8|;&I1x_-t(OJHdqR)<brn}0*7KNld_fH@blqELFz=QG?@(dAs
zlS<zNGWAW8dPA0}50X@Mb9Yn~cfYr1u`b9cA^?~fIp+XG@qfimcGXN;+cf})2qHo$
zg$n%BA`xU(eBFibf*(#V{sS?y<Mcp=OLq;3nW3tvDmmva$k4Q)0jb&i&L{%80NfpS
zZwB640AH+%od9*K#)!D8VrIuPs=8bERmk(T`=65l#z^NCatb{leq?Ybe%Yv?IKWuN
zYlnB=LHYa$i#9*{7xjogx^Q~LcZ*hddMDh8zjWb5#2-%(6@LYgc$fMH022ZJb$c8h
P00000NkvXXu0mjf3=@$d

diff --git a/ui/goblin/tiny_fill_bar_left.png b/ui/goblin/tiny_fill_bar_left.png
index 4cca39ce6e70821774e55b3d30a7adeb53fff7a5..4266bbb9ec537528cf555f87bf74008ff276c2ed 100644
GIT binary patch
delta 455
zcmV;&0XY7k1NH-uIe(~0L_t(o!@ZX=a>F1HML%*HmugdPn^IT6N5~a86j$&OLYq=;
z%5789rc(-pg=}Q8pfNL^k;fMAX?Hcd01b<XCL)?z_E0TwV+;VmS_@`YFB2f5No$>c
zua;1)@Ky=c0(Vyn0MMUiB>~UJ3*_Kt2-kLelrY4{3FP3Kl7HX(yoB!eB~Gny0Puf+
zCgAEu(8mDpJ+#)ielzIo>myJCU;Te05(JhDl)%|9;5~`0!aTJ+`S=^c4*>o7c{;|Q
zkdEO!NNNiAceQZG0DqbA@k=yfWX!O<rpydu3>c3abuI8nmPj~Hd4XDZtAuKT-@gLX
zgDy5+78PbUw|~?XJiR$?@Dv^&R~QNO^jL(iUMd+Z5F-(zkPBl;3bxW0Qvd+YxsZZ6
zB#N2A%(w2g6-K&PWbK6T*sN|TsFtXJr%h^A1GN&h@XcNzsR;n0oQs-KiA36zN^&l4
z$9obrVHZtA5(z0>G?MK}<lxT+k*c9IClPC)q~H!2%RuiX(y=_kC1-=GgGnl}ssSM!
x0N$hmGhm8swFO=!a4!+tYwh8*X&rGq{|EkCzN}wNh-3f&002ovPDHLkV1jSX%aQ;9

delta 368
zcmV-$0gwLn1E2$tIe$_~L_t(o!^M|fm4h%4M!%^8EQ|##uo7wk3tI`T1uU$D#X>E_
zLM70LZOTAHGe7KUo+$L>-Y`Ql0|W*)n7F|dnS&zm{`(977%nHIn{O`i!n<QX|7Lbe
zP!t}Opa^{Y82|wJUY7V5ffBrL|E`DYt3-abi$Dq9@#1+=LVy0pEl`6;C1?+LO@bST
zfCip!Gq@&U640)EOfys?!EIL;u)x#r1MoGdCDwZgh2SCvUI_}pWfC|gC=8b*hXiqh
ziQ5j${Df~!un7-H9Pr`s3_<uUh}Ca}?<LH~ewl=B2`9Yx8JZ=;XK00QZbT-D$3~=u
z=Q6Ik6>B8`sA=Km!$>0`52d#&Z=J_+O+poO4i+R@2`k)GlGP+i@ON*@Rg{(_at>$`
zZkMurEg{SDe9zJwxEd2FvB&`<Jk*-4B|PwObDC?sbRFHzX=v=xp5FoN=TmA$&c+D<
O0000<MNUMnLSTaGA)s&o

diff --git a/ui/goblin/tiny_fill_bar_right.png b/ui/goblin/tiny_fill_bar_right.png
index 88be79760eca43231ac223cfd9e8a6316d8f2e03..eec06e561b77fc2ee9f82fa4c397e43b8cb20d0b 100644
GIT binary patch
delta 306
zcmV-20nPq_1L6XZIe!#ML_t(o!|hgE4Z|=Dyi6q!3Z@VW#u5ypFbbtG3ZYO6rcemo
z$NJo=ElE$>$7-pn6g9r{`P>9J<KM%H$56V-dN>w=CWi7&ZHIwH!o^UofOw$oI7(b<
zHdznE0MxYaO#zj%B;vVB6q`^ymxL3KVV!hJC_(q-?-G?n^MA2gk)2hAb!pR%$rClx
zQEWmHfdqy1PvE1*Y;rzIDJ}J@j>>S9xa5GVDpVCQ#+eLDiL4fw+2+k`N45uE!PiqU
zf^7)oPQ_ObsOl`cnL%|K&vb7Q!+Z7P<7g&agEGOZ&jJ?sM+HP=_ea#;t~Btfvw#U+
zbs=Gb13<G*SSw28DEOfZ2?M-Z0T%cX0<>H48E5=F9zWl}Xv^KA+5i9m07*qoM6N<$
Eg2q&f_5c6?

delta 337
zcmV-X0j~by0)YdNIe#-rL_t(o!|j&QZH6!mgb$PjSivi>!p)Ky{uTZevO-tz3asE2
z7=b>}prX)1f~7tbOT6LSXZs8Rp7`(4$$+Ic$!2t303nX`Nom631<}Q^z5_A<Y4Yhr
z-;!iA5J#Y8d_@N+b%)5{+lguu%HRvpkzC9SBw=Rf?Vr>YB7cYo06<j{W4r)C*rdC0
zWKXngM-KoZ0uez<2^r|e5r{xW!sb=@t}*-F!M{ML>h^d-^hI?C5UL82Ac+{GD@1?T
z;sc26jqe`ufG7aW3}$v{$RmT=q*-hSaCIxf6>*YK)$JXU>u5d_;#gMy^<3J9aHaAL
zu`{KE_%?zw@k(MNoWubjWbs_#*>@nlUvA<}{{m0(rVELu_&S2QEzv{#)`i4FytxBj
j;&%YtZpBYL@#pagQ9A+tBvQsk00000NkvXXu0mjfn8Kc?

diff --git a/ui/main/fill_bar_left.png b/ui/main/fill_bar_left.png
index 713cfa2043c19a8edc6318f5d0dc9982f3e565e7..718b784a74c757d04b79fe740bb22d2eac2d2c8f 100644
GIT binary patch
delta 365
zcmV-z0h0cl1DykqIe$+{L_t(o!|j*dZi6rkMn6Kk?b`ACwp7zzHb1wk)|KoABr6LL
zLSQ$ugapEHP8=`+_>T?Yy${~|{?Fh50)XQsB>ZrR6kJGzL*c_SaE!zR=nCMvMWV@t
z6OlXy5p_|{CC;fLkOQBSkjJY9*1$_8nwszuiKaGu?K9Er0e@epL?_Rwz2E>qM4cQt
z5y5+ZNmigXJZC!M3hdiPMf83D826PZkCGiMRjwMNcg{VT`Qw+sDB+yzYe}TwTI+Y2
zqvDIS)@==m#Jq<Xo)oAdk%AM^EtRXLZZb$b*Gf#h`?sllHFq<u^~pK+ohvcdc!~rD
ziF1xb2|P<6M`ofFp1mL$!&>{r%;!``TMJKq3zmYJU#ztcS&6OfyD4cf*4jHWzeXcE
z>`y2F2*#MtXc1bpWiLwOxds4Z%)M>fx21L8Za*S5wo|6WZUg)Qdq}9_u3LFr00000
LNkvXXu0mjfqCTpo

delta 364
zcmV-y0h9in1DpepIe$(`L_t(o!|j*LZo?oDMK3sMyB_9$6Gv5lmdCbH)0l1?2~iva
z26xkuys$jt9L6xlz<+EA=bU%WO@9Ul-~sF}5yE$uNWlXMzbkxR1N%rUfX)EUTO>p-
zoQT4E5YZUroZ_4&0y*$!65)NZKnc87LbQa}NQl<((lsG^z<*aNF^11&FE{`Y(HPF0
zh~S(%g*mbpJXa#DK;JeR#57H}UjjrV!w!}zSBrIEt-UkzN2&rKB5AFiT1lkfN~!nc
z8hC_KYG@&m*a1F<Ck0waq~Jt!N#)9=L1u}2sl>wGzbxg;XM-uF4%XW5T#2>DQ!Fq`
z9CIXU;8_AW5@ogU>;uUoj4@x#e2hOZTfUmIM1YxJj4`*c5?kB1sA(|9m@6~CMzh)N
zPsjuCTI<i~5L$I*A4=nQ4FFo}>o5#&Yv;ahKO!xzL#9Nx3H|`~L8$lw+x`In0000<
KMNUMnLSTYaRimT;

diff --git a/ui/main/tiny_fill_bar_left.png b/ui/main/tiny_fill_bar_left.png
index 1c595eeddb2e5bd76782da06a753b0ac1b6c147a..0017889e0eeec4cb3857031d47309c5aa678106f 100644
GIT binary patch
delta 334
zcmV-U0kQt-0{#M!Ie#!oL_t(o!|j*dZo?o9MvYf#_lEaP`@Dhgw$s*z-DDDCf$+CP
znrexgD9Jenn-HQ`bi_Q*cL4r0I1zaw@;wr&<sobBhcV_oyawQy%&oPbKbgm4or&7f
z4hQfH+8|LD&bhA*(3Oa;Jrb%EuC=~|>n$R;s0Jnxsjdk%0)L*9*t?f^;Ez%`5s`@8
z!pud4thG~)!5R2dYyDOVPe~YK$T>Gv39N9gg{LI6)=3E-4X>5ps4$ih@SFsIX|oFe
zEFz*t!An{+?gB+81P9Zl;ueahYgG2(%yP75LnTT!Cf+EVArhs#A}6Z1OQL2==1dDU
zNz}lz0xc4?@JHg-1K{^w-1<4LDJuUL2a;}y!;WMriQYr0YF&<Sy#ul1w(~Gs0Lv+V
gM{5n71OGSi4S9;WD6q?yQ2+n{07*qoM6N<$g7zGnbpQYW

delta 314
zcmV-A0mc6Q0_p;gIe#2UL_t(o!|j*bZo@DLh9Ro7d&v8?dENlGoz|`1O)FX1(tyc9
znug??DE9wx2si-$mauUguVz*b69<3-03`!~Et^E-z3=<C`k9&S<GF}@JUySTM<k-F
zUEIumh&Dj@OjU2c2wec+l7T?4I5VH>d=t?ysev;Qg=+%W5PyFKG57A%x&`r1uQ&hz
z5e>EHL<AyoZi;}aelc?w@n$X(stU|JxB)WaQ3%{ZJOY7}4R<2KHN?GziCc<$AiC^a
z$l5doCHft&mVzxHJdFuwHl`uGT@ha#&<qi2$+&P(7$Q0k(BX|6qGcGNGo*_Ut>ZXS
zRAq|`Ng86eD>K;~MD|jOt?8)qU4iY_&TDVY?0(4K(W3^A5&tvx4e!vr6#*cp82|tP
M07*qoM6N<$f_OrXng9R*