From 158fe2a0c551f7aaeaa07bdbb0096bee0ade0fdf Mon Sep 17 00:00:00 2001
From: Jan Arve Saether <jan-arve.saether@digia.com>
Date: Tue, 28 May 2013 10:09:03 +0200
Subject: [PATCH] Change default layout spacing to 5, and make it depend on DPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I6f34ace6a24ce918cdd417bbfcd2fe8126aa321b
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
src/layouts/qquicklinearlayout.cpp | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp
index 541e4aca1..b9a8e2249 100644
--- a/src/layouts/qquicklinearlayout.cpp
+++ b/src/layouts/qquicklinearlayout.cpp
@@ -143,8 +143,15 @@
QT_BEGIN_NAMESPACE
-static const qreal q_declarativeLayoutDefaultSpacing = 4.0;
-
+static qreal quickLayoutDefaultSpacing()
+{
+ qreal spacing = 5.0;
+#ifndef Q_OS_MAC
+ // On mac the DPI is always 72 so we should not scale it
+ spacing = qRound(spacing * (qreal(qt_defaultDpiX()) / 96.0));
+#endif
+ return spacing;
+}
QQuickGridLayoutBase::QQuickGridLayoutBase(QQuickGridLayoutBasePrivate &dd,
Qt::Orientation orientation,
@@ -412,9 +419,10 @@ QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = 0*/)
: QQuickGridLayoutBase(*new QQuickGridLayoutPrivate, Qt::Horizontal, parent)
{
Q_D(QQuickGridLayout);
- d->columnSpacing = q_declarativeLayoutDefaultSpacing;
- d->rowSpacing = q_declarativeLayoutDefaultSpacing;
- d->engine.setSpacing(q_declarativeLayoutDefaultSpacing, Qt::Horizontal | Qt::Vertical);
+ const qreal defaultSpacing = quickLayoutDefaultSpacing();
+ d->columnSpacing = defaultSpacing;
+ d->rowSpacing = defaultSpacing;
+ d->engine.setSpacing(defaultSpacing, Qt::Horizontal | Qt::Vertical);
}
/*!
@@ -672,7 +680,7 @@ QQuickLinearLayout::QQuickLinearLayout(Qt::Orientation orientation,
: QQuickGridLayoutBase(*new QQuickLinearLayoutPrivate, orientation, parent)
{
Q_D(QQuickLinearLayout);
- d->spacing = q_declarativeLayoutDefaultSpacing;
+ d->spacing = quickLayoutDefaultSpacing();
d->engine.setSpacing(d->spacing, Qt::Horizontal | Qt::Vertical);
}
--
GitLab