Fix layouts with expanding items with maximum size
authorPaul Olav Tvete <paul.tvete@digia.com>
Tue, 27 Aug 2013 12:47:55 +0000 (14:47 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 10 Sep 2013 20:02:12 +0000 (22:02 +0200)
commitc3958b592a1d46eb1b536bd09cce1aa919d02635
treeaa4de6c11b0cf3e1d92f39b03c058d0146be4c2f
parenta908c3f351541f7b26549820d313a2932f1f9887
Fix layouts with expanding items with maximum size

Layout items with a Preferred size policy would be treated as fixed
size if they were in the same layout as an Expanding item (or one with
a stretch factor).

This occurred e.g. if a layout was configured similar to this:
1. One item with ExpandFlag/stretch but with a maximumSize set,
   e.g. (100x100).
2. Another item with 'just' GrowFlag, and a maximum size bigger than
   its  size hint.

If the above layout was resized to e.g. (200x50) it would cause the
expanding item to correctly get the size (100x50), but the 'growing'
item would not stretch beyond its size hint.
Instead, it would distribute space around both items, behaving as if
the 'growing' item was fixed'.

The expected behavior is to continue to grow the 'growing' item after
the expanding item has reached its size limit.

Task-number: QTBUG-33104

Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
(cherry picked from qtbase/b855e578044e49b588b32085968c63a910b9daae)

Change-Id: I943f1effd53fc7adc19824ce0747443797a0a235
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
src/gui/kernel/qlayoutengine.cpp
tests/auto/qboxlayout/tst_qboxlayout.cpp