From ade4c33afc911f7ac9792c67d831c73b4aa6c3b1 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 30 Sep 2022 11:41:43 +0200 Subject: [PATCH] Core: Delay setting tab order a bit Must happen after the respective widgets have been attached to a parent widget. Amends 38f88f6310917809. Change-Id: Ib0841afb09cd12791422903c3bf38de2d0bd580c Reviewed-by: hjk --- src/plugins/coreplugin/find/findtoolbar.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index bd4f9e91f5e..d6cc32d53e2 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -120,15 +120,6 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind) m_advancedButton->setText(QCoreApplication::translate("Core::Internal::FindWidget", "Advanced...")); m_advancedButton->setToolButtonStyle(Qt::ToolButtonTextOnly); - QWidget::setTabOrder(m_findEdit, m_replaceEdit); - QWidget::setTabOrder(m_replaceEdit, m_findPreviousButton); - QWidget::setTabOrder(m_findPreviousButton, m_findNextButton); - QWidget::setTabOrder(m_findNextButton, m_replaceButton); - QWidget::setTabOrder(m_replaceButton, m_replaceNextButton); - QWidget::setTabOrder(m_replaceNextButton, m_replaceAllButton); - QWidget::setTabOrder(m_replaceAllButton, m_advancedButton); - QWidget::setTabOrder(m_advancedButton, m_close); - auto replaceButtonsLayout = new QHBoxLayout(m_replaceButtonsWidget); replaceButtonsLayout->setSpacing(3); replaceButtonsLayout->setContentsMargins(0, 0, 0, 0); @@ -168,6 +159,15 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind) setProperty("topBorder", true); setSingleRow(false); + QWidget::setTabOrder(m_findEdit, m_replaceEdit); + QWidget::setTabOrder(m_replaceEdit, m_findPreviousButton); + QWidget::setTabOrder(m_findPreviousButton, m_findNextButton); + QWidget::setTabOrder(m_findNextButton, m_replaceButton); + QWidget::setTabOrder(m_replaceButton, m_replaceNextButton); + QWidget::setTabOrder(m_replaceNextButton, m_replaceAllButton); + QWidget::setTabOrder(m_replaceAllButton, m_advancedButton); + QWidget::setTabOrder(m_advancedButton, m_close); + connect(m_findEdit, &Utils::FancyLineEdit::editingFinished, this, &FindToolBar::invokeResetIncrementalSearch); connect(m_findEdit, &Utils::FancyLineEdit::textChanged,