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

Editors: Move editor close button next to editor combo box

Browse Source 
To make it clearer that it does not close splits.

Change-Id: I64fa2583ab2b8d25d47a63e08f919b7f3d01649e
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Eike Ziller
2014-07-07 19:05:39 +02:00
parent 20d945aeb2
commit b4248baff0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
d->m_closeEditorButton->setAutoRaise(true); d->m_closeEditorButton->setAutoRaise(true);
d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT))); d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT)));
d->m_closeEditorButton->setEnabled(false); d->m_closeEditorButton->setEnabled(false);
d->m_closeEditorButton->setProperty("showborder", true);
d->m_toolBarPlaceholder->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); d->m_toolBarPlaceholder->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -164,10 +165,10 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
toplayout->addWidget(d->m_forwardButton); toplayout->addWidget(d->m_forwardButton);
toplayout->addWidget(d->m_lockButton); toplayout->addWidget(d->m_lockButton);
toplayout->addWidget(d->m_editorList); toplayout->addWidget(d->m_editorList);
toplayout->addWidget(d->m_closeEditorButton);
toplayout->addWidget(d->m_toolBarPlaceholder, 1); // Custom toolbar stretches toplayout->addWidget(d->m_toolBarPlaceholder, 1); // Custom toolbar stretches
toplayout->addWidget(d->m_splitButton); toplayout->addWidget(d->m_splitButton);
toplayout->addWidget(d->m_closeSplitButton); toplayout->addWidget(d->m_closeSplitButton);
toplayout->addWidget(d->m_closeEditorButton);
setLayout(toplayout); setLayout(toplayout);