diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-05 16:26:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 21:50:28 +0100 |
| commit | 3c329b09fab98087efa6f23905257cba5f665bcd (patch) | |
| tree | 506a8007d160e015fd424a5c575dfa89449c14bc /src/widgets/dialogs/qwizard.cpp | |
| parent | c2530a0f59f6bc7dc31e72a06851b8821c9ee5a2 (diff) | |
Aero-Style-QWizard: Set custom margins only for Areo-Style.
Task-number: QTBUG-29904
Change-Id: Ifaf4d5e692f97436535feb1af44dc29d3512c5ea
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/widgets/dialogs/qwizard.cpp')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index aab6494d98..f7669ba1cc 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1525,6 +1525,8 @@ void QWizardPrivate::handleAeroStyleChange() vistaHelper->disconnectBackButton(); q->removeEventFilter(vistaHelper); + bool vistaMargins = false; + if (isVistaThemeEnabled()) { if (isVistaThemeEnabled(QVistaHelper::VistaAero)) { vistaHelper->setDWMTitleBar(QVistaHelper::ExtendedTitleBar); @@ -1534,6 +1536,7 @@ void QWizardPrivate::handleAeroStyleChange() vistaHelper->backButton()->move( 0, vistaHelper->topOffset() // ### should ideally work without the '+ 1' - qMin(vistaHelper->topOffset(), vistaHelper->topPadding() + 1)); + vistaMargins = true; } else { vistaHelper->setDWMTitleBar(QVistaHelper::NormalTitleBar); q->setMouseTracking(true); @@ -1556,8 +1559,7 @@ void QWizardPrivate::handleAeroStyleChange() _q_updateButtonStates(); - if (q->isVisible()) - vistaHelper->updateCustomMargins(); + vistaHelper->updateCustomMargins(vistaMargins); inHandleAeroStyleChange = false; } @@ -2922,10 +2924,6 @@ QWidget *QWizard::sideWidget() const void QWizard::setVisible(bool visible) { Q_D(QWizard); -#if !defined(QT_NO_STYLE_WINDOWSVISTA) - if (visible) - d->vistaHelper->updateCustomMargins(); -#endif if (visible) { if (d->current == -1) restart(); |