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

Editor: ensure that the outline is the left most toolbar widget

Browse Source 
Fixes: QTCREATORBUG-28765
Change-Id: Ifc43ed64ab4906af2d669ff372d8b66d59203048
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2023-03-29 14:48:34 +02:00
parent 2d7fe61e7c
commit 7046890bcc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8144,11 +8144,14 @@ QAction * TextEditorWidget::insertExtraToolBarWidget(TextEditorWidget::Side side
d->m_stretchAction->setVisible(false); d->m_stretchAction->setVisible(false);
if (side == Left) { if (side == Left) {
auto findLeftMostAction = [this](QAction *action) {
if (d->m_toolbarOutlineAction && action == d->m_toolbarOutlineAction)
return false;
return d->m_toolBar->widgetForAction(action) != nullptr;
};
QAction *before = Utils::findOr(d->m_toolBar->actions(), QAction *before = Utils::findOr(d->m_toolBar->actions(),
d->m_fileEncodingLabelAction, d->m_fileEncodingLabelAction,
[this](QAction *action) { findLeftMostAction);
return d->m_toolBar->widgetForAction(action) != nullptr;
});
return d->m_toolBar->insertWidget(before, widget); return d->m_toolBar->insertWidget(before, widget);
} else { } else {
return d->m_toolBar->insertWidget(d->m_fileEncodingLabelAction, widget); return d->m_toolBar->insertWidget(d->m_fileEncodingLabelAction, widget);
@@ -8171,7 +8174,7 @@ void TextEditorWidget::setToolbarOutline(QWidget *widget)
if (widget->sizePolicy().horizontalPolicy() & QSizePolicy::ExpandFlag) if (widget->sizePolicy().horizontalPolicy() & QSizePolicy::ExpandFlag)
d->m_stretchAction->setVisible(false); d->m_stretchAction->setVisible(false);
d->m_toolbarOutlineAction = d->m_toolBar->insertWidget(d->m_stretchAction, widget); d->m_toolbarOutlineAction = insertExtraToolBarWidget(Left, widget);
} else { } else {
// check for a widget with an expanding size policy otherwise re-enable the stretcher // check for a widget with an expanding size policy otherwise re-enable the stretcher
for (auto action : d->m_toolBar->actions()) { for (auto action : d->m_toolBar->actions()) {