summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs/qwizard_win_p.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-12-12 11:22:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-09 20:53:57 +0100
commit5fb6331a17a5c43b91daddf4a30e46ccbd1419b5 (patch)
tree44a40cc830e55116b494a7ae932e9b2d1065dbcd /src/widgets/dialogs/qwizard_win_p.h
parentf5fd53460387411a3ed192595562fc2cfd92a2b6 (diff)
Fix title bar height of Aero wizard on Windows 8.
Windows 8 no longer allows for negative values to WM_NCCALCSIZE to shrink the title bar. Task-number: QTBUG-28435 Change-Id: I2e2e5e6aea9cc6781be4e9b06c9547e1e5ec86cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/widgets/dialogs/qwizard_win_p.h')
-rw-r--r--src/widgets/dialogs/qwizard_win_p.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
index 610812dd60..4dbb71f94b 100644
--- a/src/widgets/dialogs/qwizard_win_p.h
+++ b/src/widgets/dialogs/qwizard_win_p.h
@@ -105,10 +105,8 @@ public:
return int(QStyleHelper::dpiScaled(
QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? 4 : 6));
}
- static int topOffset() {
- static int aeroOffset = QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ?
- QStyleHelper::dpiScaled(4) : QStyleHelper::dpiScaled(13);
- return (titleBarSize() + (vistaState() == VistaAero ? aeroOffset : 3)); }
+ static int topOffset();
+
private:
static HFONT getCaptionFont(HANDLE hTheme);
bool drawTitleText(QPainter *painter, const QString &text, const QRect &rect, HDC hdc);