From 3044919d1743041ec887643ce788ff357be86e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Mon, 28 Jun 2021 23:53:59 +0200 Subject: [PATCH] fix: hide new line and carriage return for renderer string --- lib-gui/src/renderer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib-gui/src/renderer.c b/lib-gui/src/renderer.c index f8c40a6..73cc197 100644 --- a/lib-gui/src/renderer.c +++ b/lib-gui/src/renderer.c @@ -59,7 +59,7 @@ void renderer_render(renderer_t *renderer) { } size2d_t renderer_write_string(renderer_t *renderer, uint16_t bx, uint16_t by, - uint16_t length, font_t *font, char *text, + uint16_t length, font_t *font, const char *text, display_pixel_t color) { uint16_t x = bx, y = by; size_t len = strlen(text); @@ -71,6 +71,9 @@ size2d_t renderer_write_string(renderer_t *renderer, uint16_t bx, uint16_t by, for (int i = 0; i < len && (uint8_t)*(text) != '\0'; i++) { uint16_t bytes; uint32_t c = font_get_real_char(text, &bytes); + if (c == '\n' || c == '\r') { + continue; + } text += bytes; i += bytes - 1; -- 2.48.1