From fed8714de53d956890e483aba5a060150fd9a837 Mon Sep 17 00:00:00 2001 From: Méven Car Date: Sun, 22 Mar 2026 16:27:16 +0100 Subject: dolphintabpage: setRowMinimunHeight for navigator splitter In navigator in frame mode (as opposed to inToolbar). Once we set a colspan and rowStretch on the main widget (the splitter), we don't need to pass bogus rowspan/colspan values to addWidget. This prevents some warnings. `QGridLayout: Multi-cell fromRow greater than toRow` --- src/dolphintabpage.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index f4922bf70..7187162a4 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -38,8 +38,8 @@ DolphinTabPage::DolphinTabPage(const QUrl &primaryUrl, const QUrl &secondaryUrl, m_splitter = new DolphinTabPageSplitter(Qt::Horizontal, this); m_splitter->setChildrenCollapsible(false); connect(m_splitter, &QSplitter::splitterMoved, this, &DolphinTabPage::splitterMoved); - layout->addWidget(m_splitter, 1, 0); - layout->setRowStretch(1, 1); + layout->addWidget(m_splitter, 2, 0, 1, 2); + layout->setRowStretch(2, 1); // Create a new primary view m_primaryViewContainer = createViewContainer(primaryUrl); @@ -265,6 +265,8 @@ void DolphinTabPage::insertNavigatorsWidget(DolphinNavigatorsWidgetAction *navig // We set a row minimum height, so the height does not visibly change whenever // navigatorsWidget is inserted which happens every time the current tab is changed. gridLayout->setRowMinimumHeight(0, navigatorsWidget->primaryUrlNavigator()->height()); + gridLayout->setRowMinimumHeight(1, 1); + gridLayout->addWidget(navigatorsWidget->requestWidget(this), 0, 0); if (!m_navigatorSeparator) { m_navigatorSeparator = std::make_unique(this); @@ -272,7 +274,7 @@ void DolphinTabPage::insertNavigatorsWidget(DolphinNavigatorsWidgetAction *navig m_navigatorSeparator->setFrameStyle(QFrame::HLine); m_navigatorSeparator->setFixedHeight(1); m_navigatorSeparator->setContentsMargins(0, 0, 0, 0); - gridLayout->addWidget(m_navigatorSeparator.get(), 1, 0, 0, -1); + gridLayout->addWidget(m_navigatorSeparator.get(), 1, 0); } } -- cgit v1.3