kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CompactView] Remove animation on file rename

Browse source 
This MR fixes an issue where the label is cut off when renaming in Compact View mode.

BUG: 449179
FIXED-IN: 22.04
This commit is contained in:
Eugene Popov 2022-02-25 19:37:01 +00:00 committed by Ismael Asensio
parent c623522ecb
commit 8250961206
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/kitemviews/kitemlistview.cpp
View file

@ -80,7 +80,6 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
m_sizeHintResolver(nullptr),
m_layouter(nullptr),
m_animation(nullptr),
m_layoutTimer(nullptr),
m_oldScrollOffset(0),
m_oldMaximumScrollOffset(0),
m_oldItemOffset(0),
@ -107,11 +106,6 @@ KItemListView::KItemListView(QGraphicsWidget* parent) :
connect(m_animation, &KItemListViewAnimation::finished,
this, &KItemListView::slotAnimationFinished);
m_layoutTimer = new QTimer(this);
m_layoutTimer->setInterval(300);
m_layoutTimer->setSingleShot(true);
connect(m_layoutTimer, &QTimer::timeout, this, &KItemListView::slotLayoutTimerFinished);
m_rubberBand = new KItemListRubberBand(this);
connect(m_rubberBand, &KItemListRubberBand::activationChanged, this, &KItemListView::slotRubberBandActivationChanged);
@ -1335,10 +1329,6 @@ void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,
if (updateSizeHints) {
m_sizeHintResolver->itemsChanged(index, count, roles);
m_layouter->markAsDirty();
if (!m_layoutTimer->isActive()) {
m_layoutTimer->start();
}
}
// Apply the changed roles to the visible item-widgets
@ -1362,6 +1352,8 @@ void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,
ev.setLastRow(itemRange.index + itemRange.count);
QAccessible::updateAccessibility(&ev);
}
doLayout(NoAnimation);
}
void KItemListView::slotGroupsChanged()
@ -1483,12 +1475,6 @@ void KItemListView::slotAnimationFinished(QGraphicsWidget* widget,
}
}
void KItemListView::slotLayoutTimerFinished()
{
m_layouter->setSize(geometry().size());
doLayout(Animation);
}
void KItemListView::slotRubberBandPosChanged()
{
update();
@ -1746,10 +1732,6 @@ KItemListRubberBand* KItemListView::rubberBand() const
void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int changedCount)
{
if (m_layoutTimer->isActive()) {
m_layoutTimer->stop();
}
if (m_activeTransactions > 0) {
if (hint == NoAnimation) {
// As soon as at least one property change should be done without animation,

2
src/kitemviews/kitemlistview.h
View file

@ -418,7 +418,6 @@ protected Q_SLOTS:
private Q_SLOTS:
void slotAnimationFinished(QGraphicsWidget* widget,
KItemListViewAnimation::AnimationType type);
void slotLayoutTimerFinished();
void slotRubberBandPosChanged();
void slotRubberBandActivationChanged(bool active);
@ -747,7 +746,6 @@ private:
KItemListViewLayouter* m_layouter;
KItemListViewAnimation* m_animation;
QTimer* m_layoutTimer; // Triggers an asynchronous doLayout() call.
qreal m_oldScrollOffset;
qreal m_oldMaximumScrollOffset;
qreal m_oldItemOffset;