8c7c7ca · unity8 · git.iko.soy

plugins/DashViews/abstractdashview.cpp+1−1

compare with xenial

unifiedsplit

@@ -276,7 +276,7 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

276#endif

277 return nullptr;

278 } else {

279− positionItem(modelIndex, item);

279+ addItemToView(modelIndex, item);

280 return item;

281 }

282}

plugins/DashViews/abstractdashview.h+1−1

@@ -111,7 +111,7 @@ private:

111

112 virtual void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

113 virtual void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) = 0;

114− virtual void positionItem(int modelIndex, QQuickItem *item) = 0;

114+ virtual void addItemToView(int modelIndex, QQuickItem *item) = 0;

115 virtual bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) = 0;

116 virtual void cleanupExistingItems() = 0;

117 virtual void doRelayout() = 0;

plugins/DashViews/horizontaljournal.cpp+3−3

@@ -118,7 +118,7 @@ bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY

118 return changed;

119}

120

121−void HorizontalJournal::positionItem(int modelIndex, QQuickItem *item)

121+void HorizontalJournal::addItemToView(int modelIndex, QQuickItem *item)

122{

123 if (item->height() != m_rowHeight) {

124 qWarning() << "Item" << modelIndex << "height is not the one that the rowHeight mandates, resetting it";

@@ -159,7 +159,7 @@ void HorizontalJournal::positionItem(int modelIndex, QQuickItem *item)

159 m_firstVisibleIndex = modelIndex;

160 m_visibleItems.prepend(item);

161 } else {

162− qWarning() << "HorizontalJournal::positionItem - Got unexpected modelIndex"

162+ qWarning() << "HorizontalJournal::addItemToView - Got unexpected modelIndex"

163 << modelIndex << m_firstVisibleIndex << m_visibleItems.count();

164 }

165 }

@@ -232,7 +232,7 @@ void HorizontalJournal::doRelayout()

232 m_visibleItems.clear();

233 m_lastInRowIndexPosition.clear();

234 Q_FOREACH(QQuickItem *item, allItems) {

235− positionItem(i, item);

235+ addItemToView(i, item);

236 ++i;

237 }

238 } else {

plugins/DashViews/horizontaljournal.h+1−1

@@ -47,7 +47,7 @@ private:

47 void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

48 void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

49 bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

50− void positionItem(int modelIndex, QQuickItem *item) override;

50+ void addItemToView(int modelIndex, QQuickItem *item) override;

51 void cleanupExistingItems() override;

52 void calculateImplicitHeight() override;

53 void doRelayout() override;

plugins/DashViews/organicgrid.cpp+3−3

@@ -132,7 +132,7 @@ void OrganicGrid::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

132 }

133}

134

135−void OrganicGrid::positionItem(int modelIndex, QQuickItem *item)

135+void OrganicGrid::addItemToView(int modelIndex, QQuickItem *item)

136{

137 // modelIndex has to be either m_firstVisibleIndex - 1 or m_firstVisibleIndex + m_visibleItems.count() or the first

138 if (modelIndex == m_firstVisibleIndex + m_visibleItems.count()) {

@@ -144,7 +144,7 @@ void OrganicGrid::positionItem(int modelIndex, QQuickItem *item)

144 m_firstVisibleIndex = 0;

145 m_visibleItems << item;

146 } else {

147− qWarning() << "OrganicGrid::positionItem - Got unexpected modelIndex"

147+ qWarning() << "OrganicGrid::addItemToView - Got unexpected modelIndex"

148 << modelIndex << m_firstVisibleIndex << m_visibleItems.count();

149 return;

150 }

@@ -207,7 +207,7 @@ void OrganicGrid::doRelayout()

207 const QList<QQuickItem*> allItems = m_visibleItems;

208 m_visibleItems.clear();

209 Q_FOREACH(QQuickItem *item, allItems) {

210− positionItem(i, item);

210+ addItemToView(i, item);

211 ++i;

212 }

213}

plugins/DashViews/organicgrid.h+1−1

@@ -73,7 +73,7 @@ private:

73

74 void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

75 void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

76− void positionItem(int modelIndex, QQuickItem *item) override;

76+ void addItemToView(int modelIndex, QQuickItem *item) override;

77 bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

78 void cleanupExistingItems() override;

79 void doRelayout() override;

plugins/DashViews/verticaljournal.cpp+2−2

@@ -130,7 +130,7 @@ bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

130 return changed;

131}

132

133−void VerticalJournal::positionItem(int modelIndex, QQuickItem *item)

133+void VerticalJournal::addItemToView(int modelIndex, QQuickItem *item)

134{

135 if (item->width() != m_columnWidth) {

136 qWarning() << "Item" << modelIndex << "width is not the one that the columnWidth mandates, resetting it";

@@ -220,7 +220,7 @@ void VerticalJournal::doRelayout()

220 if (!allItems.isEmpty()) {

221 if (allItems.first().m_modelIndex == 0) {

222 Q_FOREACH(const ViewItem &item, allItems)

223− positionItem(item.m_modelIndex, item.m_item);

223+ addItemToView(item.m_modelIndex, item.m_item);

224 } else {

225 Q_FOREACH(const ViewItem &item, allItems)

226 releaseItem(item.m_item);

plugins/DashViews/verticaljournal.h+1−1

@@ -85,7 +85,7 @@ private:

85 void findBottomModelIndexToAdd(int *modelIndex, qreal *yPos) override;

86 void findTopModelIndexToAdd(int *modelIndex, qreal *yPos) override;

87 bool removeNonVisibleItems(qreal bufferFromY, qreal bufferToY) override;

88− void positionItem(int modelIndex, QQuickItem *item) override;

88+ void addItemToView(int modelIndex, QQuickItem *item) override;

89 void cleanupExistingItems() override;

90 void calculateImplicitHeight() override;

91 void doRelayout() override;