From 685bc9f0b58f5a2da449f1a003aba177e007c46d Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 15 Oct 2014 12:05:17 +0200
Subject: [PATCH] JsonWizard: Fix spacer item in Fields page
Calculate space to use based on better data:-)
Change-Id: Ia502deb3eb40e5b4a3828e531798971d120e9b0d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
.../projectexplorer/jsonwizard/jsonfieldpage.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
index 46d6866feb6..ec0af8b8ef2 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -40,7 +40,7 @@
#include <utils/textfieldcombobox.h>
#include <QCheckBox>
-#include <QCoreApplication>
+#include <QApplication>
#include <QDebug>
#include <QFormLayout>
#include <QLabel>
@@ -215,7 +215,7 @@ QWidget *JsonFieldPage::LabelField::widget(const QString &displayName)
// --------------------------------------------------------------------
JsonFieldPage::SpacerField::SpacerField() :
- m_factor(2)
+ m_factor(1)
{ }
bool JsonFieldPage::SpacerField::parseData(const QVariant &data, QString *errorMessage)
@@ -232,11 +232,11 @@ bool JsonFieldPage::SpacerField::parseData(const QVariant &data, QString *errorM
QVariantMap tmp = data.toMap();
bool ok;
- m_factor = tmp.value(QLatin1String("factor"), 2).toInt(&ok);
+ m_factor = tmp.value(QLatin1String("factor"), 1).toInt(&ok);
if (!ok) {
*errorMessage = QCoreApplication::translate("ProjectExplorer::JsonFieldPage",
- "'size' was not an integer value.");
+ "'factor' is no integer value.");
return false;
}
@@ -248,8 +248,8 @@ QWidget *JsonFieldPage::SpacerField::widget(const QString &displayName)
Q_UNUSED(displayName);
QTC_ASSERT(!m_widget, return m_widget);
- int size = m_widget->style()->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType,
- Qt::Vertical) * m_factor;
+ int size = qApp->style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing) * m_factor;
+
m_widget = new QWidget();
m_widget->setMinimumSize(size, size);
m_widget->setMaximumSize(size, size);
--
GitLab