diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-19 12:09:44 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-05-19 12:09:44 +0300 |
commit | e13392db125b386d10ec010adf1291b6ab7cd804 (patch) | |
tree | b511b84621be0b589ab3e912868b1444a051443f /src/ui/widget.c | |
parent | f765b50caed9f2858ddf4e20ba3a6427e4750240 (diff) | |
parent | 0a9da83b10f8f3a1f7f0b03da30a646b9e8d4da3 (diff) |
Merge branch 'dev' into work/typesetter
Diffstat (limited to 'src/ui/widget.c')
-rw-r--r-- | src/ui/widget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/widget.c b/src/ui/widget.c index 43bbe56e..64f586ce 100644 --- a/src/ui/widget.c +++ b/src/ui/widget.c | |||
@@ -338,7 +338,7 @@ static iBool setWidth_Widget_(iWidget *d, int width) { | |||
338 | static iBool setHeight_Widget_(iWidget *d, int height) { | 338 | static iBool setHeight_Widget_(iWidget *d, int height) { |
339 | iAssert(height >= 0); | 339 | iAssert(height >= 0); |
340 | if (d->sizeRef) { | 340 | if (d->sizeRef) { |
341 | return; /* height defined by another widget */ | 341 | return iFalse; /* height defined by another widget */ |
342 | } | 342 | } |
343 | TRACE(d, "attempt to set height to %d (current: %d, min height: %d)", height, d->rect.size.y, d->minSize.y); | 343 | TRACE(d, "attempt to set height to %d (current: %d, min height: %d)", height, d->rect.size.y, d->minSize.y); |
344 | height = iMax(height, d->minSize.y); | 344 | height = iMax(height, d->minSize.y); |