summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-07-07 19:05:39 +0200
committerEike Ziller <eike.ziller@digia.com>2014-07-11 08:16:06 +0200
commitb4248baff01a8e584b0beea90b3d286af2368efe (patch)
tree7edfbcc1681d2bc083e24f48f8b8ab9b185190ca
parent20d945aeb28d618dfb6278d27adbb5c06156beac (diff)
downloadqt-creator-b4248baff01a8e584b0beea90b3d286af2368efe.tar.gz
Editors: Move editor close button next to editor combo box
To make it clearer that it does not close splits. Change-Id: I64fa2583ab2b8d25d47a63e08f919b7f3d01649e Reviewed-by: David Schulz <david.schulz@digia.com>
-rw-r--r--src/plugins/coreplugin/editortoolbar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 9cc2dd82f5..1e52a89d3f 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -129,6 +129,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
d->m_closeEditorButton->setAutoRaise(true);
d->m_closeEditorButton->setIcon(QIcon(QLatin1String(Constants::ICON_CLOSE_DOCUMENT)));
d->m_closeEditorButton->setEnabled(false);
+ d->m_closeEditorButton->setProperty("showborder", true);
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_lockButton);
toplayout->addWidget(d->m_editorList);
+ toplayout->addWidget(d->m_closeEditorButton);
toplayout->addWidget(d->m_toolBarPlaceholder, 1); // Custom toolbar stretches
toplayout->addWidget(d->m_splitButton);
toplayout->addWidget(d->m_closeSplitButton);
- toplayout->addWidget(d->m_closeEditorButton);
setLayout(toplayout);