┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/dolphintabpage.cpp
diff options
context:
space:
mode:
authorFelix Ernst <[email protected]>2020-11-09 14:25:15 +0100
committerElvis Angelaccio <[email protected]>2020-11-09 23:49:07 +0100
commit63f4981fe01d88b2ef1b27e0577d7f5d4c8cc485 (patch)
treeb0ca2892e0e7a28728cb5505cd5d14c9435893ac /src/dolphintabpage.cpp
parent2d4d2ce9a14902ee5a2b236f8510596fc2f86b99 (diff)
Adress the third round of Angelaccio's review comments
Additionally remove some redundant code concerning UrlNavigator visuals.
Diffstat (limited to 'src/dolphintabpage.cpp')
-rw-r--r--src/dolphintabpage.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index d196508a8..7f945dce2 100644
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -159,11 +159,9 @@ void DolphinTabPage::connectNavigators(DolphinNavigatorsWidgetAction *navigators
{
m_navigatorsWidget = navigatorsWidget;
auto primaryNavigator = navigatorsWidget->primaryUrlNavigator();
- primaryNavigator->setActive(m_primaryViewActive);
m_primaryViewContainer->connectUrlNavigator(primaryNavigator);
if (m_splitViewEnabled) {
auto secondaryNavigator = navigatorsWidget->secondaryUrlNavigator();
- secondaryNavigator->setActive(!m_primaryViewActive);
m_secondaryViewContainer->connectUrlNavigator(secondaryNavigator);
}
resizeNavigators();
@@ -178,12 +176,13 @@ void DolphinTabPage::disconnectNavigators()
}
}
-bool DolphinTabPage::eventFilter(QObject */* watched */, QEvent *event)
+bool DolphinTabPage::eventFilter(QObject *watched, QEvent *event)
{
if (event->type() == QEvent::Resize && m_navigatorsWidget) {
resizeNavigators();
+ return false;
}
- return false;
+ return QWidget::eventFilter(watched, event);
}
void DolphinTabPage::resizeNavigators() const
@@ -292,11 +291,9 @@ void DolphinTabPage::restoreState(const QByteArray& state)
stream >> m_primaryViewActive;
if (m_primaryViewActive) {
m_primaryViewContainer->setActive(true);
- m_navigatorsWidget->primaryUrlNavigator()->setActive(true);
} else {
Q_ASSERT(m_splitViewEnabled);
m_secondaryViewContainer->setActive(true);
- m_navigatorsWidget->primaryUrlNavigator()->setActive(false);
}
QByteArray splitterState;