fix text rendering

include/config.h

@@ -22,16 +22,18 @@
 #define MENU_PREFER_VOLCANO
 //#define MENU_PREFER_CRAFTY
 
-#ifdef MENU_PREFER_VOLCANO
-#define VOLCANO_AUTO_CONNECT_TIMEOUT_MS 2000
-#endif // MENU_PREFER_VOLCANO
-
 #ifdef NDEBUG
 // Release build
+
 #define AUTO_MOUNT_MASS_STORAGE
 #define AUTO_LOG_ON_MASS_STORAGE
 #define DEBUG_DISK_WRITE_SOURCES
-#endif
+
+#ifdef MENU_PREFER_VOLCANO
+#define VOLCANO_AUTO_CONNECT_TIMEOUT_MS 2000
+#endif // MENU_PREFER_VOLCANO
+
+#endif // NDEBUG
 
 #define WATCHDOG_PERIOD_MS 1000
 

src/console.c

@@ -233,6 +233,7 @@ static void cnsl_interpret(const char *line) {
                 .width = 240,
                 .height = 240 - y_off,
                 .margin = 5,
+                .fg = RGB_565(0xFF, 0xFF, 0xFF),
                 .bg = TEXT_BG_NONE,
                 .font = &font,
             };

src/lcd.c

@@ -273,6 +273,13 @@ void lcd_write_point(uint16_t x, uint16_t y, uint32_t color) {
 }
 
 void lcd_write_rect(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint32_t color) {
+    if (right >= ST7789_PICO_ROW) {
+        right = ST7789_PICO_ROW - 1;
+    }
+    if (bottom >= ST7789_PICO_COLUMN) {
+        bottom = ST7789_PICO_COLUMN - 1;
+    }
+    //                 handle,       left,         top,      right,    bottom, color);
     st7789_fill_rect(&gs_handle, 240 - bottom - 1, left, 240 - top - 1, right, color);
 }
 

src/text.c

@@ -19,6 +19,7 @@
 #include "config.h"
 #include "log.h"
 #include "lcd.h"
+#include "menu.h"
 #include "text.h"
 
 typedef struct {
@@ -50,8 +51,10 @@ static void pixel_callback(int16_t x, int16_t y, uint8_t count, uint8_t alpha,
                            void *state) {
     state_t *s = (state_t*)state;
 
-    if (y < 0 || y >= s->options->height) return;
-    if (x < 0 || x + count >= s->options->width) return;
+    if ((y < 0) || (y >= (s->options->y + s->options->height))
+        || (x < 0) || ((x + count) >= (s->options->x + s->options->width))) {
+        return;
+    }
 
     while (count--) {
         lcd_write_point(x, y,
@@ -167,7 +170,7 @@ void text_box(const char *s, bool centered) {
     int width = 240;
 
     int y = 50;
-    int height = 120;
+    int height = MENU_MAX_LINES * (20 + 2);
 
     struct text_conf text = {
         .text = "",
@@ -175,11 +178,11 @@ void text_box(const char *s, bool centered) {
         .y = y,
         .justify = false,
         .alignment = centered ? MF_ALIGN_CENTER : MF_ALIGN_LEFT,
-        .width = width - 4,
-        .height = height - 4,
+        .width = width,
+        .height = height,
         .margin = 2,
         .fg = RGB_565(0xFF, 0xFF, 0xFF),
-        .bg = RGB_565(0x00, 0x00, 0x00),
+        .bg = TEXT_BG_NONE,
         .font = &font,
     };
 
@@ -187,7 +190,7 @@ void text_box(const char *s, bool centered) {
                    y,
                    x + width - 1,
                    y + height - 1,
-                   text.bg);
+                   RGB_565(0x00, 0x00, 0x00));
 
     text.text = s;
     text_draw(&text);