From 971ce1d54144e85f2c6a0bbbada87f6500e8ae24 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Thu, 27 May 2021 22:35:13 +0200 Subject: [PATCH] place the placeholders --- assets/background.png | Bin 2214 -> 4473 bytes assets/fxconv-metadata.txt | 2 ++ assets/icons.png | Bin 530 -> 467 bytes include/bar.h | 6 +++--- include/choice.h | 4 ++-- src/bar/draw.c | 5 +++-- src/main.c | 9 +++------ 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/background.png b/assets/background.png index 82f3be1e5517d743d0c31f68d58a95b9d30be96a..bf85f64632d0af91e7ddcb2dab1a5a379d0a4915 100644 GIT binary patch literal 4473 zcmeHLeN0nV6n_ngEEuRZ2ImA}6JwAFV=fZLYMq0z7hO@%)GTQMw*{l}p+Z_(>@y@} zBiSslP5hem8_eBKmD%DS}AaV)~O0mc``e=bsKC$ja?#;a7Wg7rd^@ z(?1ZUg_U3amiOT@dj<7*y3FzY7an!*oQw{&Kv;)<+%SD=-x}70nXvW@&+0{_Jp=wC zU4c%T7M9e}L1~+UUsx~vJC@e~|8Yh+m!R+n9bM!+@LJ^y0ZCv}0Pud(%d#9HYR71E zQJ+8pE#SzzymiFMPhU6dA!XHeF_EOS^s*a8{GH6?n_P(#sLW7JgM5CYfMX*d6V}k| zW1Kr&?)^*JmKMF~$c6Z}^8}+=)Cn)-LhGXSk$c*hd)l}J~N zz1Y*^1cr!{%Gn)=B1wvGXn0M!^@Jnz0bm^ZiSJmskto z4)btUhhH?iVOWO=e6%1)J}{O?$#Lekfw+h7tjkD#bbm)I$^l^8wT)6tPjMVE-^m_{ zfhjBiOVY~~atv3)S_(5FAyK6hm+s*>P?@An>^{M08?0fC|4@#GRhZX!@PpGu{LvK1| zkYSfv>7yFz7+FedOXRjAG`Iz2A5<%8(I)0Vya(c25bJ?h6UDwD_C}E(h#X1egd!(= zr<}0ck(*kY?Kx$sId+Wg{n{`aHxsva?o3ikZC&EbTZ-3P>N4&`fsPW@cySHHubkv z_JFIOZIGJ`EN)pkIq8Xg-Pfv)GQ+HkdK&lRuAch`O3G#yu53l6GgKcF@r}igj@{Z1 zJ8PeJgerWb$BJ_i$tS4H9~04)Y3Uu;(q60W0wVjSqV}QGnG^d`LC_*)VegKL=2veL BUr7J} literal 2214 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 U7y~Lk9{>OV07*qoM6N<$f|vaIAOHXW diff --git a/include/bar.h b/include/bar.h index ddae9ba..755d51d 100644 --- a/include/bar.h +++ b/include/bar.h @@ -8,9 +8,9 @@ extern bopti_image_t bimg_icons; #define BAR_Y 48 #define BAR_HEIGHT (DHEIGHT - BAR_Y - 16) #define BAR_BASE_FILL 0.5 -#define BAR_ICON_HEIGHT 16 -#define BAR_ICON_WIDTH 16 -#define BAR_ICON_Y (BAR_Y - BAR_ICON_HEIGHT - 16) +#define BAR_ICON_HEIGHT 24 +#define BAR_ICON_WIDTH 24 +#define BAR_ICON_Y (BAR_Y - BAR_ICON_HEIGHT - 12) struct Bar { int id; diff --git a/include/choice.h b/include/choice.h index 0ebf074..e74f839 100644 --- a/include/choice.h +++ b/include/choice.h @@ -6,8 +6,8 @@ #define CHOICE_OK "OK" #define BUTTON_WIDTH 52 -#define BUTTON_HEIGHT 32 -#define BUTTON_Y (DHEIGHT - BUTTON_HEIGHT * 1.7) +#define BUTTON_HEIGHT 24 +#define BUTTON_Y (DHEIGHT - BUTTON_HEIGHT - 12) struct Choice { int cursor; diff --git a/src/bar/draw.c b/src/bar/draw.c index 033da01..762a8d8 100644 --- a/src/bar/draw.c +++ b/src/bar/draw.c @@ -25,6 +25,7 @@ bar_draw(struct Bar bar) dsubimage(bar.x, i, vimg_bar3, 0, bar.limit_height, vimg_bar3->width, 1, DIMAGE_NOCLIP); /* draw icons */ - dsubimage(bar.x, BAR_ICON_Y, &bimg_icons, BAR_ICON_WIDTH * bar.id, 0, - BAR_ICON_WIDTH, BAR_ICON_HEIGHT, DIMAGE_NOCLIP); + dsubimage(bar.x + (BAR_WIDTH - BAR_ICON_WIDTH) / 2, BAR_ICON_Y, + &bimg_icons, BAR_ICON_WIDTH * bar.id, 0, BAR_ICON_WIDTH, + BAR_ICON_HEIGHT, DIMAGE_NOCLIP); } diff --git a/src/main.c b/src/main.c index af7b55f..63ae41a 100644 --- a/src/main.c +++ b/src/main.c @@ -16,7 +16,7 @@ main(void) { int i; key_event_t key_ev; - usb_interface_t const *interfaces[] = { &usb_ff_bulk, NULL }; + usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL}; /* init */ usb_open(interfaces, GINT_CALL_NULL); @@ -43,18 +43,15 @@ main(void) static void main_draw(void) { - static color_t colors[4] = { C_RED, C_GREEN, C_BLUE, C_WHITE }; extern bopti_image_t bimg_background; int i; /* draw background */ - dimage(0, 0, &bimg_background); + dimage(-2, 0, &bimg_background); /* draw bars */ - for (i = 0; i < BAR_TOTAL; i += 1) { - *vcol_bar3 = colors[i]; + for (i = 0; i < BAR_TOTAL; i += 1) bar_draw(bars[i]); - } /* draw choice */ choice_draw(choice);