┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kitemviews/kfileitemlistview.cpp2
-rw-r--r--src/kitemviews/kfileitemlistwidget.cpp2
-rw-r--r--src/kitemviews/kfileitemmodel.cpp2
-rw-r--r--src/kitemviews/kfileitemmodelrolesupdater.cpp2
-rw-r--r--src/kitemviews/kitemlistview.cpp40
-rw-r--r--src/kitemviews/kitemlistview.h4
-rw-r--r--src/kitemviews/kitemlistviewlayouter.cpp2
7 files changed, 27 insertions, 27 deletions
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index d7dd5cf67..e2bde3b12 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -34,7 +34,7 @@
#include <QTextLine>
#include <QTimer>
-#define KFILEITEMLISTVIEW_DEBUG
+// #define KFILEITEMLISTVIEW_DEBUG
namespace {
const int ShortInterval = 50;
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 7fce4b74d..7a36214b6 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -38,7 +38,7 @@
#include <QTextLayout>
#include <QTextLine>
-//#define KFILEITEMLISTWIDGET_DEBUG
+// #define KFILEITEMLISTWIDGET_DEBUG
KFileItemListWidget::KFileItemListWidget(QGraphicsItem* parent) :
KItemListWidget(parent),
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index e3b61d475..86ec5de89 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -28,7 +28,7 @@
#include <QMimeData>
#include <QTimer>
-#define KFILEITEMMODEL_DEBUG
+// #define KFILEITEMMODEL_DEBUG
KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
KItemModelBase("name", parent),
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 5175b371c..4fe45624c 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -41,7 +41,7 @@
#include <QFile>
#endif
-#define KFILEITEMMODELROLESUPDATER_DEBUG
+// #define KFILEITEMMODELROLESUPDATER_DEBUG
namespace {
// Maximum time in ms that the KFileItemModelRolesUpdater
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index 15e0340c0..bda559d2c 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -127,7 +127,7 @@ void KItemListView::setScrollOrientation(Qt::Orientation orientation)
}
}
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
onScrollOrientationChanged(orientation, previousOrientation);
emit scrollOrientationChanged(orientation, previousOrientation);
@@ -159,7 +159,7 @@ void KItemListView::setItemSize(const QSizeF& itemSize)
}
m_sizeHintResolver->clearCache();
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
onItemSizeChanged(itemSize, previousSize);
}
@@ -181,9 +181,11 @@ void KItemListView::setScrollOffset(qreal offset)
m_layouter->setScrollOffset(offset);
m_animation->setScrollOffset(offset);
- if (!m_layoutTimer->isActive()) {
- doLayout(NoAnimation, 0, 0);
- }
+
+ // Don't check whether the m_layoutTimer is active: Changing the
+ // scroll offset must always trigger a synchronous layout, otherwise
+ // the smooth-scrolling might get jerky.
+ doLayout(NoAnimation);
onScrollOffsetChanged(offset, previousOffset);
}
@@ -204,7 +206,7 @@ void KItemListView::setItemOffset(qreal offset)
m_header->setPos(-offset, 0);
}
if (!m_layoutTimer->isActive()) {
- doLayout(NoAnimation, 0, 0);
+ doLayout(NoAnimation);
}
}
@@ -241,7 +243,7 @@ void KItemListView::setVisibleRoles(const QList<QByteArray>& roles)
}
updateVisibleRolesSizes();
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
onVisibleRolesChanged(roles, previousRoles);
}
@@ -330,7 +332,7 @@ void KItemListView::setStyleOption(const KItemListStyleOption& option)
}
m_sizeHintResolver->clearCache();
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
onStyleOptionChanged(option, previousOption);
}
@@ -506,7 +508,7 @@ void KItemListView::endTransaction()
if (m_activeTransactions == 0) {
onTransactionEnd();
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
}
}
@@ -775,7 +777,6 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
m_layouter->markAsDirty();
if (m_model->count() == count && maximumScrollOffset() > size().height()) {
- kDebug() << "Scrollbar required, skipping layout";
const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent);
QSizeF layouterSize = m_layouter->size();
if (scrollOrientation() == Qt::Vertical) {
@@ -903,7 +904,7 @@ void KItemListView::slotItemsMoved(const KItemRange& itemRange, const QList<int>
}
}
- doLayout(NoAnimation, 0, 0);
+ doLayout(NoAnimation);
}
void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,
@@ -940,7 +941,7 @@ void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,
// The sort-role has been changed which might result
// in modified group headers
updateVisibleGroupHeaders();
- doLayout(NoAnimation, 0, 0);
+ doLayout(NoAnimation);
}
}
}
@@ -967,7 +968,7 @@ void KItemListView::slotGroupedSortingChanged(bool current)
Q_ASSERT(m_visibleGroups.isEmpty());
}
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
}
void KItemListView::slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
@@ -976,7 +977,7 @@ void KItemListView::slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder pr
Q_UNUSED(previous);
if (m_grouped) {
updateVisibleGroupHeaders();
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
}
}
@@ -986,7 +987,7 @@ void KItemListView::slotSortRoleChanged(const QByteArray& current, const QByteAr
Q_UNUSED(previous);
if (m_grouped) {
updateVisibleGroupHeaders();
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
}
}
@@ -1060,7 +1061,7 @@ void KItemListView::slotAnimationFinished(QGraphicsWidget* widget,
void KItemListView::slotLayoutTimerFinished()
{
m_layouter->setSize(geometry().size());
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
}
void KItemListView::slotRubberBandPosChanged()
@@ -1115,7 +1116,7 @@ void KItemListView::slotVisibleRoleWidthChanged(const QByteArray& role,
widget->setVisibleRolesSizes(m_stretchedVisibleRolesSizes);
}
- doLayout(Animation, 0, 0);
+ doLayout(Animation);
}
}
@@ -1255,7 +1256,6 @@ KItemListRubberBand* KItemListView::rubberBand() const
void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int changedCount)
{
if (m_layoutTimer->isActive()) {
- kDebug() << "Stopping layout timer, synchronous layout requested";
m_layoutTimer->stop();
}
@@ -1331,7 +1331,8 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
if (animate && changedCount < 0) {
// Items have been deleted, move the created item to the
- // imaginary old position.
+ // imaginary old position. They will get animated to the new position
+ // later.
const QRectF itemRect = m_layouter->itemRect(i - changedCount);
if (itemRect.isEmpty()) {
const QPointF invisibleOldPos = (scrollOrientation() == Qt::Vertical)
@@ -1349,7 +1350,6 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int cha
if (animate) {
const bool itemsRemoved = (changedCount < 0);
const bool itemsInserted = (changedCount > 0);
-
if (itemsRemoved && (i >= changedIndex + changedCount + 1)) {
// The item is located after the removed items. Animate the moving of the position.
m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos);
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 299e8f60b..90f753087 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -354,8 +354,8 @@ private:
KItemListRubberBand* rubberBand() const;
- void doLayout(LayoutAnimationHint hint, int changedIndex, int changedCount);
- void doGroupHeadersLayout(LayoutAnimationHint hint, int changedIndex, int changedCount);
+ void doLayout(LayoutAnimationHint hint, int changedIndex = 0, int changedCount = 0);
+
void emitOffsetChanges();
KItemListWidget* createWidget(int index);
diff --git a/src/kitemviews/kitemlistviewlayouter.cpp b/src/kitemviews/kitemlistviewlayouter.cpp
index cc7333232..f3c14f53d 100644
--- a/src/kitemviews/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/kitemlistviewlayouter.cpp
@@ -24,7 +24,7 @@
#include <KDebug>
-#define KITEMLISTVIEWLAYOUTER_DEBUG
+// #define KITEMLISTVIEWLAYOUTER_DEBUG
KItemListViewLayouter::KItemListViewLayouter(QObject* parent) :
QObject(parent),
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 14:26:32 +0000