X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/dc6bd8046f35993cae0f3659fd2420e18d0fe472..75480d07cd820c75ca418b990d3059f154bbdf6e:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 9e454ea71..1300d9937 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -47,7 +47,6 @@ #include #include -#include "dolphindropcontroller.h" #include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" @@ -58,6 +57,7 @@ #include "dolphiniconsview.h" #include "dolphinsettings.h" #include "dolphin_generalsettings.h" +#include "draganddrophelper.h" #include "folderexpander.h" #include "renamedialog.h" #include "tooltipmanager.h" @@ -439,6 +439,7 @@ void DolphinView::reload() void DolphinView::refresh() { const bool oldActivationState = m_active; + const int oldZoomLevel = m_controller->zoomLevel(); m_active = true; createView(); @@ -446,6 +447,7 @@ void DolphinView::refresh() reload(); setActive(oldActivationState); + updateZoomLevel(oldZoomLevel); } void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl) @@ -871,7 +873,7 @@ void DolphinView::dropUrls(const KFileItem& destItem, const KUrl& destPath, QDropEvent* event) { - DolphinDropController::dropUrls(destItem, destPath, event, this); + DragAndDropHelper::dropUrls(destItem, destPath, event, this); } void DolphinView::updateSorting(DolphinView::Sorting sorting)