From 43da84eefc7d68ce86cda2d353216dbe7552fc2c Mon Sep 17 00:00:00 2001 From: Anthony Fieroni Date: Mon, 22 May 2017 20:35:29 +0300 Subject: Correct searchbox, split view transitions between tabs Differential Revision: https://phabricator.kde.org/D5864 BUG: 379135 BUG: 380032 FIXED-IN: 17.04.2 Signed-off-by: Anthony Fieroni --- src/dolphintabwidget.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/dolphintabwidget.cpp') diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index bcd4a49fd..94b7a0144 100644 --- a/src/dolphintabwidget.cpp +++ b/src/dolphintabwidget.cpp @@ -33,7 +33,7 @@ DolphinTabWidget::DolphinTabWidget(QWidget* parent) : QTabWidget(parent), m_placesSelectorVisible(true), - m_previousTab(-1) + m_previousTab(0) { connect(this, &DolphinTabWidget::tabCloseRequested, this, static_cast(&DolphinTabWidget::closeTab)); @@ -304,15 +304,15 @@ void DolphinTabWidget::tabUrlChanged(const QUrl& url) void DolphinTabWidget::currentTabChanged(int index) { - DolphinViewContainer* viewContainer = tabPageAt(index)->activeViewContainer(); - viewContainer->setActive(true); + // previous tab deactivation + if (DolphinTabPage* tabPage = tabPageAt(m_previousTab)) { + tabPage->setActive(false); + } + DolphinTabPage* tabPage = tabPageAt(index); + DolphinViewContainer* viewContainer = tabPage->activeViewContainer(); emit activeViewChanged(viewContainer); emit currentUrlChanged(viewContainer->url()); - viewContainer->view()->setFocus(); - - if (tabPageAt(m_previousTab)) { - tabPageAt(m_previousTab)->activeViewContainer()->setActive(false); - } + tabPage->setActive(true); m_previousTab = index; } -- cgit v1.3