fixed some activation issues in combination with split views

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index c05c4251c7a555796d9fe5a3680c7558030abac3..f70c5bb4565d93b1e27232c249557675c97fbfbb 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -90,6 +90,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(activate()));
 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
@@ -133,6 +135,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(openContextMenu(KFileItem*, const KUrl&)));
     connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_view, SIGNAL(contentsMoved(int, int)),
+            this, SLOT(saveContentsPos(int, int)));
     connect(m_view, SIGNAL(requestItemInfo(const KUrl&)),
             this, SLOT(showItemInfo(const KUrl&)));
     connect(m_view, SIGNAL(errorMessage(const QString&)),
@@ -329,7 +333,7 @@ void DolphinViewContainer::updateItemCount()
 
     updateStatusBar();
 
-    QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
+    QTimer::singleShot(100, this, SLOT(restoreContentsPos()));
 }
 
 void DolphinViewContainer::showItemInfo(const KUrl& url)
@@ -472,4 +476,22 @@ void DolphinViewContainer::openContextMenu(KFileItem* item,
     contextMenu.open();
 }
 
+void DolphinViewContainer::saveContentsPos(int x, int y)
+{
+    m_urlNavigator->savePosition(x, y);
+}
+
+void DolphinViewContainer::restoreContentsPos()
+{
+    if (!url().isEmpty()) {
+        const QPoint pos = m_urlNavigator->savedPosition();
+        m_view->setContentsPosition(pos.x(), pos.y());
+    }
+}
+
+void DolphinViewContainer::activate()
+{
+    setActive(true);
+}
+
 #include "dolphinviewcontainer.moc"