From 7df84881251f60d2bd501eab3f2d1413e9823b21 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 28 Feb 2011 22:04:00 +0100 Subject: Fix issue that wrong directory is shown Commit 680009b522b2c9eda03201ac02dc18994b5a8bd0 resulted in a regression when switching from a view in the column-mode to a view in the icon- or details-mode: The wrong content has been shown. This patch reverts commit 680009b522b2c9eda03201ac02dc18994b5a8bd0 and solves the performance-issue in combination with previews by triggering the preview-generation in a queued way. --- src/views/dolphinview.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index db917ee5a..4ab16e052 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -434,12 +434,8 @@ void DolphinView::refresh() m_active = true; createView(); - reload(); - - // For performance reasons applying the view properties should be done after updating - // the directory-lister URL with reload(). Otherwise in combination with enabled - // previews the creation of already obsolete directory items gets triggered. applyViewProperties(); + reload(); setActive(oldActivationState); updateZoomLevel(oldZoomLevel); @@ -548,6 +544,7 @@ void DolphinView::setUrl(const KUrl& url) m_viewModeController->setUrl(url); // emits urlChanged, which we forward m_viewAccessor.prepareUrlChange(url); + applyViewProperties(); // When changing the URL there is no need to keep the version // data of the previous URL. @@ -557,11 +554,6 @@ void DolphinView::setUrl(const KUrl& url) connectViewAccessor(); loadDirectory(url); - // For performance reasons applying the view properties should be done after updating - // the directory-lister URL with loadDirectory(). Otherwise in combination with enabled - // previews the creation of already obsolete directory items gets triggered. - applyViewProperties(); - if (hadSelection || hasSelection()) { emitSelectionChangedSignal(); } -- cgit v1.3