feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Add toolbar widgets only after a valid toolbar action

Browse Source 
We can't just add widgets after the first action of the toolbar.
The first action might not have a widget and will assert for that reason
in Qt.

Change-Id: Ib69c7d6d91bd56f25023aaebf961fef15cdcf008
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-01-29 10:02:51 +01:00
parent 18514a5585
commit 59318b2789
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/texteditor/texteditor.cpp
View File

@@ -7801,10 +7801,16 @@ QAction * TextEditorWidget::insertExtraToolBarWidget(TextEditorWidget::Side side
d->m_stretchWidget = nullptr;
}
if (side == Right)
if (side == Left) {
QAction *before = Utils::findOr(d->m_toolBar->actions(),
d->m_fileEncodingLabelAction,
[this](QAction *action) {
return d->m_toolBar->widgetForAction(action) != nullptr;
});
return d->m_toolBar->insertWidget(before, widget);
} else {
return d->m_toolBar->insertWidget(d->m_fileEncodingLabelAction, widget);
else
return d->m_toolBar->insertWidget(d->m_toolBar->actions().constFirst(), widget);
}
}
void TextEditorWidget::keepAutoCompletionHighlight(bool keepHighlight)