diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-08-06 16:51:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-08-28 11:35:07 +0200 |
| commit | 2d12ef0be0f1f9abeeae15ffa430b5a96905b0da (patch) | |
| tree | 1a129c26b2ec390f9d710bd55a9387aed73e0a46 /src/widgets/dialogs/qwizard_win_p.h | |
| parent | ce94cdbe505216787896ed5d2b40fe017d3f3dd1 (diff) | |
Adapt the Vista-style wizard for device pixel ratio scaling.
Task-number: QTBUG-38993
Task-number: QTBUG-388583
Change-Id: I1e3f1b5c82b9751e7f2aa6aed3d89d4388ecf1ce
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'src/widgets/dialogs/qwizard_win_p.h')
| -rw-r--r-- | src/widgets/dialogs/qwizard_win_p.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index 81514a8950..ac58e76a45 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -102,7 +102,8 @@ public: QColor basicWindowFrameColor(); enum VistaState { VistaAero, VistaBasic, Classic, Dirty }; static VistaState vistaState(); - static int titleBarSize() { return frameSize() + captionSize(); } + static int titleBarSize() { return QVistaHelper::titleBarSizeDp() / QVistaHelper::m_devicePixelRatio; } + static int titleBarSizeDp() { return QVistaHelper::frameSizeDp() + QVistaHelper::captionSizeDp(); } static int topPadding() { // padding under text return int(QStyleHelper::dpiScaled( QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? 4 : 6)); @@ -117,12 +118,14 @@ private: bool drawTitleText(QPainter *painter, const QString &text, const QRect &rect, HDC hdc); static bool drawBlackRect(const QRect &rect, HDC hdc); - static int frameSize(); - static int captionSize(); + static int frameSize() { return QVistaHelper::frameSizeDp() / QVistaHelper::m_devicePixelRatio; } + static int frameSizeDp(); + static int captionSize() { return QVistaHelper::captionSizeDp() / QVistaHelper::m_devicePixelRatio; } + static int captionSizeDp(); static int backButtonSize() { return int(QStyleHelper::dpiScaled(30)); } - static int iconSize() { return 16; } // Standard Aero - static int glowSize() { return 10; } + static int iconSize(); + static int glowSize(); int leftMargin() { return backButton_->isVisible() ? backButtonSize() + iconSpacing : 0; } int titleOffset(); @@ -152,6 +155,7 @@ private: int titleBarOffset; // Extra spacing above the text int iconSpacing; // Space between button and icon int textSpacing; // Space between icon and text + static int m_devicePixelRatio; }; |