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

LanguageClient: outline combo box for editor toolbar

Browse Source 
Fixes: QTCREATORBUG-21916
Change-Id: Ia4e1711f0f5e67222e4f5274792820917f4114db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-01-27 14:52:46 +01:00
parent 972e5b1668
commit c032b302ad
3 changed files with 124 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/languageclient/languageclientutils.cpp
View File

@@ -28,6 +28,7 @@
#include "client.h"
#include "languageclient_global.h"
#include "languageclientmanager.h"
#include "languageclientoutline.h"
#include <coreplugin/editormanager/documentmodel.h>
#include <coreplugin/icore.h>
@@ -37,6 +38,7 @@
#include <texteditor/textdocument.h>
#include <texteditor/texteditor.h>
#include <utils/textutils.h>
#include <utils/treeviewcombobox.h>
#include <utils/utilsicons.h>
#include <QFile>
@@ -246,6 +248,27 @@ void updateEditorToolBar(Core::IEditor *editor)
actions.remove(widget);
});
}
static QMap<QWidget *, QPair<Client *, QAction *>> outlines;
if (outlines.contains(widget)) {
auto outline = outlines[widget];
if (outline.first != client
|| !LanguageClientOutlineWidgetFactory::clientSupportsDocumentSymbols(client,
document)) {
auto oldAction = outline.second;
widget->toolBar()->removeAction(oldAction);
delete oldAction;
outlines.remove(widget);
}
}
if (!outlines.contains(widget)) {
if (QWidget *comboBox = LanguageClientOutlineWidgetFactory::createComboBox(client, editor)) {
outlines[widget] = {client,
widget->insertExtraToolBarWidget(TextEditorWidget::Left, comboBox)};
}
}
}
const QIcon symbolIcon(int type)