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

Fix for closing splitters when editors are opened before split

Browse Source 
Now, ctrl+w closes all editors, as does "X" button in the toolbar.

Reviewed-by: mae
This commit is contained in:
Lasse Holmstedt
2010-04-09 10:03:04 +02:00
parent 06549b72a1
commit 043164b431
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/editormanager/editorview.cpp
View File

@@ -165,9 +165,9 @@ EditorView::~EditorView()
void EditorView::closeView() void EditorView::closeView()
{ {
EditorManager *em = CoreImpl::instance()->editorManager(); EditorManager *em = CoreImpl::instance()->editorManager();
if (IEditor *editor = currentEditor()) { IEditor *editor = currentEditor();
em->closeDuplicate(editor); if (editor)
} em->closeEditor(editor);
} }
void EditorView::showEditorInfoBar(const QString &id, void EditorView::showEditorInfoBar(const QString &id,
const QString &infoText, const QString &infoText,
@@ -705,7 +705,9 @@ void SplitterOrView::split(Qt::Orientation orientation)
SplitterOrView *otherView = 0; SplitterOrView *otherView = 0;
if (e) { if (e) {
m_view->removeEditor(e); foreach(IEditor *editor, m_view->editors())
m_view->removeEditor(editor);
m_splitter->addWidget((view = new SplitterOrView(e))); m_splitter->addWidget((view = new SplitterOrView(e)));
if (e->duplicateSupported()) { if (e->duplicateSupported()) {
Core::IEditor *duplicate = em->duplicateEditor(e); Core::IEditor *duplicate = em->duplicateEditor(e);

1
src/plugins/coreplugin/editortoolbar.cpp
View File

@@ -177,7 +177,6 @@ void EditorToolBar::closeView()
if (m_isStandalone) { if (m_isStandalone) {
EditorManager *em = ICore::instance()->editorManager(); EditorManager *em = ICore::instance()->editorManager();
if (IEditor *editor = currentEditor()) { if (IEditor *editor = currentEditor()) {
//em->closeDuplicate(editor);
em->closeEditor(editor); em->closeEditor(editor);
} }
} }