fixed wrong logic for showing the space info: if the progress bar is shown, the space info may never be shown

svn path=/trunk/KDE/kdebase/apps/; revision=826897
This commit is contained in:
Peter Penz 2008-07-01 19:08:17 +00:00
parent 2f0c966c30
commit 3da35b5c1c

View file

@ -116,7 +116,7 @@ void DolphinStatusBar::setProgress(int percent)
m_progressBar->setValue(m_progress);
if (!m_progressBar->isVisible() || (percent == 100)) {
QTimer::singleShot(500, this, SLOT(updateProgressInfo()));
QTimer::singleShot(300, this, SLOT(updateProgressInfo()));
}
const QString& defaultText = m_messageLabel->defaultText();
@ -179,13 +179,12 @@ void DolphinStatusBar::showSpaceInfo()
const bool isProgressBarVisible = m_progressBar->isVisible();
if (m_spaceInfo->isVisible()) {
// The space information is shown currently. Hide it
// if the progress bar is visible or if the status bar
// text does not fit into the available width.
if (isProgressBarVisible || (widthGap > 0)) {
// The space information is shown currently. Hide it if
// the status bar text does not fit into the available width.
if (widthGap > 0) {
m_spaceInfo->hide();
}
} else if (widthGap + m_spaceInfo->width() <= 0) {
} else if (!isProgressBarVisible && (widthGap + m_spaceInfo->width() <= 0)) {
m_spaceInfo->show();
}
}