Draw dragged items. Better conditions (more accurate to our behavior, hey ! we have...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 65ec4c9d305f7da815d676c798b5c5c5c56dca65..4964010c52357f1664b24c5939524ddaf41d602c 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -28,10 +28,10 @@
 #include <QTimer>
 #include <QScrollBar>
 
+#include <kcolorscheme.h>
 #include <kdirmodel.h>
 #include <kdirlister.h>
 #include <kfileitemdelegate.h>
-#include <kglobalsettings.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 #include <kio/netaccess.h>
@@ -57,13 +57,12 @@ DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
                          KDirLister* dirLister,
                          KDirModel* dirModel,
-                         DolphinSortFilterProxyModel* proxyModel,
-                         Mode mode) :
+                         DolphinSortFilterProxyModel* proxyModel) :
     QWidget(parent),
     m_active(true),
-    m_blockContentsMovedSignal(false),
+    m_loadingDirectory(false),
     m_initializeColumnView(false),
-    m_mode(mode),
+    m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),
     m_iconsView(0),
@@ -107,7 +106,7 @@ DolphinView::DolphinView(QWidget* parent,
     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 
-    createView();
+    applyViewProperties(url);
     m_topLayout->addWidget(itemView());
 }
 
@@ -133,7 +132,7 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
-    QColor color = KGlobalSettings::baseColor();
+    QColor color = KColorScheme(KColorScheme::View).background();
     if (active) {
         emit urlChanged(url());
         emit selectionChanged(selectedItems());
@@ -171,9 +170,8 @@ void DolphinView::setMode(Mode mode)
         // to go back to the root URL of the column view automatically.
         // Otherwise there it would not be possible to turn off the column view
         // without focusing the first column.
-        // TODO: reactivate again after DolphinView/DolphinViewController split works
-        //setUrl(m_dirLister->url());
-        //m_controller->setUrl(m_dirLister->url());
+        setUrl(m_dirLister->url());
+        m_controller->setUrl(m_dirLister->url());
     }
 
     ViewProperties props(url());
@@ -337,7 +335,7 @@ void DolphinView::setContentsPosition(int x, int y)
     view->horizontalScrollBar()->setValue(x);
     view->verticalScrollBar()->setValue(y);
 
-    m_blockContentsMovedSignal = false;
+    m_loadingDirectory = false;
 }
 
 QPoint DolphinView::contentsPosition() const
@@ -417,9 +415,24 @@ void DolphinView::reload()
 void DolphinView::refresh()
 {
     createView();
+    applyViewProperties(m_controller->url());
     reload();
 }
 
+void DolphinView::setUrl(const KUrl& url)
+{
+    if (m_controller->url() == url) {
+        return;
+    }
+
+    m_controller->setUrl(url);
+
+    applyViewProperties(url);
+
+    startDirLister(url);
+    emit urlChanged(url);
+}
+
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
@@ -541,7 +554,7 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
     }
 
     m_cutItemsCache.clear();
-    m_blockContentsMovedSignal = true;
+    m_loadingDirectory = true;
 
     m_dirLister->stop();
 
@@ -583,14 +596,8 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
     }
 }
 
-void DolphinView::setUrl(const KUrl& url)
+void DolphinView::applyViewProperties(const KUrl& url)
 {
-    if (m_controller->url() == url) {
-        return;
-    }
-
-    m_controller->setUrl(url);
-
     const ViewProperties props(url);
 
     const Mode mode = props.viewMode();
@@ -616,6 +623,11 @@ void DolphinView::setUrl(const KUrl& url)
             m_initializeColumnView = true;
         }
     }
+    if (itemView() == 0) {
+        createView();
+    }
+    Q_ASSERT(itemView() != 0);
+    Q_ASSERT(m_fileItemDelegate != 0);
 
     const bool showHiddenFiles = props.showHiddenFiles();
     if (showHiddenFiles != m_dirLister->showingDotFiles()) {
@@ -663,9 +675,6 @@ void DolphinView::setUrl(const KUrl& url)
         m_controller->setShowPreview(showPreview);
         emit showPreviewChanged();
     }
-
-    startDirLister(url);
-    emit urlChanged(url);
 }
 
 void DolphinView::changeSelection(const KFileItemList& selection)
@@ -754,7 +763,12 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::emitContentsMoved()
 {
-    if (!m_blockContentsMovedSignal) {
+    // only emit the contents moved signal if:
+    // - no directory loading is ongoing (this would reset the contents position
+    //   always to (0, 0))
+    // - if the Column View is active: the column view does an automatic
+    //   positioning during the loading operation, which must be remembered
+    if (!m_loadingDirectory || isColumnViewActive()) {
         const QPoint pos(contentsPosition());
         emit contentsMoved(pos.x(), pos.y());
     }