Selection and current item fixes

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 455905f6a6a07cb0c4cac132727b4f6d0688d6e1..d839c61a3b73abae2e331d792f08bda57f35bd5d 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -831,7 +831,7 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->buttons(),
                          event->modifiers());
 
-    DragAndDropHelper::dropUrls(destItem, url(), &dropEvent, this);
+    DragAndDropHelper::dropUrls(destItem, url(), &dropEvent);
 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
@@ -1126,9 +1126,23 @@ void DolphinView::applyViewProperties()
     m_container->beginTransaction();
 
     const ViewProperties props(url());
+    KFileItemModel* model = fileItemModel();
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
+        // Prevent an animated transition of the position and size of the items when switching
+        // the view-mode by temporary clearing the model and updating it again after the view mode
+        // has been modified.
+        const bool restoreModel = (model->count() > 0);
+        if (restoreModel) {
+            const int currentItemIndex = m_container->controller()->selectionManager()->currentItem();
+            if (currentItemIndex >= 0) {
+                m_currentItemUrl = model->fileItem(currentItemIndex).url();
+            }
+            m_selectedUrls = selectedItems().urlList();
+            model->clear();
+        }
+
         const Mode previousMode = m_mode;
         m_mode = mode;
 
@@ -1149,6 +1163,10 @@ void DolphinView::applyViewProperties()
         if (m_container->zoomLevel() != oldZoomLevel) {
             emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
         }
+
+        if (restoreModel) {
+            loadDirectory(url());
+        }
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();
@@ -1158,8 +1176,6 @@ void DolphinView::applyViewProperties()
         emit hiddenFilesShownChanged(hiddenFilesShown);
     }
 
-    KFileItemModel* model = fileItemModel();
-
     const bool groupedSorting = props.groupedSorting();
     if (groupedSorting != model->groupedSorting()) {
         model->setGroupedSorting(groupedSorting);