993d3ba · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Rename v/hSpacing to row/colSpacing

993d3baAlbert Astals13 years ago

plugins/DashViews/verticaljournal.cpp+24−24

compare with xenial

unifiedsplit

@@ -45,8 +45,8 @@ VerticalJournal::VerticalJournal()

45 : m_delegateModel(nullptr)

46 , m_asyncRequestedIndex(-1)

47 , m_columnWidth(0)

48− , m_horizontalSpacing(0)

48+ , m_columnSpacing(0)

49− , m_verticalSpacing(0)

49+ , m_rowSpacing(0)

50 , m_delegateCreationBegin(0)

51 , m_delegateCreationEnd(0)

52 , m_delegateCreationBeginValid(false)

@@ -123,16 +123,16 @@ void VerticalJournal::setColumnWidth(qreal columnWidth)

123 }

124}

125

126−qreal VerticalJournal::horizontalSpacing() const

126+qreal VerticalJournal::columnSpacing() const

127{

128− return m_horizontalSpacing;

128+ return m_columnSpacing;

129}

130

131−void VerticalJournal::setHorizontalSpacing(qreal horizontalSpacing)

131+void VerticalJournal::setColumnSpacing(qreal columnSpacing)

132{

133− if (horizontalSpacing != m_horizontalSpacing) {

133+ if (columnSpacing != m_columnSpacing) {

134− m_horizontalSpacing = horizontalSpacing;

134+ m_columnSpacing = columnSpacing;

135− Q_EMIT horizontalSpacingChanged();

135+ Q_EMIT columnSpacingChanged();

136

137 if (isComponentComplete()) {

138 relayout();

@@ -140,16 +140,16 @@ void VerticalJournal::setHorizontalSpacing(qreal horizontalSpacing)

140 }

141}

142

143−qreal VerticalJournal::verticalSpacing() const

143+qreal VerticalJournal::rowSpacing() const

144{

145− return m_verticalSpacing;

145+ return m_rowSpacing;

146}

147

148−void VerticalJournal::setVerticalSpacing(qreal verticalSpacing)

148+void VerticalJournal::setRowSpacing(qreal rowSpacing)

149{

150− if (verticalSpacing != m_verticalSpacing) {

150+ if (rowSpacing != m_rowSpacing) {

151− m_verticalSpacing = verticalSpacing;

151+ m_rowSpacing = rowSpacing;

152− Q_EMIT verticalSpacingChanged();

152+ Q_EMIT rowSpacingChanged();

153

154 if (isComponentComplete()) {

155 relayout();

@@ -258,7 +258,7 @@ void VerticalJournal::findBottomModelIndexToAdd(int *modelIndex, double *yPos)

258 Q_FOREACH(const auto &column, m_columnVisibleItems) {

259 if (!column.isEmpty()) {

260 const ViewItem &item = column.last();

261− *yPos = qMin(*yPos, static_cast<double>(item.y() + item.height() + m_verticalSpacing));

261+ *yPos = qMin(*yPos, static_cast<double>(item.y() + item.height() + m_rowSpacing));

262 *modelIndex = qMax(*modelIndex, item.m_modelIndex + 1);

263 } else {

264 *yPos = 0;

@@ -277,7 +277,7 @@ void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, double *yPos)

277 const auto &column = m_columnVisibleItems[i];

278 if (!column.isEmpty()) {

279 const ViewItem &item = column.first();

280− const auto itemTopPos = item.y() - m_verticalSpacing;

280+ const auto itemTopPos = item.y() - m_rowSpacing;

281 if (itemTopPos > *yPos) {

282 *yPos = itemTopPos;

283 *modelIndex = item.m_modelIndex - 1;

@@ -393,11 +393,11 @@ void VerticalJournal::positionItem(int modelIndex, QQuickItem *item)

393{

394 // Check if we add it to the bottom of existing column items

395 const QList<ViewItem> &firstColumn = m_columnVisibleItems[0];

396− qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.last().y() + firstColumn.last().height() : 0;

396+ qreal columnToAddY = !firstColumn.isEmpty() ? firstColumn.last().y() + firstColumn.last().height() : -m_rowSpacing;

397 int columnToAddTo = 0;

398 for (int i = 1; i < m_columnVisibleItems.count(); ++i) {

399 const QList<ViewItem> &column = m_columnVisibleItems[i];

400− const qreal iY = !column.isEmpty() ? column.last().y() + column.last().height() : 0;

400+ const qreal iY = !column.isEmpty() ? column.last().y() + column.last().height() : -m_rowSpacing;

401 if (iY < columnToAddY) {

402 columnToAddTo = i;

403 columnToAddY = iY;

@@ -406,8 +406,8 @@ void VerticalJournal::positionItem(int modelIndex, QQuickItem *item)

406

407 const QList<ViewItem> &columnToAdd = m_columnVisibleItems[columnToAddTo];

408 if (columnToAdd.isEmpty() || columnToAdd.last().m_modelIndex < modelIndex) {

409− item->setX(columnToAddTo * m_columnWidth + m_horizontalSpacing * (columnToAddTo + 1));

409+ item->setX(columnToAddTo * (m_columnWidth + m_columnSpacing));

410− item->setY(columnToAddY + m_verticalSpacing);

410+ item->setY(columnToAddY + m_rowSpacing);

411

412 m_columnVisibleItems[columnToAddTo] << ViewItem(item, modelIndex);

413 m_indexColumnMap[modelIndex] = columnToAddTo;

@@ -416,8 +416,8 @@ void VerticalJournal::positionItem(int modelIndex, QQuickItem *item)

416 columnToAddTo = m_indexColumnMap[modelIndex];

417 columnToAddY = m_columnVisibleItems[columnToAddTo].first().y();

418

419− item->setX(columnToAddTo * m_columnWidth + m_horizontalSpacing * (columnToAddTo + 1));

419+ item->setX(columnToAddTo * (m_columnWidth + m_columnSpacing));

420− item->setY(columnToAddY - m_verticalSpacing - item->height());

420+ item->setY(columnToAddY - m_rowSpacing - item->height());

421

422 m_columnVisibleItems[columnToAddTo].prepend(ViewItem(item, modelIndex));

423 }

@@ -458,7 +458,7 @@ void VerticalJournal::calculateImplicitHeight()

458 if (!column.isEmpty()) {

459 const ViewItem &item = column.last();

460 lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);

461− bottomMostY = qMax(bottomMostY, item.y() + item.height() + m_verticalSpacing);

461+ bottomMostY = qMax(bottomMostY, item.y() + item.height());

462 }

463 }

464 if (lastModelIndex >= 0) {

@@ -512,7 +512,7 @@ void VerticalJournal::updatePolish()

512

513 qSort(allItems);

514

515− const int nColumns = qMax(1., floor((double)(width() - m_horizontalSpacing) / (m_columnWidth + m_horizontalSpacing)));

515+ const int nColumns = qMax(1., floor((double)(width() + m_columnSpacing) / (m_columnWidth + m_columnSpacing)));

516 m_columnVisibleItems.resize(nColumns);

517 m_indexColumnMap.clear();

518 for (int i = 0; i < nColumns; ++i)

plugins/DashViews/verticaljournal.h+11−15

@@ -33,7 +33,7 @@ class QQmlDelegateModel;

33 *

34 * The number of columns is calculated using the width of

35 * the view itself, the columnWidth (i.e. the width of each individual delegate)

36− * and the horizontalSpacing between columns.

36+ * and the columnSpacing between columns.

37 *

38 * All delegates are forced to columnWidth if they don't have it.

39 *

@@ -65,12 +65,8 @@ class QQmlDelegateModel;

65 Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelChanged)

66 Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)

67 Q_PROPERTY(qreal columnWidth READ columnWidth WRITE setColumnWidth NOTIFY columnWidthChanged)

68− Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing

68+ Q_PROPERTY(qreal columnSpacing READ columnSpacing WRITE setColumnSpacing NOTIFY columnSpacingChanged)

69− WRITE setHorizontalSpacing

69+ Q_PROPERTY(qreal rowSpacing READ rowSpacing WRITE setRowSpacing NOTIFY rowSpacingChanged)

70− NOTIFY horizontalSpacingChanged)

71− Q_PROPERTY(qreal verticalSpacing READ verticalSpacing

72− WRITE setVerticalSpacing

73− NOTIFY verticalSpacingChanged)

74 Q_PROPERTY(qreal delegateCreationBegin READ delegateCreationBegin

70 Q_PROPERTY(qreal delegateCreationBegin READ delegateCreationBegin

75 WRITE setDelegateCreationBegin

71 WRITE setDelegateCreationBegin

76 NOTIFY delegateCreationBeginChanged

72 NOTIFY delegateCreationBeginChanged

@@ -94,11 +90,11 @@ public:

94 qreal columnWidth() const;

90 qreal columnWidth() const;

95 void setColumnWidth(qreal columnWidth);

91 void setColumnWidth(qreal columnWidth);

97− qreal horizontalSpacing() const;

93+ qreal columnSpacing() const;

98− void setHorizontalSpacing(qreal horizontalSpacing);

94+ void setColumnSpacing(qreal columnSpacing);

100− qreal verticalSpacing() const;

96+ qreal rowSpacing() const;

101− void setVerticalSpacing(qreal verticalSpacing);

97+ void setRowSpacing(qreal rowSpacing);

102

103 qreal delegateCreationBegin() const;

99 qreal delegateCreationBegin() const;

104 void setDelegateCreationBegin(qreal);

100 void setDelegateCreationBegin(qreal);

@@ -112,8 +108,8 @@ Q_SIGNALS:

112 void modelChanged();

108 void modelChanged();

113 void delegateChanged();

109 void delegateChanged();

114 void columnWidthChanged();

110 void columnWidthChanged();

115− void horizontalSpacingChanged();

111+ void columnSpacingChanged();

116− void verticalSpacingChanged();

112+ void rowSpacingChanged();

117 void delegateCreationBeginChanged();

113 void delegateCreationBeginChanged();

118 void delegateCreationEndChanged();

114 void delegateCreationEndChanged();

119

115

@@ -168,8 +164,8 @@ private:

168 QVector<QList<ViewItem>> m_columnVisibleItems;

164 QVector<QList<ViewItem>> m_columnVisibleItems;

169 QHash<int, int> m_indexColumnMap;

165 QHash<int, int> m_indexColumnMap;

170 int m_columnWidth;

166 int m_columnWidth;

171− int m_horizontalSpacing;

167+ int m_columnSpacing;

172− int m_verticalSpacing;

168+ int m_rowSpacing;

173 qreal m_delegateCreationBegin;

169 qreal m_delegateCreationBegin;

174 qreal m_delegateCreationEnd;

170 qreal m_delegateCreationEnd;

175 bool m_delegateCreationBeginValid;

171 bool m_delegateCreationBeginValid;

tests/plugins/DashViews/verticaljournaltest.cpp+124−121

@@ -22,7 +22,10 @@

22#include <QtQml/qqml.h>

23#include <QStringListModel>

24#include <QQmlContext>

25+#pragma GCC diagnostic push

26+#pragma GCC diagnostic ignored "-pedantic"

25#include <private/qquickitem_p.h>

27#include <private/qquickitem_p.h>

28+#pragma GCC diagnostic pop

27#include "verticaljournal.h"

30#include "verticaljournal.h"

@@ -56,25 +59,25 @@ private:

56 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 5);

59 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 5);

57 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

60 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

58 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 6);

61 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 6);

59− verifyItem(vj->m_columnVisibleItems[0][0], 0, 10, 10, true);

62+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

60− verifyItem(vj->m_columnVisibleItems[1][0], 1, 170, 10, true);

63+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 160, 0, true);

61− verifyItem(vj->m_columnVisibleItems[2][0], 2, 330, 10, true);

64+ verifyItem(vj->m_columnVisibleItems[2][0], 2, 320, 0, true);

62− verifyItem(vj->m_columnVisibleItems[1][1], 3, 170, 70, true);

65+ verifyItem(vj->m_columnVisibleItems[1][1], 3, 160, 60, true);

63− verifyItem(vj->m_columnVisibleItems[1][2], 4, 170, 90, true);

66+ verifyItem(vj->m_columnVisibleItems[1][2], 4, 160, 80, true);

64− verifyItem(vj->m_columnVisibleItems[0][1], 5, 10, 120, true);

67+ verifyItem(vj->m_columnVisibleItems[0][1], 5, 0, 110, true);

65− verifyItem(vj->m_columnVisibleItems[1][3], 6, 170, 140, true);

68+ verifyItem(vj->m_columnVisibleItems[1][3], 6, 160, 130, true);

66− verifyItem(vj->m_columnVisibleItems[2][1], 7, 330, 145, true);

69+ verifyItem(vj->m_columnVisibleItems[2][1], 7, 320, 135, true);

67− verifyItem(vj->m_columnVisibleItems[0][2], 8, 10, 200, true);

70+ verifyItem(vj->m_columnVisibleItems[0][2], 8, 0, 190, true);

68− verifyItem(vj->m_columnVisibleItems[2][2], 9, 330, 265, true);

71+ verifyItem(vj->m_columnVisibleItems[2][2], 9, 320, 255, true);

69− verifyItem(vj->m_columnVisibleItems[2][3], 10, 330, 295, true);

72+ verifyItem(vj->m_columnVisibleItems[2][3], 10, 320, 285, true);

70− verifyItem(vj->m_columnVisibleItems[2][4], 11, 330, 325, true);

73+ verifyItem(vj->m_columnVisibleItems[2][4], 11, 320, 315, true);

71− verifyItem(vj->m_columnVisibleItems[1][4], 12, 170, 350, true);

74+ verifyItem(vj->m_columnVisibleItems[1][4], 12, 160, 340, true);

72− verifyItem(vj->m_columnVisibleItems[0][3], 13, 10, 370, true);

75+ verifyItem(vj->m_columnVisibleItems[0][3], 13, 0, 360, true);

73− verifyItem(vj->m_columnVisibleItems[2][5], 14, 330, 400, false);

76+ verifyItem(vj->m_columnVisibleItems[2][5], 14, 320, 390, true);

74− verifyItem(vj->m_columnVisibleItems[1][5], 15, 170, 440, false);

77+ verifyItem(vj->m_columnVisibleItems[1][5], 15, 160, 430, false);

75− verifyItem(vj->m_columnVisibleItems[0][4], 16, 10, 580, false);

78+ verifyItem(vj->m_columnVisibleItems[0][4], 16, 0, 570, false);

76− verifyItem(vj->m_columnVisibleItems[1][6], 17, 170, 580, false);

79+ verifyItem(vj->m_columnVisibleItems[1][6], 17, 160, 570, false);

77− QCOMPARE(vj->implicitHeight(), 990. + 2. * 990. / 18.);

80+ QCOMPARE(vj->implicitHeight(), 970. + 2. * 970. / 18.);

78 }

81 }

80private Q_SLOTS:

83private Q_SLOTS:

@@ -99,7 +102,7 @@ private Q_SLOTS:

99 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));

102 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));

100

103

101 view->show();

104 view->show();

102− view->resize(490, 400);

105+ view->resize(470, 400);

103 QTest::qWaitForWindowExposed(view);

106 QTest::qWaitForWindowExposed(view);

104

107

105 vj = view->rootObject()->findChild<VerticalJournal*>();

108 vj = view->rootObject()->findChild<VerticalJournal*>();

@@ -116,41 +119,41 @@ private Q_SLOTS:

116

119

117 void testWidthResize()

120 void testWidthResize()

118 {

121 {

119− view->resize(649, 400);

122+ view->resize(629, 400);

120

123

121 // This is exactly the same block as above as nothing changed, just white space on the right

124 // This is exactly the same block as above as nothing changed, just white space on the right

122 checkInitialPositions();

125 checkInitialPositions();

123

126

124− view->resize(650, 400);

127+ view->resize(630, 400);

125

128

126 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 4);

129 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 4);

127 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 4);

130 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 4);

128 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

131 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

129 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 4);

132 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 4);

130 QTRY_COMPARE(vj->m_columnVisibleItems[3].count(), 5);

133 QTRY_COMPARE(vj->m_columnVisibleItems[3].count(), 5);

131− verifyItem(vj->m_columnVisibleItems[0][0], 0, 10, 10, true);

134+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

132− verifyItem(vj->m_columnVisibleItems[1][0], 1, 170, 10, true);

135+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 160, 0, true);

133− verifyItem(vj->m_columnVisibleItems[2][0], 2, 330, 10, true);

136+ verifyItem(vj->m_columnVisibleItems[2][0], 2, 320, 0, true);

134− verifyItem(vj->m_columnVisibleItems[3][0], 3, 490, 10, true);

137+ verifyItem(vj->m_columnVisibleItems[3][0], 3, 480, 0, true);

135− verifyItem(vj->m_columnVisibleItems[3][1], 4, 490, 30, true);

138+ verifyItem(vj->m_columnVisibleItems[3][1], 4, 480, 20, true);

136− verifyItem(vj->m_columnVisibleItems[1][1], 5, 170, 70, true);

139+ verifyItem(vj->m_columnVisibleItems[1][1], 5, 160, 60, true);

140+ verifyItem(vj->m_columnVisibleItems[3][2], 6, 480, 70, true);

137− verifyItem(vj->m_columnVisibleItems[3][2], 6, 490, 80, true);

141+ verifyItem(vj->m_columnVisibleItems[0][1], 7, 0, 110, true);

138− verifyItem(vj->m_columnVisibleItems[0][1], 7, 10, 120, true);

139− verifyItem(vj->m_columnVisibleItems[2][1], 8, 330, 145, true);

142+ verifyItem(vj->m_columnVisibleItems[2][1], 8, 320, 135, true);

140− verifyItem(vj->m_columnVisibleItems[1][2], 9, 170, 150, true);

143+ verifyItem(vj->m_columnVisibleItems[1][2], 9, 160, 140, true);

141− verifyItem(vj->m_columnVisibleItems[1][3], 10, 170, 180, true);

144+ verifyItem(vj->m_columnVisibleItems[1][3], 10, 160, 170, true);

142− verifyItem(vj->m_columnVisibleItems[1][4], 11, 170, 210, true);

145+ verifyItem(vj->m_columnVisibleItems[1][4], 11, 160, 200, true);

143− verifyItem(vj->m_columnVisibleItems[0][2], 12, 10, 240, true);

146+ verifyItem(vj->m_columnVisibleItems[0][2], 12, 0, 230, true);

144− verifyItem(vj->m_columnVisibleItems[1][5], 13, 170, 285, true);

147+ verifyItem(vj->m_columnVisibleItems[1][5], 13, 160, 275, true);

145− verifyItem(vj->m_columnVisibleItems[3][3], 14, 490, 290, true);

148+ verifyItem(vj->m_columnVisibleItems[3][3], 14, 480, 280, true);

146− verifyItem(vj->m_columnVisibleItems[2][2], 15, 330, 315, true);

149+ verifyItem(vj->m_columnVisibleItems[2][2], 15, 320, 305, true);

147− verifyItem(vj->m_columnVisibleItems[0][3], 16, 10, 330, true);

150+ verifyItem(vj->m_columnVisibleItems[0][3], 16, 0, 320, true);

148− verifyItem(vj->m_columnVisibleItems[2][3], 17, 330, 455, false);

151+ verifyItem(vj->m_columnVisibleItems[2][3], 17, 320, 445, false);

149− verifyItem(vj->m_columnVisibleItems[1][6], 18, 170, 495, false);

152+ verifyItem(vj->m_columnVisibleItems[1][6], 18, 160, 485, false);

150− verifyItem(vj->m_columnVisibleItems[3][4], 19, 490, 600, false);

153+ verifyItem(vj->m_columnVisibleItems[3][4], 19, 480, 590, false);

151− QTRY_COMPARE(vj->implicitHeight(), 1005.);

154+ QTRY_COMPARE(vj->implicitHeight(), 985.);

152−

155+

153− view->resize(490, 400);

156+ view->resize(470, 400);

154

157

155 // This is exactly the same block as the first again

158 // This is exactly the same block as the first again

156 checkInitialPositions();

159 checkInitialPositions();

@@ -158,29 +161,29 @@ private Q_SLOTS:

158

161

159 void testHorizontalSpacing()

162 void testHorizontalSpacing()

160 {

163 {

161− vj->setHorizontalSpacing(11);

164+ vj->setColumnSpacing(11);

162

165

163 QTRY_COMPARE(vj->m_needsRelayout, false);

166 QTRY_COMPARE(vj->m_needsRelayout, false);

164 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 2);

167 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 2);

165 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 7);

168 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 7);

166 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

169 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

167− verifyItem(vj->m_columnVisibleItems[0][0], 0, 11, 10, true);

170+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

168− verifyItem(vj->m_columnVisibleItems[1][0], 1, 172, 10, true);

171+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 161, 0, true);

169− verifyItem(vj->m_columnVisibleItems[1][1], 2, 172, 70, true);

172+ verifyItem(vj->m_columnVisibleItems[1][1], 2, 161, 60, true);

170− verifyItem(vj->m_columnVisibleItems[0][1], 3, 11, 120, true);

173+ verifyItem(vj->m_columnVisibleItems[0][1], 3, 0, 110, true);

171− verifyItem(vj->m_columnVisibleItems[0][2], 4, 11, 140, true);

174+ verifyItem(vj->m_columnVisibleItems[0][2], 4, 0, 130, true);

172− verifyItem(vj->m_columnVisibleItems[0][3], 5, 11, 190, true);

175+ verifyItem(vj->m_columnVisibleItems[0][3], 5, 0, 180, true);

173− verifyItem(vj->m_columnVisibleItems[1][2], 6, 172, 205, true);

176+ verifyItem(vj->m_columnVisibleItems[1][2], 6, 161, 195, true);

174− verifyItem(vj->m_columnVisibleItems[0][4], 7, 11, 270, true);

177+ verifyItem(vj->m_columnVisibleItems[0][4], 7, 0, 260, true);

175− verifyItem(vj->m_columnVisibleItems[0][5], 8, 11, 390, true);

178+ verifyItem(vj->m_columnVisibleItems[0][5], 8, 0, 380, true);

176− verifyItem(vj->m_columnVisibleItems[1][3], 9, 172, 415, false);

179+ verifyItem(vj->m_columnVisibleItems[1][3], 9, 161, 405, false);

177− verifyItem(vj->m_columnVisibleItems[1][4], 10, 172, 445, false);

180+ verifyItem(vj->m_columnVisibleItems[1][4], 10, 161, 435, false);

178− verifyItem(vj->m_columnVisibleItems[1][5], 11, 172, 475, false);

181+ verifyItem(vj->m_columnVisibleItems[1][5], 11, 161, 465, false);

179− verifyItem(vj->m_columnVisibleItems[1][6], 12, 172, 550, false);

182+ verifyItem(vj->m_columnVisibleItems[1][6], 12, 161, 540, false);

180− verifyItem(vj->m_columnVisibleItems[0][6], 13, 11, 560, false);

183+ verifyItem(vj->m_columnVisibleItems[0][6], 13, 0, 550, false);

181− QCOMPARE(vj->implicitHeight(), 770. + 6. * 770. / 14.);

184+ QCOMPARE(vj->implicitHeight(), 750. + 6. * 750. / 14.);

182−

185+

183− vj->setHorizontalSpacing(10);

186+ vj->setColumnSpacing(10);

184 QTRY_COMPARE(vj->m_needsRelayout, false);

187 QTRY_COMPARE(vj->m_needsRelayout, false);

185

188

186 // This is exactly the same block as the first again

189 // This is exactly the same block as the first again

@@ -189,34 +192,34 @@ private Q_SLOTS:

189

192

190 void testVerticalSpacing()

193 void testVerticalSpacing()

191 {

194 {

192− vj->setVerticalSpacing(11);

195+ vj->setRowSpacing(11);

193

196

194 QTRY_COMPARE(vj->m_needsRelayout, false);

197 QTRY_COMPARE(vj->m_needsRelayout, false);

195 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 3);

198 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 3);

196 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 5);

199 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 5);

197 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

200 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

198 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 6);

201 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 6);

199− verifyItem(vj->m_columnVisibleItems[0][0], 0, 10, 11, true);

202+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

200− verifyItem(vj->m_columnVisibleItems[1][0], 1, 170, 11, true);

203+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 160, 0, true);

201− verifyItem(vj->m_columnVisibleItems[2][0], 2, 330, 11, true);

204+ verifyItem(vj->m_columnVisibleItems[2][0], 2, 320, 0, true);

202− verifyItem(vj->m_columnVisibleItems[1][1], 3, 170, 72, true);

205+ verifyItem(vj->m_columnVisibleItems[1][1], 3, 160, 61, true);

203− verifyItem(vj->m_columnVisibleItems[1][2], 4, 170, 93, true);

206+ verifyItem(vj->m_columnVisibleItems[1][2], 4, 160, 82, true);

204− verifyItem(vj->m_columnVisibleItems[0][1], 5, 10, 122, true);

207+ verifyItem(vj->m_columnVisibleItems[0][1], 5, 0, 111, true);

205− verifyItem(vj->m_columnVisibleItems[1][3], 6, 170, 144, true);

208+ verifyItem(vj->m_columnVisibleItems[1][3], 6, 160, 133, true);

206− verifyItem(vj->m_columnVisibleItems[2][1], 7, 330, 147, true);

209+ verifyItem(vj->m_columnVisibleItems[2][1], 7, 320, 136, true);

207− verifyItem(vj->m_columnVisibleItems[0][2], 8, 10, 203, true);

210+ verifyItem(vj->m_columnVisibleItems[0][2], 8, 0, 192, true);

208− verifyItem(vj->m_columnVisibleItems[2][2], 9, 330, 268, true);

211+ verifyItem(vj->m_columnVisibleItems[2][2], 9, 320, 257, true);

209− verifyItem(vj->m_columnVisibleItems[2][3], 10, 330, 299, true);

212+ verifyItem(vj->m_columnVisibleItems[2][3], 10, 320, 288, true);

210− verifyItem(vj->m_columnVisibleItems[2][4], 11, 330, 330, true);

213+ verifyItem(vj->m_columnVisibleItems[2][4], 11, 320, 319, true);

211− verifyItem(vj->m_columnVisibleItems[1][4], 12, 170, 355, true);

214+ verifyItem(vj->m_columnVisibleItems[1][4], 12, 160, 344, true);

212− verifyItem(vj->m_columnVisibleItems[0][3], 13, 10, 374, true);

215+ verifyItem(vj->m_columnVisibleItems[0][3], 13, 0, 363, true);

213− verifyItem(vj->m_columnVisibleItems[2][5], 14, 330, 406, false);

216+ verifyItem(vj->m_columnVisibleItems[2][5], 14, 320, 395, true);

214− verifyItem(vj->m_columnVisibleItems[1][5], 15, 170, 446, false);

217+ verifyItem(vj->m_columnVisibleItems[1][5], 15, 160, 435, false);

215− verifyItem(vj->m_columnVisibleItems[0][4], 16, 10, 585, false);

218+ verifyItem(vj->m_columnVisibleItems[0][4], 16, 0, 574, false);

216− verifyItem(vj->m_columnVisibleItems[1][6], 17, 170, 587, false);

219+ verifyItem(vj->m_columnVisibleItems[1][6], 17, 160, 576, false);

217− QCOMPARE(vj->implicitHeight(), 990. + 2. * 990. / 18.);

220+ QCOMPARE(vj->implicitHeight(), 970. + 2. * 970. / 18.);

218−

221+

219− vj->setVerticalSpacing(10);

222+ vj->setRowSpacing(10);

220 QTRY_COMPARE(vj->m_needsRelayout, false);

223 QTRY_COMPARE(vj->m_needsRelayout, false);

221

224

222 // This is exactly the same block as the first again

225 // This is exactly the same block as the first again

@@ -232,21 +235,21 @@ private Q_SLOTS:

232 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 4);

235 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 4);

233 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 4);

236 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 4);

234 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 6);

237 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 6);

235− verifyItem(vj->m_columnVisibleItems[0][0], 0, 10, 10, false);

238+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, false);

236− verifyItem(vj->m_columnVisibleItems[2][0], 2, 330, 10, false);

239+ verifyItem(vj->m_columnVisibleItems[2][0], 2, 320, 0, false);

237− verifyItem(vj->m_columnVisibleItems[1][0], 4, 170, 90, false);

240+ verifyItem(vj->m_columnVisibleItems[1][0], 4, 160, 80, false);

238− verifyItem(vj->m_columnVisibleItems[0][1], 5, 10, 120, false);

241+ verifyItem(vj->m_columnVisibleItems[0][1], 5, 0, 110, false);

239− verifyItem(vj->m_columnVisibleItems[1][1], 6, 170, 140, true);

242+ verifyItem(vj->m_columnVisibleItems[1][1], 6, 160, 130, true);

240− verifyItem(vj->m_columnVisibleItems[2][1], 7, 330, 145, true);

243+ verifyItem(vj->m_columnVisibleItems[2][1], 7, 320, 135, true);

241− verifyItem(vj->m_columnVisibleItems[0][2], 8, 10, 200, true);

244+ verifyItem(vj->m_columnVisibleItems[0][2], 8, 0, 190, true);

242− verifyItem(vj->m_columnVisibleItems[2][2], 9, 330, 265, true);

245+ verifyItem(vj->m_columnVisibleItems[2][2], 9, 320, 255, true);

243− verifyItem(vj->m_columnVisibleItems[2][3], 10, 330, 295, true);

246+ verifyItem(vj->m_columnVisibleItems[2][3], 10, 320, 285, true);

244− verifyItem(vj->m_columnVisibleItems[2][4], 11, 330, 325, true);

247+ verifyItem(vj->m_columnVisibleItems[2][4], 11, 320, 315, true);

245− verifyItem(vj->m_columnVisibleItems[1][2], 12, 170, 350, true);

248+ verifyItem(vj->m_columnVisibleItems[1][2], 12, 160, 340, true);

246− verifyItem(vj->m_columnVisibleItems[0][3], 13, 10, 370, true);

249+ verifyItem(vj->m_columnVisibleItems[0][3], 13, 0, 360, true);

247− verifyItem(vj->m_columnVisibleItems[2][5], 14, 330, 400, false);

250+ verifyItem(vj->m_columnVisibleItems[2][5], 14, 320, 390, true);

248− verifyItem(vj->m_columnVisibleItems[1][3], 15, 170, 440, false);

251+ verifyItem(vj->m_columnVisibleItems[1][3], 15, 160, 430, false);

249− QCOMPARE(vj->implicitHeight(), 710. + 4. * 710. / 16.);

252+ QCOMPARE(vj->implicitHeight(), 690. + 4. * 690. / 16.);

250

253

251 vj->resetDelegateCreationBegin();

254 vj->resetDelegateCreationBegin();

252 vj->resetDelegateCreationEnd();

255 vj->resetDelegateCreationEnd();

@@ -262,21 +265,21 @@ private Q_SLOTS:

262 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 2);

265 QTRY_COMPARE(vj->m_columnVisibleItems.count(), 2);

263 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 7);

266 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 7);

264 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

267 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 7);

265− verifyItem(vj->m_columnVisibleItems[0][0], 0, 10, 10, true);

268+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

266− verifyItem(vj->m_columnVisibleItems[1][0], 1, 220, 10, true);

269+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 210, 0, true);

267− verifyItem(vj->m_columnVisibleItems[1][1], 2, 220, 70, true);

270+ verifyItem(vj->m_columnVisibleItems[1][1], 2, 210, 60, true);

268− verifyItem(vj->m_columnVisibleItems[0][1], 3, 10, 120, true);

271+ verifyItem(vj->m_columnVisibleItems[0][1], 3, 0, 110, true);

269− verifyItem(vj->m_columnVisibleItems[0][2], 4, 10, 140, true);

272+ verifyItem(vj->m_columnVisibleItems[0][2], 4, 0, 130, true);

270− verifyItem(vj->m_columnVisibleItems[0][3], 5, 10, 190, true);

273+ verifyItem(vj->m_columnVisibleItems[0][3], 5, 0, 180, true);

271− verifyItem(vj->m_columnVisibleItems[1][2], 6, 220, 205, true);

274+ verifyItem(vj->m_columnVisibleItems[1][2], 6, 210, 195, true);

272− verifyItem(vj->m_columnVisibleItems[0][4], 7, 10, 270, true);

275+ verifyItem(vj->m_columnVisibleItems[0][4], 7, 0, 260, true);

273− verifyItem(vj->m_columnVisibleItems[0][5], 8, 10, 390, true);

276+ verifyItem(vj->m_columnVisibleItems[0][5], 8, 0, 380, true);

274− verifyItem(vj->m_columnVisibleItems[1][3], 9, 220, 415, false);

277+ verifyItem(vj->m_columnVisibleItems[1][3], 9, 210, 405, false);

275− verifyItem(vj->m_columnVisibleItems[1][4], 10, 220, 445, false);

278+ verifyItem(vj->m_columnVisibleItems[1][4], 10, 210, 435, false);

276− verifyItem(vj->m_columnVisibleItems[1][5], 11, 220, 475, false);

279+ verifyItem(vj->m_columnVisibleItems[1][5], 11, 210, 465, false);

277− verifyItem(vj->m_columnVisibleItems[1][6], 12, 220, 550, false);

280+ verifyItem(vj->m_columnVisibleItems[1][6], 12, 210, 540, false);

278− verifyItem(vj->m_columnVisibleItems[0][6], 13, 10, 560, false);

281+ verifyItem(vj->m_columnVisibleItems[0][6], 13, 0, 550, false);

279− QCOMPARE(vj->implicitHeight(), 770. + 6. * 770. / 14.);

282+ QCOMPARE(vj->implicitHeight(), 750. + 6. * 750. / 14.);

280

283

281 vj->setColumnWidth(150);

284 vj->setColumnWidth(150);

282

285

@@ -297,12 +300,12 @@ private Q_SLOTS:

297 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 1);

300 QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 1);

298 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 2);

301 QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 2);

299 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 3);

302 QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 3);

300− verifyItem(vj->m_columnVisibleItems[0][0], 0, 10, 10, true);

303+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

301− verifyItem(vj->m_columnVisibleItems[1][0], 1, 170, 10, true);

304+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 160, 0, true);

302− verifyItem(vj->m_columnVisibleItems[2][0], 2, 330, 10, true);

305+ verifyItem(vj->m_columnVisibleItems[2][0], 2, 320, 0, true);

303− verifyItem(vj->m_columnVisibleItems[2][1], 3, 330, 45, true);

306+ verifyItem(vj->m_columnVisibleItems[2][1], 3, 320, 35, true);

304− verifyItem(vj->m_columnVisibleItems[1][1], 4, 170, 70, true);

307+ verifyItem(vj->m_columnVisibleItems[1][1], 4, 160, 60, true);

305− verifyItem(vj->m_columnVisibleItems[2][2], 5, 330, 80, true);

308+ verifyItem(vj->m_columnVisibleItems[2][2], 5, 320, 70, true);

306 }

309 }

307

310

308private:

311private:

tests/plugins/DashViews/verticaljournaltest.qml+2−2

@@ -23,8 +23,8 @@ Item {

23 id: vj

24 anchors.fill: parent

25 columnWidth: 150

26− horizontalSpacing: 10

26+ columnSpacing: 10

27− verticalSpacing: 10

27+ rowSpacing: 10

29 delegate: Rectangle {

30 property real randomValue: Math.random()