external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-19 19:25:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

particle/progress-bar: don’t add margins if all sub-items are zero-width

Browse source 
That is, if all sub-items are zero-width, make sure *we* return a zero
width.
This commit is contained in:
Daniel Eklöf 2021-08-25 13:58:07 +02:00
parent dab6428859
commit def90edde1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
particles/progress-bar.c
View file

@ -57,14 +57,27 @@ static int
begin_expose(struct exposable *exposable)
{
struct eprivate *e = exposable->private;
bool have_at_least_one = false;
/* Margins */
exposable->width = exposable->particle->left_margin +
exposable->particle->right_margin;
exposable->width = 0;
/* Sub-exposables */
for (size_t i = 0; i < e->count; i++)
exposable->width += e->exposables[i]->begin_expose(e->exposables[i]);
for (size_t i = 0; i < e->count; i++) {
int width = e->exposables[i]->begin_expose(e->exposables[i]);
assert(width >= 0);
if (width >= 0) {
exposable->width += width;
have_at_least_one = true;
}
}
/* Margins */
if (have_at_least_one) {
exposable->width = exposable->particle->left_margin +
exposable->particle->right_margin;
} else
assert(exposable->width == 0);
return exposable->width;
}