From 0366569b6461286d459dbbea2879b39476864961 Mon Sep 17 00:00:00 2001 From: xolatile Date: Sat, 8 Jun 2024 05:57:00 -0400 Subject: [PATCH] Made proper theme-based separators... --- source/main.adb | 6 +++++- ui/dwarf/separator_left.png | Bin 129 -> 229 bytes ui/dwarf/separator_middle.png | Bin 117 -> 125 bytes ui/dwarf/separator_right.png | Bin 127 -> 248 bytes ui/gnoll/separator_left.png | Bin 129 -> 164 bytes ui/gnoll/separator_middle.png | Bin 117 -> 184 bytes ui/gnoll/separator_right.png | Bin 127 -> 244 bytes ui/goblin/separator_left.png | Bin 129 -> 194 bytes ui/goblin/separator_middle.png | Bin 117 -> 123 bytes ui/goblin/separator_right.png | Bin 127 -> 209 bytes ui/imp/separator_left.png | Bin 129 -> 217 bytes ui/imp/separator_middle.png | Bin 117 -> 130 bytes ui/imp/separator_right.png | Bin 127 -> 144 bytes ui/kobold/separator_left.png | Bin 129 -> 229 bytes ui/kobold/separator_middle.png | Bin 117 -> 153 bytes ui/kobold/separator_right.png | Bin 127 -> 272 bytes ui/main/separator_left.png | Bin 118 -> 121 bytes ui/main/separator_middle.png | Bin 115 -> 120 bytes ui/main/separator_right.png | Bin 133 -> 132 bytes 19 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/main.adb b/source/main.adb index fa8d472..1123735 100644 --- a/source/main.adb +++ b/source/main.adb @@ -149,7 +149,7 @@ procedure main is x : constant integer := preview_width + core.icon; y : constant integer := core.icon; width : constant integer := side_panel - 2 * core.icon; - height : constant integer := chad.view_height + 11 * core.icon + 3 * core.base + 2 * offset; + height : constant integer := chad.view_height + 11 * core.icon + 4 * core.base + 2 * offset; more : constant natural := 10; less : constant natural := 5; side : constant integer := chad.view_width + attribute.count * core.icon; @@ -245,6 +245,10 @@ procedure main is -- at_y := at_y + 3 * core.icon; -- + ui.draw_separator (at_x, at_y, width - 2 * offset); + -- + at_y := at_y + core.base; + -- ui.draw_text (world.day_name (7).all, at_x, at_y + 0 * core.icon, width - 2 * offset, core.icon, more, 0); ui.draw_text (world.week_name (52).all, at_x, at_y + 1 * core.icon, width - 2 * offset, core.icon, more, 0); ui.draw_text (world.month_name (2).all, at_x, at_y + 2 * core.icon, width - 2 * offset, core.icon, more, 0); diff --git a/ui/dwarf/separator_left.png b/ui/dwarf/separator_left.png index 2016d9de103377bf1b80ccab7691a528bdc54811..23b9cfe277c5f367f4b23c8f16897308e15f0ed8 100644 GIT binary patch delta 215 zcmV;|04V=~0p$T9iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyif0s!_ zK~y-)&63Rx!ypVsA5|B~3SOZ*d4|ryEUb_fyh28xhw`T+1f(3=?`Dbj0Ne1F5s@e& zaptT$gH;s(?>%PbrUe-`vs@1)?hN)O@KSVp7s;jI0OvH4uAmEV21|WOFAsnaLWR=J zEJ?Qd@f6b7zW-gRFrZ?kslz7jEhQPA66_^Ffv?8+Y>RX-HuZ3kZm;t1^8qAEVgt{A RI-dXl002ovPDHLkV1n0RRzCm$ delta 114 zcmaFL*vP2Z8Q|y6%O%Cdz`(%k>ERLtq&YyCgAGU?;osLiQBlIf*we)^MB;LCf&zoY z)F~4G9tR&dbl|{&3DejPT8Q4+ef+?NbpA3{pO!lZn35kDH7-!*WMWV`$#J{UeXa=5 O7zR&QKbLh*2~7YvJ|v3( diff --git a/ui/dwarf/separator_middle.png b/ui/dwarf/separator_middle.png index 888d0e6013d769f8942b4dce88606bba4965f3c8..3db79c49a5375391e1fea3591cd909d82d56e737 100644 GIT binary patch delta 108 zcmXS|RqPD#bLZuf;$mQ6;Pv!y2?EjrAk4uAB;`Nz=46VWaNp;us=vIXOXrL1O9@ ziGPnnKfIHzW7Vnt_F#Kc=LBhvSq>K_vM@5JgmT2+-TABmsFlIf)z4*}Q$iB}8oeG> diff --git a/ui/dwarf/separator_right.png b/ui/dwarf/separator_right.png index 121527655fc7a7b708b00d1b117e3e3e0f636b45..7f6f4ce573602eba1d6c17327814981ec7cf9a41 100644 GIT binary patch delta 233 zcmVT2Kb8- zkt`zl>dcM6stQ1i5i@hcf&!aa*`Fk?)fzy7qX|3|P0y3Wg%Fy83YWT&I8|*5c5pJ7 z&Yj%42_~yAGp({E0x-|>I|J`PeeQ%vT=>9%ieXll>xL*IJIN6q8e@@^P`5C^y(d^N j=IvCDAL;9_{QG(Vvr2FaqsxeS00000NkvXXu0mjf_jy{C delta 111 zcmeytSg+U_;OEZECB?1mi{Vid7Nnzs!pO!lfmswO*m1I2y7#NOab55SIKRF&~2!p4q KpUXO@geCxEnIOsl diff --git a/ui/gnoll/separator_left.png b/ui/gnoll/separator_left.png index 2016d9de103377bf1b80ccab7691a528bdc54811..6fdd0ebe361fb5991de865101d6730ae1a7ec8e9 100644 GIT binary patch delta 149 zcmZo8Q|y6%O%Cdz`(%k>ERLtqy<2jgAGW^fBv61QBfj0%+tj&#Nu>vf&^=i zR};^FO{0d!#zsfa2@n6T3SeVXb@XA~e9p;0uhLC|Iqk&W?=!l--Dyt9`P6elrif=@ yANLd%$$!fwldtm_GfcNpW@b*^Xu!3CfnoC!J^j%9Z7D#T7(8A5T-G@yGywqNvoL4? delta 114 zcmZ3&*vP2Z8Q|y6%O%Cdz`(%k>ERLtq&YyCgAGU?;osLiQBlIf*we)^MB;LCf&zoY z)F~4G9tR&dbl|{&3DejPT8Q4+ef+?NbpA3{pO!lZn35kDH7-!*WMWV`$#J{UeXa=5 O7zR&QKbLh*2~7YSOe9JG diff --git a/ui/gnoll/separator_middle.png b/ui/gnoll/separator_middle.png index 888d0e6013d769f8942b4dce88606bba4965f3c8..5b4a7b487e5315a9e5eee0b83636f9c0f6329f42 100644 GIT binary patch delta 168 zcmXTj!Km07;OEZECB?b3+JS(v~Z3g3yC;yd`GuBLKa%Wu1!0_D1L38mdKI;Vst05awt AkpKVy diff --git a/ui/gnoll/separator_right.png b/ui/gnoll/separator_right.png index 121527655fc7a7b708b00d1b117e3e3e0f636b45..e58569d9447bd9e1900431dea6a0416dd8cd0295 100644 GIT binary patch delta 229 zcmb>b!l>98;OEZECB?GwB0F+GxBAgR4L(d@&G zNgnzlDvTaV=YR4u%3q4MnQrq?tuguMiACZ}KSi?~Z@sMI+^)`Dv?_gL=T>7r@ys2k djDAT=9%a9j?yh;=kq6`f22WQ%mvv4FO#ribSB3xp delta 111 zcmeyuSg+U_;OEZECB?1mi{Vid7Nnzs!pO!lfmswO*m1I2y7#NOab55SIKRF&~2!p4q KpUXO@geCxC-5|yQ diff --git a/ui/goblin/separator_left.png b/ui/goblin/separator_left.png index 2016d9de103377bf1b80ccab7691a528bdc54811..7c9c6cfc99e7e2e6d712a60569c947abf0d9fd91 100644 GIT binary patch delta 180 zcmZoERLtqy<2jgAGW^fBv61QBk74#M8ww#NzbZi5Gbr z6nI?tA2Y2f(B9#co~V(QI4!zS@Jq7>*D;C1%fDaUviJHEu0KWPzEx}HGwe3hxxQ3G zu5>|_Lw3kIZcX8|Fun;LhKFie&wPpK-TP6;Q-Ra-Zcb2}H`64p2b`a*n13DXnZ>wp fWBdgTe~DWM4fhcZJ; delta 114 zcmX@a*vP2Z8Q|y6%O%Cdz`(%k>ERLtq&YyCgAGU?;osLiQBlIf*we)^MB;LCf&zoY z)F~4G9tR&dbl|{&3DejPT8Q4+ef+?NbpA3{pO!lZn35kDH7-!*WMWV`$#J{UeXa=5 O7zR&QKbLh*2~7Yfs3d3r diff --git a/ui/goblin/separator_middle.png b/ui/goblin/separator_middle.png index 888d0e6013d769f8942b4dce88606bba4965f3c8..64030390b154c891c0b1e3df0ec807749296498b 100644 GIT binary patch delta 106 zcmXS|R_qM$bLZuf;$mQ6;Pv!y2?EjrAk4uAB;`Nz=46VWaNp;us=vIXOXrL1O9@ ziGPnnKfIHzW7Vnt_F#Kc=LBhvSq>K_vM@5JgmT2+-TABmsFlIf)z4*}Q$iB}8TB4h diff --git a/ui/goblin/separator_right.png b/ui/goblin/separator_right.png index 121527655fc7a7b708b00d1b117e3e3e0f636b45..45f639f6530111450cf7e2aa5bba30c3fd321023 100644 GIT binary patch delta 194 zcmb=w$f(#E;OEZECB?xyyD#VQ^?5Z*~i|86E!#fkCqXgUF;oq z+=X*%ZCFqG`^OveCp_J1ePdNYIfF`|*TLX+4by<)FIG2uBpzL13Orb1mi{Vid7Nnzs!pO!lfmswO*m1I2y7#NOab55SIKRF&~2!p4q KpUXO@geCw|uppxV diff --git a/ui/imp/separator_left.png b/ui/imp/separator_left.png index 2016d9de103377bf1b80ccab7691a528bdc54811..96b219e8a147e6972c100219f7e37e72fc9e6187 100644 GIT binary patch delta 203 zcmV;+05t!B0oef|iBL{Q4GJ0x0000DNk~Le0000O0000G2nGNE01PC*m60JBe~U>( zK~y-)V`RVt{}~7aMg}4QE`|SUfq1U?6`;4@&A@gAIVVP{>4au5q4S0Wok$YN~b1TDbl z3t}9@LaGK_09P=vkg9=HwF8n5A?TBnX;~IgwKSzU006WwKD*YPlERLtq&YyCgAGU?;osLiQBlIf*we)^MB;LCf&zoY z)F~4G9tR&dbl|{&3DejPT8Q4+ef+?NbpA3{pO!lZn35kDH7-!*WMWV`$#J{UeXa=5 O7zR&QKbLh*2~7Yp<|Kar diff --git a/ui/imp/separator_middle.png b/ui/imp/separator_middle.png index 888d0e6013d769f8942b4dce88606bba4965f3c8..9e3ab0e46cae8a7294db1ce5c2e4dcd83c28b9d7 100644 GIT binary patch delta 114 zcmXSIVpQx5@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4*E#DB)@1>Eak-aXL9cg0+W- zhv&bhVS}o!Zm*K~hC92<`;GMXXfHp*-J_?c_n-Y5_mpFYG!`&1Ft{}GEa~BSei&#D NgQu&X%Q~loCIE99Ay5DS delta 101 zcmZo-ELH3b@N?(olHy`uVBq!ia0vp^93afW1|*O0@9UnZC}E@S>Eak7aXC3bfk9&G z6p4S2LqEKetz*@x{`O#dQ|AO}j#&;DCbBRxsDyIF-`)AF0jQP1)78&qol`;+03Dbf ATL1t6 diff --git a/ui/imp/separator_right.png b/ui/imp/separator_right.png index 121527655fc7a7b708b00d1b117e3e3e0f636b45..34f1936b7404f787474c0c518cf871e7c3a67b63 100644 GIT binary patch delta 128 zcmb=Qz^K?6;OEZECB?Xa!8dJ(C6+EdOZrpF4zIXs&n%J!tHF>9j% c*9ry(Z5MvASf0~DKvNk!UHx3vIVCg!0OXq|1poj5 delta 111 zcmbQhSg+U_;OEZECB?1mi{Vid7Nnzs!pO!lfmswO*m1I2y7#NOab55SIKRF&~2!p4q KpUXO@geCwsfgoZ4 diff --git a/ui/kobold/separator_left.png b/ui/kobold/separator_left.png index 2016d9de103377bf1b80ccab7691a528bdc54811..fcca2e2655a1ff05aed51ae93257a606ebfc6d9c 100644 GIT binary patch delta 215 zcmV;|04V=~0p$T9iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyif0s!_ zK~y-)rIXPO!yphtP1FTg!7F5io2A2L24?XJ9f5uzqO?HZTK^y+`H4H5fPo^Iv7peq zB$=rvegcrpW`>j!qRa=VW=Q~0PH_#;Gm~6HBNVxuaH@VZvmd~{05y&TTSPE Reggmi002ovPDHLkV1glrRu}*P delta 114 zcmaFL*vP2Z8Q|y6%O%Cdz`(%k>ERLtq&YyCgAGU?;osLiQBlIf*we)^MB;LCf&zoY z)F~4G9tR&dbl|{&3DejPT8Q4+ef+?NbpA3{pO!lZn35kDH7-!*WMWV`$#J{UeXa=5 O7zR&QKbLh*2~7YvJ|v3( diff --git a/ui/kobold/separator_middle.png b/ui/kobold/separator_middle.png index 888d0e6013d769f8942b4dce88606bba4965f3c8..3fd8a18d47993b4167f2b5f49359d4895300f2fc 100644 GIT binary patch delta 137 zcmXS&$*9;F;OEZECB?mdKI;Vst04A#* AasU7T diff --git a/ui/kobold/separator_right.png b/ui/kobold/separator_right.png index 121527655fc7a7b708b00d1b117e3e3e0f636b45..d0c1ff71cd90e178c7bfaa6cc52e268fe458a64b 100644 GIT binary patch delta 257 zcmV+c0sj7fkOCozP)G@<(MUWf=vDI176@w){V?!Fw|DW&iYv52V7Kstul^ZKj; z`msNR*kgG71bFrhL=vunksC=^Q+(EUV&zr7^H%<{^xiVrzw7)0VbO}4_T7`%00000NkvXX Hu0mjfHwkeA delta 111 zcmbQhRIk_>;OEZECB?1mi{Vid7Nnzs!pO!lfmswO*m1I2y7#NOab55SIKRF&~2!p4q KpUXO@geCws?;v9U diff --git a/ui/main/separator_left.png b/ui/main/separator_left.png index 1f832fbb0dc7284fa2236bfa7fb3bda0c4d1743f..728d4ffab6f4a49ac556ecb93685e1556089e099 100644 GIT binary patch delta 104 zcmXS`RO}4!bLZuf;$mQ6;Pv!y2?EjrAk4uAB;`NbP0l+XkK Dhh86B delta 101 zcmb;{Q|t`zbLZuf;$mQ6;Pv!y2?Ej_Ak4uAB#-d#>z=46VXNWk;us=vIXOXrK_aoI z{QbSZ$5(P`b;>@Tnv(G2{1FG91L<6aeMi_CdXKB#-{kC_57f)x>FVdQ&MBb@0AQpa A-T(jq diff --git a/ui/main/separator_middle.png b/ui/main/separator_middle.png index 9dbc84e842f8e341df1ab29babf0cafa87c8145a..d14912e8218234c49ccf6e94bf2d045e7c3c8460 100644 GIT binary patch delta 103 zcmXS}Q0xrwbLZuf;$mQ6;Pv!y2?EjrAk4uAB;`NnB1^zQQaZj&!LFf$}8vd{N%PL>AhX7F_Nb6Mw<&;$TZ C=N(M| delta 98 zcmb;@R_qM$bLZuf;$mQ6;Pv!y2?Ej_Ak4uAB#-d#>z=46VWsNn;us=vIXOXrLE`@2 x>hJRFnb_Fa_HfPMh;-b^G_CyoJ;MMNhTHSl=X)GFe+a0N!PC{xWt~$(69A9Z918#d diff --git a/ui/main/separator_right.png b/ui/main/separator_right.png index 64c350cfa084814c8653da0f76e332346e33eb15..6481f60e2bdfb916fd363986216b6a9279fdaa16 100644 GIT binary patch delta 117 zcmZo=Y++RF4DfU3<&xrJU|`_&^l%9R(gGmN!3HGdKmSjhs3_rW=IP=XVsSb-L4s9; z`B?e;dwVP~LT;KFGj~`+sl}hp_3PMkW0Xd#b