Fcalva/JustUI
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/JustUI.git synced 2025-04-04 17:47:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

jlabel: align top by default and wrap lines in a smarter way

Browse source 
With this change, unless wrapped_newline_spadcing is set (which it's not
by default), spaces around explicit newlines will no longer be skipped.
This commit is contained in:
Lephenixnoir 2024-09-14 12:20:13 +02:00
parent 33e9962209
commit 4728c6ecbe
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/justui/jlabel.h
View file

@ -76,12 +76,16 @@ typedef struct {
of line number n */ of line number n */
DECLARE_VEC(uint16_t, breaks); DECLARE_VEC(uint16_t, breaks);
/* Block width (maximum length of a rendered line) */
uint16_t block_width;
/* Text wrapping mode */ /* Text wrapping mode */
enum jwrapmode wrap_mode; enum jwrapmode wrap_mode;
/* Whether the text has been allocated by the label or supplied by user */ /* Whether the text has been allocated by the label or supplied by user */
int8_t owns_text; bool owns_text :1;
/* Block width (maximum length of a rendered line) */ /* Whether to preserve spaces around line-wrapping newlines */
uint16_t block_width; bool wrapped_newline_spacing :1;
uint :5;
/* Color and font of text; if NULL, gint's default font is used */ /* Color and font of text; if NULL, gint's default font is used */
int color; int color;
@ -130,5 +134,6 @@ void jlabel_set_line_spacing(jlabel *l, int line_spacing);
void jlabel_set_wrap_mode(jlabel *l, jwrapmode mode); void jlabel_set_wrap_mode(jlabel *l, jwrapmode mode);
void jlabel_set_text_color(jlabel *l, int color); void jlabel_set_text_color(jlabel *l, int color);
void jlabel_set_font(jlabel *l, font_t const *font); void jlabel_set_font(jlabel *l, font_t const *font);
void jlabel_set_wrapped_newline_spacing(jlabel *l, bool preserve);
#endif /* _J_JLABEL */ #endif /* _J_JLABEL */

26
src/jlabel.c
View file

@ -21,7 +21,7 @@ jlabel *jlabel_create(char const *text, void *parent)
jwidget_init(&l->widget, jlabel_type_id, parent); jwidget_init(&l->widget, jlabel_type_id, parent);
l->block_halign = J_ALIGN_LEFT; l->block_halign = J_ALIGN_LEFT;
l->block_valign = J_ALIGN_MIDDLE; l->block_valign = J_ALIGN_TOP;
l->text_align = J_ALIGN_LEFT; l->text_align = J_ALIGN_LEFT;
l->line_spacing = 0; l->line_spacing = 0;
@ -31,6 +31,7 @@ jlabel *jlabel_create(char const *text, void *parent)
l->wrap_mode = J_WRAP_NONE; l->wrap_mode = J_WRAP_NONE;
l->text = text; l->text = text;
l->owns_text = false; l->owns_text = false;
l->wrapped_newline_spacing = false;
vec_init(&l->breaks_vec, sizeof *l->breaks); vec_init(&l->breaks_vec, sizeof *l->breaks);
@ -188,6 +189,12 @@ void jlabel_set_font(jlabel *l, font_t const *font)
l->widget.dirty = 1; l->widget.dirty = 1;
} }
void jlabel_set_wrapped_newline_spacing(jlabel *l, bool preserve)
{
l->wrapped_newline_spacing = preserve;
l->widget.dirty = 1;
}
//--- //---
// Polymorphic widget operations // Polymorphic widget operations
//--- //---
@ -236,7 +243,7 @@ static void jlabel_poly_layout(void *l0)
/* Start of line */ /* Start of line */
add_break(l, str - l->text); add_break(l, str - l->text);
/* A "\n" forces a newline in all wrap omdes */ /* A "\n" forces a newline in all wrap modes */
char const *end_of_line = strchrnul(str, '\n'); char const *end_of_line = strchrnul(str, '\n');
/* Also consider word or letters boundaries */ /* Also consider word or letters boundaries */
@ -257,14 +264,17 @@ static void jlabel_poly_layout(void *l0)
} }
} }
bool natural_break = (*end_of_line == '\n');
char const *next_start = end_of_line + (*end_of_line == '\n'); char const *next_start = end_of_line + (*end_of_line == '\n');
/* Skip trailing spaces on this line */ if(!natural_break && !l->wrapped_newline_spacing) {
while(end_of_line > str && end_of_line[-1] == ' ') /* Skip trailing spaces on this line */
end_of_line--; while(end_of_line > str && end_of_line[-1] == ' ')
/* Skip leading spaces on the next line */ end_of_line--;
while(next_start[0] == ' ') /* Skip leading spaces on the next line */
next_start++; while(next_start[0] == ' ')
next_start++;
}
add_break(l, end_of_line - l->text); add_break(l, end_of_line - l->text);