Forward-port: Restore keyboard-focus when changing the view-mode

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index b02f794b313992cf2d837625ea2867e914664d74..29f62f735d845ff80fb8bed841e408d613694883 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -211,6 +211,7 @@ void DolphinView::setMode(Mode mode)
     // be restored after reloading the directory
     m_selectedItems = selectedItems();
 
+    const bool hasFocus = m_viewAccessor.itemView()->hasFocus();
     deleteView();
 
     const KUrl viewPropsUrl = rootUrl();
@@ -218,6 +219,10 @@ void DolphinView::setMode(Mode mode)
     props.setViewMode(m_mode);
     createView();
 
+    if (hasFocus) {
+        m_viewAccessor.itemView()->setFocus();
+    }
+
     // the file item delegate has been recreated, apply the current
     // additional information manually
     const KFileItemDelegate::InformationList infoList = props.additionalInfo();