From 982ce7ae203de9142ca3e79e6fdeacd003fb0414 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 21 Mar 2012 12:08:59 +0100 Subject: Prevent flickering when updating items When downloading images from e.g. the camera-IO-slave the files will be downloaded as *.part files and renamed afterwards. The renaming results in an undetermined mimetype and hence the probably already available preview or icon gets replaced by a dummy icon. The patch fixes this by keeping the old values as long until they have been resolved by KFileItemModelRolesUpdater. --- src/kitemviews/kfileitemmodelrolesupdater.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/kitemviews/kfileitemmodelrolesupdater.cpp') diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 06749f993..7b0d75dba 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -91,9 +91,9 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO this, SLOT(slotItemsChanged(KItemRangeList,QSet))); // Use a timer to prevent that each call of slotItemsChanged() results in a synchronous - // resolving of the roles. Postpone the resolving until no update has been done for 2 seconds. + // resolving of the roles. Postpone the resolving until no update has been done for 1 second. m_changedItemsTimer = new QTimer(this); - m_changedItemsTimer->setInterval(2000); + m_changedItemsTimer->setInterval(1000); m_changedItemsTimer->setSingleShot(true); connect(m_changedItemsTimer, SIGNAL(timeout()), this, SLOT(resolveChangedItems())); } @@ -418,6 +418,7 @@ void KFileItemModelRolesUpdater::resolveChangedItems() itemRanges.append(KItemRange(index, 1)); } } + m_changedItems.clear(); startUpdating(itemRanges); } @@ -711,7 +712,7 @@ bool KFileItemModelRolesUpdater::applyResolvedRoles(const KFileItem& item, Resol data.insert("iconName", item.iconName()); if (m_clearPreviews) { - data.insert("iconPixmap", QString()); + data.insert("iconPixmap", QPixmap()); } disconnect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet)), -- cgit v1.3