mirror
/
pimoroni-pico
kopia lustrzana https://github.com/pimoroni/pimoroni-pico
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

PicoVector: render text that doesn't end with a linebreak.

pull/1019/head
Phil Howard 2024-06-05 14:44:35 +01:00 zatwierdzone przez Phil Howard
rodzic e48c798bdb
commit e2ce6eb416
1 zmienionych plików z 6 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
libraries/pico_vector/alright-fonts.h
Wyświetl plik

@ -250,6 +250,7 @@ void af_render_character(af_face_t *face, const char c, af_text_metrics_t *tm) {
int get_line_width(af_face_t *face, const char *text, af_text_metrics_t *tm) { int get_line_width(af_face_t *face, const char *text, af_text_metrics_t *tm) {
int line_width = 0; int line_width = 0;
char *end = strchr(text, '\n'); char *end = strchr(text, '\n');
if (!end) end = (char *)text + strlen(text);
for(char c = *text; text < end; text++, c = *text) { for(char c = *text; text < end; text++, c = *text) {
af_glyph_t *glyph = find_glyph(face, c); af_glyph_t *glyph = find_glyph(face, c);
if(!glyph) { if(!glyph) {
@ -297,7 +298,9 @@ void af_render(af_face_t *face, const char *text, af_text_metrics_t *tm) {
caret.y = 0; caret.y = 0;
char *end = strchr(text, '\n'); char *end = strchr(text, '\n');
while(end) { if (!end) end = (char *)text + strlen(text);
while(true) {
int line_width = get_line_width(face, text, tm); int line_width = get_line_width(face, text, tm);
for(char c = *text; text < end; text++, c = *text) { for(char c = *text; text < end; text++, c = *text) {
@ -331,7 +334,9 @@ void af_render(af_face_t *face, const char *text, af_text_metrics_t *tm) {
} }
text = end + 1; text = end + 1;
if (*text == '\0') break;
end = strchr(text, '\n'); end = strchr(text, '\n');
if (!end) end = (char *)text + strlen(text);
caret.x = 0; caret.x = 0;
caret.y += line_height; caret.y += line_height;