when activating the columns inside a column view, the current view properties must...

svn path=/trunk/KDE/kdebase/apps/; revision=693930

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 876e037f5d8330258b1dcd1f309076f09a0cf11a..0799ae8b90201267cc15789fb23305333a23b0af 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -424,15 +424,21 @@ void DolphinView::refresh()
 void DolphinView::setUrl(const KUrl& url)
 {
     if (m_controller->url() == url) {
-        return;
-    }
-
-    m_controller->setUrl(url);
+        // Although the view URL is equal to the controller URL,
+        // the view properties must be applied to the view.
+        // This assures a consistent state of the currently activated
+        // column and their view properties.
+        if (isColumnViewActive()) {
+            applyViewProperties(url);
+        }
+    } else {
+        m_controller->setUrl(url);
 
-    applyViewProperties(url);
+        applyViewProperties(url);
 
-    startDirLister(url);
-    emit urlChanged(url);
+        startDirLister(url);
+        emit urlChanged(url);
+    }
 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)