Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2024-11-23 11:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes for images

Browse source
This commit is contained in:
Felix Kratz 2022-01-15 12:35:00 +01:00
parent 5997cae3ea
commit 2fe5f11617
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/text.c
View file

@ -118,11 +118,8 @@ void text_clear_pointers(struct text* text) {
uint32_t text_get_length(struct text* text, bool override) { uint32_t text_get_length(struct text* text, bool override) {
if (!text->drawing) return 0; if (!text->drawing) return 0;
int len = text->bounds.size.width + text->padding_left + text->padding_right; int len = text->bounds.size.width + text->padding_left + text->padding_right;
if (!override && text->background.enabled && text->background.image.enabled && text->background.image.bounds.size.width > len) { if ((!text->has_const_width || override) && text->background.enabled && text->background.image.enabled && text->background.image.bounds.size.width > len && !text->has_const_width)
text->has_const_width = true;
text->custom_width = text->background.image.bounds.size.width;
return text->background.image.bounds.size.width; return text->background.image.bounds.size.width;
}
if (text->has_const_width && !override) return text->custom_width; if (text->has_const_width && !override) return text->custom_width;
return (len < 0 ? 0 : len); return (len < 0 ? 0 : len);
@ -147,13 +144,13 @@ void text_destroy(struct text* text) {
} }
void text_calculate_bounds(struct text* text, uint32_t x, uint32_t y) { void text_calculate_bounds(struct text* text, uint32_t x, uint32_t y) {
if (text->align == POSITION_LEFT) { if (text->align == POSITION_CENTER && text->has_const_width)
text->bounds.origin.x = x;
} else if (text->align == POSITION_CENTER && text->has_const_width) {
text->bounds.origin.x = x + (text->custom_width - text_get_length(text, true)) / 2; text->bounds.origin.x = x + (text->custom_width - text_get_length(text, true)) / 2;
} else if (text->align == POSITION_RIGHT && text->has_const_width) { else if (text->align == POSITION_RIGHT && text->has_const_width)
text->bounds.origin.x = x + text->custom_width - text_get_length(text, true); text->bounds.origin.x = x + text->custom_width - text_get_length(text, true);
} else
text->bounds.origin.x = x;
text->bounds.origin.y =(uint32_t)(y - ((text->line.ascent - text->line.descent) / 2)); text->bounds.origin.y =(uint32_t)(y - ((text->line.ascent - text->line.descent) / 2));
if (text->background.enabled) { if (text->background.enabled) {