diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-05 16:53:30 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 21:50:28 +0100 |
commit | c4a07f039ddf025751803ed80ececd8da3989eb4 (patch) | |
tree | c2f0d0897936edd77eb545750a3771d325490e6b | |
parent | 3fa77de5c97ed120ee519240481f57cc308d077b (diff) |
Aero-Style-QWizard: Hide/Show back-button correctly.
Task-number: QTBUG-29904
Change-Id: Id832594be4bc15c868f11bd762390803c8f9c158
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
-rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard_win.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 641c81b4cf..f590dbc6cb 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1547,6 +1547,7 @@ bool QWizardPrivate::handleAeroStyleChange() 0, vistaHelper->topOffset() // ### should ideally work without the '+ 1' - qMin(vistaHelper->topOffset(), vistaHelper->topPadding() + 1)); vistaMargins = true; + vistaHelper->backButton()->show(); } else { if (isWindow) vistaHelper->setDWMTitleBar(QVistaHelper::NormalTitleBar); diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 30ee0e32a9..c90cf732d0 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -256,8 +256,10 @@ QVistaHelper::QVistaHelper(QWizard *wizard) is_vista = resolveSymbols(); if (instanceCount++ == 0) cachedVistaState = Dirty; - if (is_vista) + if (is_vista) { backButton_ = new QVistaBackButton(wizard); + backButton_->hide(); + } // Handle diff between Windows 7 and Vista iconSpacing = QStyleHelper::dpiScaled(7); |