mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Step 1 of 2 to fix the issue that reloading of a directory resets the contents position to 0/0 (step 2 will be committed after the BIC Monday...).
svn path=/trunk/KDE/kdebase/apps/; revision=644237
This commit is contained in:
parent
7d440c42f6
commit
397b9bd450
|
@ -59,6 +59,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
|
||||||
bool showHiddenFiles) :
|
bool showHiddenFiles) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
m_showProgress(false),
|
m_showProgress(false),
|
||||||
|
m_blockContentsMovedSignal(false),
|
||||||
m_mode(mode),
|
m_mode(mode),
|
||||||
m_iconSize(0),
|
m_iconSize(0),
|
||||||
m_folderCount(0),
|
m_folderCount(0),
|
||||||
|
@ -731,6 +732,7 @@ void DolphinView::updateItemCount()
|
||||||
|
|
||||||
updateStatusBar();
|
updateStatusBar();
|
||||||
|
|
||||||
|
m_blockContentsMovedSignal = false;
|
||||||
QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
|
QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -821,6 +823,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
|
||||||
m_statusBar->setProgress(0);
|
m_statusBar->setProgress(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_blockContentsMovedSignal = true;
|
||||||
m_dirLister->stop();
|
m_dirLister->stop();
|
||||||
m_dirLister->openUrl(url, false, reload);
|
m_dirLister->openUrl(url, false, reload);
|
||||||
}
|
}
|
||||||
|
@ -1000,8 +1003,6 @@ void DolphinView::dropUrls(const KUrl::List& urls,
|
||||||
const KUrl& destination = (directory == 0) ? url() :
|
const KUrl& destination = (directory == 0) ? url() :
|
||||||
directory->url();
|
directory->url();
|
||||||
|
|
||||||
kDebug() << "DolphinView::dropUrls() - destination: " << destination.prettyUrl() << endl;
|
|
||||||
|
|
||||||
dropUrls(urls, destination);
|
dropUrls(urls, destination);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1034,7 +1035,9 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
|
||||||
|
|
||||||
void DolphinView::emitContentsMoved()
|
void DolphinView::emitContentsMoved()
|
||||||
{
|
{
|
||||||
emit contentsMoved(contentsX(), contentsY());
|
if (!m_blockContentsMovedSignal) {
|
||||||
|
emit contentsMoved(contentsX(), contentsY());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DolphinView::updateActivationState()
|
void DolphinView::updateActivationState()
|
||||||
|
|
|
@ -543,6 +543,7 @@ private:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_showProgress;
|
bool m_showProgress;
|
||||||
|
bool m_blockContentsMovedSignal;
|
||||||
Mode m_mode;
|
Mode m_mode;
|
||||||
|
|
||||||
int m_iconSize;
|
int m_iconSize;
|
||||||
|
|
Loading…
Reference in a new issue