From d891aff7fa42823dd6672a9ced65d7d154e51541 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 29 Mar 2010 17:01:53 +0200
Subject: [PATCH] Remove use of tool bars because of funny resize behavior.
Also fixes a problem on Mac Cocoa with not being able to use the close
editor button.
Reviewed-by: Lasse Holmstedt
---
src/plugins/coreplugin/editortoolbar.cpp | 8 ++------
src/plugins/coreplugin/editortoolbar.h | 2 --
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index f01dbffe72e..7cbe350b370 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -75,7 +75,6 @@ namespace Core {
EditorToolBar::EditorToolBar(QWidget *parent) :
Utils::StyledBar(parent),
m_editorList(new QComboBox(this)),
- m_rightToolBar(new QToolBar(this)),
m_closeButton(new QToolButton),
m_lockButton(new QToolButton),
@@ -124,10 +123,6 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
m_forwardButton= new QToolButton(this);
m_forwardButton->setDefaultAction(m_goForwardAction);
- m_rightToolBar->setLayoutDirection(Qt::RightToLeft);
- m_rightToolBar->addWidget(m_closeButton);
- m_rightToolBar->addWidget(m_lockButton);
-
QHBoxLayout *toplayout = new QHBoxLayout(this);
toplayout->setSpacing(0);
toplayout->setMargin(0);
@@ -135,7 +130,8 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
toplayout->addWidget(m_forwardButton);
toplayout->addWidget(m_editorList);
toplayout->addWidget(m_toolBarPlaceholder, 1); // Custom toolbar stretches
- toplayout->addWidget(m_rightToolBar);
+ toplayout->addWidget(m_lockButton);
+ toplayout->addWidget(m_closeButton);
setLayout(toplayout);
diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h
index 227a210fe2a..7713be7743c 100644
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/src/plugins/coreplugin/editortoolbar.h
@@ -111,8 +111,6 @@ private:
IEditor *currentEditor() const;
Core::OpenEditorsModel *m_editorsListModel;
QComboBox *m_editorList;
- QToolBar *m_centerToolBar;
- QToolBar *m_rightToolBar;
QToolButton *m_closeButton;
QToolButton *m_lockButton;
QAction *m_goBackAction;
--
GitLab