kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 08:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue that moving the mouse above the viewport might trigger showing the meta-information of an only shortly hovered file.

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=1193131
This commit is contained in:
Peter Penz 2010-11-04 19:04:18 +00:00
parent 6da89c3f30
commit 0dab03ed4c
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/panels/information/informationpanel.cpp
View file

@ -96,18 +96,17 @@ void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
return; return;
} }
cancelRequest();
if (item.isNull()) { if (item.isNull()) {
// The cursor is above the viewport. If files are selected, // The cursor is above the viewport. If files are selected,
// show information regarding the selection. // show information regarding the selection.
if (m_selection.size() > 0) { if (m_selection.size() > 0) {
cancelRequest();
m_fileItem = KFileItem(); m_fileItem = KFileItem();
m_infoTimer->start(); m_infoTimer->start();
} }
} else if (item.url().isValid() && !isEqualToShownUrl(item.url())) { } else if (item.url().isValid() && !isEqualToShownUrl(item.url())) {
// The cursor is above an item that is not shown currently // The cursor is above an item that is not shown currently
cancelRequest();
m_urlCandidate = item.url(); m_urlCandidate = item.url();
m_fileItem = item; m_fileItem = item;
m_infoTimer->start(); m_infoTimer->start();
@ -308,8 +307,10 @@ void InformationPanel::cancelRequest()
m_folderStatJob = 0; m_folderStatJob = 0;
m_infoTimer->stop(); m_infoTimer->stop();
m_urlChangedTimer->stop();
m_resetUrlTimer->stop(); m_resetUrlTimer->stop();
// Don't reset m_urlChangedTimer. As it is assured that the timeout of m_urlChangedTimer
// has the smallest interval (see init()), it is not possible that the exceeded timer
// would overwrite an information provided by a selection or hovering.
m_invalidUrlCandidate.clear(); m_invalidUrlCandidate.clear();
m_urlCandidate.clear(); m_urlCandidate.clear();
@ -328,26 +329,27 @@ void InformationPanel::markUrlAsInvalid()
void InformationPanel::init() void InformationPanel::init()
{ {
const int defaultDelay = 300;
m_infoTimer = new QTimer(this); m_infoTimer = new QTimer(this);
m_infoTimer->setInterval(defaultDelay); m_infoTimer->setInterval(300);
m_infoTimer->setSingleShot(true); m_infoTimer->setSingleShot(true);
connect(m_infoTimer, SIGNAL(timeout()), connect(m_infoTimer, SIGNAL(timeout()),
this, SLOT(slotInfoTimeout())); this, SLOT(slotInfoTimeout()));
m_urlChangedTimer = new QTimer(this); m_urlChangedTimer = new QTimer(this);
m_urlChangedTimer->setInterval(defaultDelay); m_urlChangedTimer->setInterval(200);
m_urlChangedTimer->setSingleShot(true); m_urlChangedTimer->setSingleShot(true);
connect(m_urlChangedTimer, SIGNAL(timeout()), connect(m_urlChangedTimer, SIGNAL(timeout()),
this, SLOT(showItemInfo())); this, SLOT(showItemInfo()));
m_resetUrlTimer = new QTimer(this); m_resetUrlTimer = new QTimer(this);
m_resetUrlTimer->setInterval(defaultDelay * 3); m_resetUrlTimer->setInterval(1000);
m_resetUrlTimer->setSingleShot(true); m_resetUrlTimer->setSingleShot(true);
connect(m_resetUrlTimer, SIGNAL(timeout()), connect(m_resetUrlTimer, SIGNAL(timeout()),
this, SLOT(reset())); this, SLOT(reset()));
Q_ASSERT(m_urlChangedTimer->interval() < m_infoTimer->interval());
Q_ASSERT(m_urlChangedTimer->interval() < m_resetUrlTimer->interval());
org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(), org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(),
QDBusConnection::sessionBus(), this); QDBusConnection::sessionBus(), this);
connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString))); connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString)));