diff options
| author | Sebastian Geerken <devnull@localhost> | 2015-01-08 14:51:23 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2015-01-08 14:51:23 +0100 |
| commit | 3fa61740d50d8a8fd6c61eb86e1f7a45a3762570 (patch) | |
| tree | b6d857642d861fc594292ec69260bfc3cc617be0 /dw/image.cc | |
| parent | e05ebd46d570cd64c116ed4bdde669ea0962e99b (diff) | |
| parent | 428094b178eb03d8e500c81837caac402e4b138c (diff) | |
Merge with main repo.
Diffstat (limited to 'dw/image.cc')
| -rw-r--r-- | dw/image.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dw/image.cc b/dw/image.cc index a1052726..7fb6c5eb 100644 --- a/dw/image.cc +++ b/dw/image.cc @@ -264,7 +264,10 @@ void Image::getExtremesImpl (core::Extremes *extremes) extremes->minWidthIntrinsic = extremes->minWidth; extremes->maxWidthIntrinsic = extremes->maxWidth; - correctExtremes (extremes); + correctExtremes (extremes, false); + + extremes->adjustmentWidth = + misc::min (extremes->minWidthIntrinsic, extremes->minWidth); } void Image::sizeAllocateImpl (core::Allocation *allocation) |