aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2015-01-02 18:06:12 +0100
committerSebastian Geerken <devnull@localhost>2015-01-02 18:06:12 +0100
commit456d1af50cf24634c372a895971e0287f2234d44 (patch)
treec967ecba4ed0832c4eba6923073e19a91e03b906
parent86e780e73a11e8b9d1d57cb5f283c4fee6ca68e8 (diff)
Fixed 'adjust_min_width' correction.
-rw-r--r--dw/widget.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/dw/widget.cc b/dw/widget.cc
index 6a046471..be64d83a 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -538,7 +538,8 @@ int Widget::getMinWidth (Extremes *extremes, bool forceValue)
// TODO Not completely clear whether this is feasable: Within
// the context of getAvailWidth(false) etc., getExtremes may not
// be called. We ignore the minimal width then.
- minWidth = extremes ? extremes->minWidthIntrinsic : 0;
+ minWidth = extremes ?
+ misc::max (extremes->minWidth, extremes->minWidthIntrinsic) : 0;
} else
minWidth = 0;