text box alignment

include/menu.h

@@ -19,6 +19,8 @@
 #ifndef __MENU_H__
 #define __MENU_H__
 
+#include <stdbool.h>
+
 #define MENU_MAX_LINES 5
 #define MENU_MAX_LEN (MENU_MAX_LINES * 32)
 
@@ -32,6 +34,6 @@ struct menu_state {
 void menu_init(void (*enter)(int), void (*exit)(void));
 void menu_deinit(void);
 
-void menu_run(void (*cb)(struct menu_state *));
+void menu_run(void (*cb)(struct menu_state *), bool centered);
 
 #endif // __MENU_H__

include/text.h

@@ -48,6 +48,6 @@ struct text_conf {
 void text_prepare_font(struct text_font *tf);
 void text_draw(struct text_conf *tc);
 
-void text_box(const char *s);
+void text_box(const char *s, bool centered);
 
 #endif // __TEXT_H__

src/menu.c

@@ -102,13 +102,13 @@ void menu_deinit(void) {
     buttons_callback(NULL);
 }
 
-void menu_run(void (*draw)(struct menu_state *)) {
+void menu_run(void (*draw)(struct menu_state *), bool centered) {
     if (draw) {
         draw(&menu);
     }
 
     if (strncmp(buff, prev_buff, MENU_MAX_LEN) != 0) {
         strncpy(prev_buff, buff, MENU_MAX_LEN);
-        text_box(buff);
+        text_box(buff, centered);
     }
 }

src/state_crafty.c

@@ -116,7 +116,7 @@ void state_crafty_run(void) {
     uint32_t now = to_ms_since_boot(get_absolute_time());
     if (((now - last) >= CRAFTY_UPDATE_TIME_MS) || (last == 0)) {
         last = now;
-        menu_run(draw);
+        menu_run(draw, true);
     }
 
     if (wait_for_disconnect && !ble_is_connected()) {

src/state_scan.c

@@ -128,5 +128,5 @@ static void draw(struct menu_state *menu) {
 }
 
 void state_scan_run(void) {
-    menu_run(draw);
+    menu_run(draw, false);
 }

src/state_volcano_run.c

@@ -136,7 +136,7 @@ void state_volcano_run_run(void) {
     }
 
     // visualize workflow status
-    menu_run(draw);
+    menu_run(draw, true);
 
     // auto disconnect when end of workflow is reached
     if ((!wait_for_connect) && (!aborted)) {

src/state_volcano_workflow.c

@@ -74,5 +74,5 @@ static void draw(struct menu_state *menu) {
 }
 
 void state_volcano_wf_run(void) {
-    menu_run(draw);
+    menu_run(draw, false);
 }

src/text.c

@@ -152,7 +152,7 @@ void text_draw(struct text_conf *tc) {
                 tc->text, line_callback, &state);
 }
 
-void text_box(const char *s) {
+void text_box(const char *s, bool centered) {
     static struct text_font font = {
         .fontname = "fixed_10x20",
         .font = NULL,
@@ -172,9 +172,9 @@ void text_box(const char *s) {
         .x = x,
         .y = y,
         .justify = false,
-        .alignment = MF_ALIGN_CENTER,
-        .width = width,
-        .height = height,
+        .alignment = centered ? MF_ALIGN_CENTER : MF_ALIGN_LEFT,
+        .width = width - 4,
+        .height = height - 4,
         .margin = 2,
         .fg = RGB_565(0xFF, 0xFF, 0xFF),
         .bg = RGB_565(0x00, 0x00, 0x00),