diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-09-08 23:20:10 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-09-08 23:20:10 +0200 |
| commit | 00de578f307764230cb3a4e2d1bd28a78a993529 (patch) | |
| tree | f84b4c172621b3e4f3605ab532cb2ca4382275e4 /dw/widget.cc | |
| parent | 78322cd692d8dc1e491b3816bf2408eb5b0913d9 (diff) | |
Fixed wrong interpretation of 'min-width' and 'max-width'.
Diffstat (limited to 'dw/widget.cc')
| -rw-r--r-- | dw/widget.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dw/widget.cc b/dw/widget.cc index 834656fb..f740df00 100644 --- a/dw/widget.cc +++ b/dw/widget.cc @@ -829,12 +829,12 @@ void Widget::calcFinalWidth (style::Style *style, int refWidth, if (width != -1) *finalWidth = width; - if (minWidth != -1 && (*finalWidth == -1 || *finalWidth < minWidth)) + if (minWidth != -1 && *finalWidth != -1 && *finalWidth < minWidth) *finalWidth = minWidth; - if (maxWidth != -1 && (*finalWidth == -1 || *finalWidth > maxWidth)) + if (maxWidth != -1 && *finalWidth == -1 && *finalWidth > maxWidth) *finalWidth = maxWidth; - DBG_OBJ_MSGF ("resize", 1, "=> %d", width); + DBG_OBJ_MSGF ("resize", 1, "=> %d", *finalWidth); DBG_OBJ_LEAVE (); } @@ -1438,9 +1438,7 @@ int Widget::getAvailWidthOfChild (Widget *child, bool forceValue) int width; - if (child->getStyle()->width == style::LENGTH_AUTO && - child->getStyle()->minWidth == style::LENGTH_AUTO && - child->getStyle()->maxWidth == style::LENGTH_AUTO) { + if (child->getStyle()->width == style::LENGTH_AUTO) { DBG_OBJ_MSG ("resize", 1, "no specification"); if (forceValue) width = misc::max (getAvailWidth (true) - boxDiffWidth (), 0); |