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

Debugger: Fix memory view as an editor

Browse Source 
`EditorManager::activateEditor` assumes that the editor is already known
to the editor manager.

Add a dedicated `EditorManager::addEditor` method for making an IEditor
instance known to the editor manager and activating it (if wanted).

Change-Id: I0c1632b6a3b32f54a01da0ad632fa17e2b1a850f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2024-08-07 14:55:31 +02:00
parent 98589279cd
commit 305e335550
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -2319,8 +2319,9 @@ public:
auto document = std::make_shared<BinEditorDocument>(); auto document = std::make_shared<BinEditorDocument>();
auto service = new BinEditorImpl(document); auto service = new BinEditorImpl(document);
service->widget()->setWindowTitle(title); service->widget()->setWindowTitle(title);
service->document()->setPreferredDisplayName(title);
if (wantsEditor) if (wantsEditor)
EditorManager::activateEditor(service); EditorManager::addEditor(service);
return service; return service;
} }
}; };

13
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1420,6 +1420,8 @@ IEditor *EditorManagerPrivate::placeEditor(EditorView *view, IEditor *editor)
if (IEditor *e = view->editorForDocument(editor->document())) if (IEditor *e = view->editorForDocument(editor->document()))
return e; return e;
QTC_CHECK(DocumentModel::editorsForDocument(editor->document()).contains(editor));
const QByteArray state = editor->saveState(); const QByteArray state = editor->saveState();
if (EditorView *sourceView = viewForEditor(editor)) { if (EditorView *sourceView = viewForEditor(editor)) {
// try duplication or pull editor over to new view // try duplication or pull editor over to new view
@@ -3151,6 +3153,17 @@ IEditor *EditorManager::activateEditorForDocument(IDocument *document, OpenEdito
flags); flags);
} }
/*!
Makes an IEditor instance \a editor known to the EditorManager that it did
not know before, and activates it using \a flags.
*/
void EditorManager::addEditor(IEditor *editor, OpenEditorFlags flags)
{
QTC_ASSERT(!DocumentModel::editorsForDocument(editor->document()).contains(editor), return);
d->addEditor(editor);
activateEditor(editor, flags);
}
/*! /*!
Opens the document specified by \a filePath using the editor type \a Opens the document specified by \a filePath using the editor type \a
editorId and the specified \a flags. editorId and the specified \a flags.

2
src/plugins/coreplugin/editormanager/editormanager.h
View File

@@ -99,6 +99,8 @@ public:
static void activateEditorForEntry(DocumentModel::Entry *entry, OpenEditorFlags flags = NoFlags); static void activateEditorForEntry(DocumentModel::Entry *entry, OpenEditorFlags flags = NoFlags);
static IEditor *activateEditorForDocument(IDocument *document, OpenEditorFlags flags = NoFlags); static IEditor *activateEditorForDocument(IDocument *document, OpenEditorFlags flags = NoFlags);
static void addEditor(IEditor *editor, OpenEditorFlags flags = NoFlags);
static bool closeDocuments(const QList<IDocument *> &documents, bool askAboutModifiedEditors = true); static bool closeDocuments(const QList<IDocument *> &documents, bool askAboutModifiedEditors = true);
static bool closeDocuments(const QList<DocumentModel::Entry *> &entries); static bool closeDocuments(const QList<DocumentModel::Entry *> &entries);
static void closeOtherDocuments(IDocument *document); static void closeOtherDocuments(IDocument *document);