mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-05 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

font: remove arrow character from font buffer

Browse source 
Arrow signs are specific to submenu items, so they would be more natural
to be handled in menu.c rather than accepting "arrow" in
font_buffer_create().

Also I allowed non-positive numbers for max_width in font_buffer_create(),
in which case the natural font width is used as the buffer width.
This commit is contained in:
tokyo4j 2024-12-03 16:09:40 +09:00 • committed by Johan Malm
parent 10fc656c23
commit 01032ef3bd
7 changed files with 28 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/common/font.h
View file

@ -44,11 +44,10 @@ int font_width(struct font *font, const char *string);
* @font: font description
* @color: foreground color in rgba format
* @bg_color: background color in rgba format
* @arrow: arrow (utf8) character to show or NULL for none
*/
void font_buffer_create(struct lab_data_buffer **buffer, int max_width,
const char *text, struct font *font, const float *color,
const float *bg_color, const char *arrow, double scale);
const float *bg_color, double scale);
/**
* font_finish - free some font related resources

3
include/common/scaled-font-buffer.h
View file

@ -18,7 +18,6 @@ struct scaled_font_buffer {
int max_width;
float color[4];
float bg_color[4];
char *arrow;
struct font font;
struct scaled_scene_buffer *scaled_buffer;
};
@ -48,7 +47,7 @@ struct scaled_font_buffer *scaled_font_buffer_create(struct wlr_scene_tree *pare
*/
void scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text,
int max_width, struct font *font, const float *color,
const float *bg_color, const char *arrow);
const float *bg_color);
/**
* Update the max width of an existing auto scaling font buffer