mirror of
https://codeberg.org/dnkl/yambar.git
synced 2025-04-20 03:35:41 +02:00
particle/progress-bar: don’t add margins if all sub-items are zero-width
That is, if all sub-items are zero-width, make sure *we* return a zero width.
This commit is contained in:
parent
dab6428859
commit
def90edde1
1 changed files with 18 additions and 5 deletions
|
@ -57,14 +57,27 @@ static int
|
||||||
begin_expose(struct exposable *exposable)
|
begin_expose(struct exposable *exposable)
|
||||||
{
|
{
|
||||||
struct eprivate *e = exposable->private;
|
struct eprivate *e = exposable->private;
|
||||||
|
bool have_at_least_one = false;
|
||||||
|
|
||||||
/* Margins */
|
exposable->width = 0;
|
||||||
exposable->width = exposable->particle->left_margin +
|
|
||||||
exposable->particle->right_margin;
|
|
||||||
|
|
||||||
/* Sub-exposables */
|
/* Sub-exposables */
|
||||||
for (size_t i = 0; i < e->count; i++)
|
for (size_t i = 0; i < e->count; i++) {
|
||||||
exposable->width += e->exposables[i]->begin_expose(e->exposables[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;
|
return exposable->width;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue