1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSplitter: Respect managed widget's growth/expand size policy

Browse Source 
Use qSmartMaxSize to get the maximum size a widget can take.

[ChangeLog][QtWidgets][QSplitter] Respect QSizePolicy::Maximum and
QSizePolicy::Fixed layout policy of child widgets.

Fixes: QTBUG-87133
Change-Id: I166ef3f6608303b8695f5c05a7bf0d1be4653f4a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
Ales Erjavec 2020-10-02 16:16:05 +02:00
parent 216c2ed5ce
commit c3fd24164b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/widgets/qsplitter.cpp
View File

@ -439,9 +439,9 @@ void QSplitterPrivate::recalc(bool update)
QSize minS = qSmartMinSize(s->widget); QSize minS = qSmartMinSize(s->widget);
minl += pick(minS); minl += pick(minS);
maxl += pick(s->widget->maximumSize()); maxl += pick(qSmartMaxSize(s->widget));
mint = qMax(mint, trans(minS)); mint = qMax(mint, trans(minS));
int tm = trans(s->widget->maximumSize()); int tm = trans(qSmartMaxSize(s->widget));
if (tm > 0) if (tm > 0)
maxt = qMin(maxt, tm); maxt = qMin(maxt, tm);
} }
@ -518,7 +518,7 @@ void QSplitterPrivate::doResize()
a[j].maximumSize = 0; a[j].maximumSize = 0;
} else { } else {
a[j].minimumSize = pick(qSmartMinSize(s->widget)); a[j].minimumSize = pick(qSmartMinSize(s->widget));
a[j].maximumSize = pick(s->widget->maximumSize()); a[j].maximumSize = pick(qSmartMaxSize(s->widget));
a[j].empty = false; a[j].empty = false;
bool stretch = noStretchFactorsSet; bool stretch = noStretchFactorsSet;
@ -580,7 +580,7 @@ void QSplitterPrivate::addContribution(int index, int *min, int *max, bool mayCo
if (mayCollapse || !s->collapsed) if (mayCollapse || !s->collapsed)
*min += pick(qSmartMinSize(s->widget)); *min += pick(qSmartMinSize(s->widget));
*max += pick(s->widget->maximumSize()); *max += pick(qSmartMaxSize(s->widget));
} }
} }
@ -803,7 +803,7 @@ void QSplitterPrivate::doMove(bool backwards, int hPos, int index, int delta, bo
int ws = backwards ? hPos - pick(s->rect.topLeft()) int ws = backwards ? hPos - pick(s->rect.topLeft())
: pick(s->rect.bottomRight()) - hPos -hs + 1; : pick(s->rect.bottomRight()) - hPos -hs + 1;
if (ws > 0 || (!s->collapsed && !mayCollapse)) { if (ws > 0 || (!s->collapsed && !mayCollapse)) {
ws = qMin(ws, pick(w->maximumSize())); ws = qMin(ws, pick(qSmartMaxSize(w)));
ws = qMax(ws, pick(qSmartMinSize(w))); ws = qMax(ws, pick(qSmartMinSize(w)));
} else { } else {
ws = 0; ws = 0;