diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 09:58:16 (GMT) |
---|---|---|
committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-10-28 09:58:16 (GMT) |
commit | 42fdaf078b9332e13d260df00359e8adc8522872 (patch) | |
tree | 6a1d7b675b788372720e928e4e2aba77bfcad552 /src/gui/widgets/qsplitter.cpp | |
parent | 262d0df3b166fecb3502e81b2ab85cadd71ae70f (diff) | |
parent | a925ba1ab6316a155f2ac61f898c52f07a1340b4 (diff) | |
download | Qt-42fdaf078b9332e13d260df00359e8adc8522872.zip Qt-42fdaf078b9332e13d260df00359e8adc8522872.tar.gz Qt-42fdaf078b9332e13d260df00359e8adc8522872.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'src/gui/widgets/qsplitter.cpp')
-rw-r--r-- | src/gui/widgets/qsplitter.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/gui/widgets/qsplitter.cpp b/src/gui/widgets/qsplitter.cpp index e3121ae..520a802 100644 --- a/src/gui/widgets/qsplitter.cpp +++ b/src/gui/widgets/qsplitter.cpp @@ -360,13 +360,26 @@ void QSplitterPrivate::recalc(bool update) before a hidden widget must be hidden. */ bool first = true; + bool allInvisible = n != 0; for (int i = 0; i < n ; ++i) { QSplitterLayoutStruct *s = list.at(i); - s->handle->setHidden(first || s->widget->isHidden()); - if (!s->widget->isHidden()) + bool widgetHidden = s->widget->isHidden(); + if (allInvisible && !widgetHidden && !s->collapsed) + allInvisible = false; + s->handle->setHidden(first || widgetHidden); + if (!widgetHidden) first = false; } + if (allInvisible) + for (int i = 0; i < n ; ++i) { + QSplitterLayoutStruct *s = list.at(i); + if (!s->widget->isHidden()) { + s->collapsed = false; + break; + } + } + int fi = 2 * q->frameWidth(); int maxl = fi; int minl = fi; |