@@ -444,6 +444,27 @@ void VerticalJournal::releaseItem(const ViewItem &item)
444444 }
445445}
446446
447+void VerticalJournal::calculateImplicitHeight()
448+{
449+ m_implicitHeightDirty = false;
450+
451+ int lastModelIndex = -1;
452+ qreal bottomMostY = 0;
453+ Q_FOREACH(const auto &column, m_columnVisibleItems) {
454+ if (!column.isEmpty()) {
455+ const ViewItem &item = column.last();
456+ lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);
457+ bottomMostY = qMax(bottomMostY, item.y() + item.height() + m_verticalSpacing);
458+ }
459+ }
460+ if (lastModelIndex >= 0) {
461+ const double averageHeight = bottomMostY / (lastModelIndex + 1);
462+ setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - lastModelIndex - 1));
463+ } else {
464+ setImplicitHeight(0);
465+ }
466+}
467+
447468#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))
448469void VerticalJournal::itemCreated(int modelIndex, QQuickItem *item)
449470{
@@ -521,23 +542,7 @@ void VerticalJournal::updatePolish()
521542 }
522543
523544 if (m_implicitHeightDirty) {
524− m_implicitHeightDirty = false;
525−
526− int lastModelIndex = -1;
527− qreal bottomMostY = 0;
528− Q_FOREACH(const auto &column, m_columnVisibleItems) {
529− if (!column.isEmpty()) {
530− const ViewItem &item = column.last();
531− lastModelIndex = qMax(lastModelIndex, item.m_modelIndex);
532− bottomMostY = qMax(bottomMostY, item.y() + item.height() + m_verticalSpacing);
533− }
534− }
535− if (lastModelIndex >= 0) {
536− const double averageHeight = bottomMostY / (lastModelIndex + 1);
537− setImplicitHeight(bottomMostY + averageHeight * (model()->rowCount() - lastModelIndex - 1));
538− } else {
539− setImplicitHeight(0);
540− }
545+ calculateImplicitHeight();
541546 }
542547}
543548