2136695 · unity8 · git.iko.soy

plugins/DashViews/abstractjournal.cpp+3−3

compare with xenial

unifiedsplit

@@ -214,7 +214,7 @@ void AbstractJournal::refill()

214 }

215}

216

217−bool AbstractJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous)

217+bool AbstractJournal::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)

218{

219 if (!delegate())

220 return false;

@@ -226,7 +226,7 @@ bool AbstractJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchr

226 qreal yPos;

227 findBottomModelIndexToAdd(&modelIndex, &yPos);

228 bool changed = false;

229− while (modelIndex < m_delegateModel->count() && yPos <= fillTo) {

229+ while (modelIndex < m_delegateModel->count() && yPos <= fillToY) {

230 if (!createItem(modelIndex, asynchronous))

231 break;

232

@@ -235,7 +235,7 @@ bool AbstractJournal::addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchr

235 }

236

237 findTopModelIndexToAdd(&modelIndex, &yPos);

238− while (modelIndex >= 0 && yPos > fillFrom) {

238+ while (modelIndex >= 0 && yPos > fillFromY) {

239 if (!createItem(modelIndex, asynchronous))

240 break;

241

plugins/DashViews/abstractjournal.h+3−3

@@ -105,16 +105,16 @@ private Q_SLOTS:

105private:

106 void createDelegateModel();

107 void refill();

108− bool addVisibleItems(qreal fillFrom, qreal fillTo, bool asynchronous);

108+ bool addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous);

109 QQuickItem *createItem(int modelIndex, bool asynchronous);

110

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

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

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

114− virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) = 0;

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

115 virtual void cleanupExistingItems() = 0;

116 virtual void doRelayout() = 0;

117− virtual void updateItemCulling(qreal visibleFrom, qreal visibleTo) = 0;

117+ virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

118 virtual void calculateImplicitHeight() = 0;

119#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

120 virtual void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) = 0;

plugins/DashViews/horizontaljournal.cpp+5−5

@@ -95,17 +95,17 @@ void HorizontalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

95 }

96}

97

98−bool HorizontalJournal::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

98+bool HorizontalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

99{

100 bool changed = false;

101

102− while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFrom) {

102+ while (!m_visibleItems.isEmpty() && m_visibleItems.first()->y() + m_rowHeight < bufferFromY) {

103 releaseItem(m_visibleItems.takeFirst());

104 changed = true;

105 m_firstVisibleIndex++;

106 }

107

108− while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferTo) {

108+ while (!m_visibleItems.isEmpty() && m_visibleItems.last()->y() > bufferToY) {

109 releaseItem(m_visibleItems.takeLast());

110 changed = true;

111 m_lastInRowIndexPosition.remove(m_firstVisibleIndex + m_visibleItems.count());

@@ -245,9 +245,9 @@ void HorizontalJournal::doRelayout()

245 }

246}

247

248−void HorizontalJournal::updateItemCulling(qreal visibleFrom, qreal visibleTo)

248+void HorizontalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

249{

250 Q_FOREACH(QQuickItem *item, m_visibleItems) {

251− QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFrom || item->y() >= visibleTo);

251+ QQuickItemPrivate::get(item)->setCulled(item->y() + m_rowHeight <= visibleFromY || item->y() >= visibleToY);

252 }

253}

plugins/DashViews/horizontaljournal.h+2−2

@@ -46,12 +46,12 @@ Q_SIGNALS:

46private:

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

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

49− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) override;

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

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

51 void cleanupExistingItems() override;

52 void calculateImplicitHeight() override;

53 void doRelayout() override;

54− void updateItemCulling(qreal visibleFrom, qreal visibleTo) override;

54+ void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

55#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

56 void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

57#else

plugins/DashViews/verticaljournal.cpp+5−5

@@ -110,18 +110,18 @@ void VerticalJournal::findTopModelIndexToAdd(int *modelIndex, qreal *yPos)

110 }

111}

112

113−bool VerticalJournal::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)

113+bool VerticalJournal::removeNonVisibleItems(qreal bufferFromY, qreal bufferToY)

114{

115 bool changed = false;

116

117 for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

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

119− while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFrom) {

119+ while (!column.isEmpty() && column.first().y() + column.first().height() < bufferFromY) {

120 releaseItem(column.takeFirst().m_item);

121 changed = true;

122 }

123

124− while (!column.isEmpty() && column.last().y() > bufferTo) {

124+ while (!column.isEmpty() && column.last().y() > bufferToY) {

125 releaseItem(column.takeLast().m_item);

126 changed = true;

127 }

@@ -228,11 +228,11 @@ void VerticalJournal::doRelayout()

228 }

229}

230

231−void VerticalJournal::updateItemCulling(qreal visibleFrom, qreal visibleTo)

231+void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

232{

233 Q_FOREACH(const auto &column, m_columnVisibleItems) {

234 Q_FOREACH(const ViewItem &item, column) {

235− const bool cull = item.y() + item.height() <= visibleFrom || item.y() >= visibleTo;

235+ const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;

236 QQuickItemPrivate::get(item.m_item)->setCulled(cull);

237 }

238 }

plugins/DashViews/verticaljournal.h+2−2

@@ -84,12 +84,12 @@ private:

84

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

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

87− bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) override;

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

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

89 void cleanupExistingItems() override;

90 void calculateImplicitHeight() override;

91 void doRelayout() override;

92− void updateItemCulling(qreal visibleFrom, qreal visibleTo) override;

92+ void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

93#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

94 void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

95#else