Commit d891aff7 authored by con's avatar con
Browse files

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
parent 663b1667
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment