From 931f8248c37468c2cbdc914f57b88a4599a2694a Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Thu, 15 Aug 2024 18:43:49 +0200 Subject: Expand percentage height values for requisitions When correcting a requisition, percent values were not being computed which prevents the min-height or max-height values to be taken into account. --- dw/widget.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dw') diff --git a/dw/widget.cc b/dw/widget.cc index 8824baeb..7d83081a 100644 --- a/dw/widget.cc +++ b/dw/widget.cc @@ -1899,17 +1899,17 @@ void Widget::correctReqHeightOfChild (Widget *child, Requisition *requisition, requisition->ascent, requisition->descent, misc::boolToStr (allowDecreaseHeight)); - int height = child->calcHeight (child->getStyle()->height, false, -1, this, + int height = child->calcHeight (child->getStyle()->height, true, -1, this, false); adjustHeight (&height, allowDecreaseHeight, requisition->ascent, requisition->descent); - int minHeight = child->calcHeight (child->getStyle()->minHeight, false, -1, + int minHeight = child->calcHeight (child->getStyle()->minHeight, true, -1, this, false); adjustHeight (&minHeight, allowDecreaseHeight, requisition->ascent, requisition->descent); - int maxHeight = child->calcHeight (child->getStyle()->maxHeight, false, -1, + int maxHeight = child->calcHeight (child->getStyle()->maxHeight, true, -1, this, false); adjustHeight (&maxHeight, allowDecreaseHeight, requisition->ascent, requisition->descent); -- cgit v1.2.3