BUG:222186

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e1cc13095648e7526276355b6f3b469614861c25..0523085ae7a46d8c6ae39a025e199ebc8fc59ab5 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -397,15 +397,19 @@ void DolphinMainWindow::openNewTab()
 
 void DolphinMainWindow::openNewTab(const KUrl& url)
 {
-    const KIcon icon = KIcon(KMimeType::iconNameForUrl(m_activeViewContainer->url()));
+    QWidget* focusWidget = QApplication::focusWidget();
+
     if (m_viewTab.count() == 1) {
         // Only one view is open currently and hence no tab is shown at
         // all. Before creating a tab for 'url', provide a tab for the current URL.
-        m_tabBar->addTab(icon, squeezedText(tabName(m_activeViewContainer->url())));
+        const KUrl currentUrl = m_activeViewContainer->url();
+        m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(currentUrl)),
+                         squeezedText(tabName(currentUrl)));
         m_tabBar->blockSignals(false);
     }
 
-    m_tabBar->addTab(icon, squeezedText(tabName(url)));
+    m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(url)),
+                     squeezedText(tabName(url)));
 
     ViewTab viewTab;
     viewTab.splitter = new QSplitter(this);
@@ -427,6 +431,12 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
         m_viewTab[tabIndex].secondaryView->setActive(true);
         m_viewTab[tabIndex].isPrimaryViewActive = false;
     }
+
+    if (focusWidget != 0) {
+        // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened
+        // in background, assure that the previous focused widget gets the focus back.
+        focusWidget->setFocus();
+    }
 }
 
 void DolphinMainWindow::activateNextTab()
@@ -485,6 +495,14 @@ void DolphinMainWindow::toggleActiveView()
     setActiveViewContainer(m_activeViewContainer == right ? left : right);
 }
 
+void DolphinMainWindow::showEvent(QShowEvent* event)
+{
+    KXmlGuiWindow::showEvent(event);
+    if (!event->spontaneous()) {
+        m_activeViewContainer->view()->setFocus();
+    }
+}
+
 void DolphinMainWindow::closeEvent(QCloseEvent* event)
 {
     DolphinSettings& settings = DolphinSettings::instance();