diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-12-21 23:24:13 +0100 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-12-21 23:24:13 +0100 |
| commit | 424a01ce5c2dd3cadd3d7ca60c7b43283c183b02 (patch) | |
| tree | fcf4e10c1ce3a56e3ae7aeb4e1798e21aafbea41 /dw/image.cc | |
| parent | b21e3a4d98c1537ca430e81968dd4bb17561a981 (diff) | |
| parent | a614ea631d34d5c6273bfdaeea6a79ce2eb366a1 (diff) | |
Merge with main repo.
Diffstat (limited to 'dw/image.cc')
| -rw-r--r-- | dw/image.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dw/image.cc b/dw/image.cc index 11d2e97f..bd7c1ac9 100644 --- a/dw/image.cc +++ b/dw/image.cc @@ -213,10 +213,10 @@ void Image::sizeRequestImpl (core::Requisition *requisition) // dimensions limited to 2^15?) bool widthSpecified = getStyle()->width != core::style::LENGTH_AUTO || - getStyle()->minWidth != core::style::LENGTH_AUTO || + getStyle()->minWidth != core::style::LENGTH_AUTO || getStyle()->maxWidth != core::style::LENGTH_AUTO; bool heightSpecified = getStyle()->height != core::style::LENGTH_AUTO || - getStyle()->minHeight != core::style::LENGTH_AUTO || + getStyle()->minHeight != core::style::LENGTH_AUTO || getStyle()->maxHeight != core::style::LENGTH_AUTO; if (!widthSpecified && heightSpecified) |