diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-10 15:51:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-10 15:51:48 (GMT) |
| commit | c072fa8fdd0cebcaff9062e07d4623bbd7aded3c (patch) | |
| tree | db35223ec643fbc5aeadcfab4112e5686ff44b8f /src/gui/widgets/qmainwindowlayout.cpp | |
| parent | bf54d63fb1b60ad899d0b14889109278bd04fd9d (diff) | |
| parent | 9a83bf2676dabdf36f9ca491b480b50d8e7ed93d (diff) | |
| download | Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.zip Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.gz Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index d1e7285..fc75c92 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -1627,6 +1627,13 @@ void QMainWindowLayout::animationFinished(QWidget *widget) tb->d_func()->plug(currentGapRect); #endif + savedState.clear(); + currentGapPos.clear(); + pluggingWidget = 0; + //applying the state will make sure that the currentGap is updated correctly + //and all the geometries (especially the one from the central widget) is correct + layoutState.apply(false); + #ifndef QT_NO_DOCKWIDGET #ifndef QT_NO_TABBAR if (qobject_cast<QDockWidget*>(widget) != 0) { @@ -1637,13 +1644,6 @@ void QMainWindowLayout::animationFinished(QWidget *widget) } #endif #endif - - savedState.clear(); - currentGapPos.clear(); - pluggingWidget = 0; - //applying the state will make sure that the currentGap is updated correctly - //and all the geometries (especially the one from the central widget) is correct - layoutState.apply(false); } if (!widgetAnimator.animating()) { |