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

OverViewComboBox: Move creation of TreeView into ctor

Browse Source 
So that the class is more self-contained.

Change-Id: Ib6f3e5811d4d7d8647a797f451ec1ff8cc003b74
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-04-24 13:21:26 +02:00
parent 502acf0723
commit 42075c1224
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -118,7 +118,13 @@ class OverviewCombo : public QComboBox
public: public:
OverviewCombo(QWidget *parent = 0) OverviewCombo(QWidget *parent = 0)
: QComboBox(parent), m_skipNextHide(false) : QComboBox(parent), m_skipNextHide(false)
{} {
OverviewTreeView *outlineView = new OverviewTreeView;
outlineView->setHeaderHidden(true);
outlineView->setItemsExpandable(true);
setView(outlineView);
outlineView->viewport()->installEventFilter(this);
}
bool eventFilter(QObject* object, QEvent* event) bool eventFilter(QObject* object, QEvent* event)
{ {
@@ -596,13 +602,7 @@ void CPPEditorWidget::createToolBar(CPPEditor *editor)
QSizePolicy policy = m_outlineCombo->sizePolicy(); QSizePolicy policy = m_outlineCombo->sizePolicy();
policy.setHorizontalPolicy(QSizePolicy::Expanding); policy.setHorizontalPolicy(QSizePolicy::Expanding);
m_outlineCombo->setSizePolicy(policy); m_outlineCombo->setSizePolicy(policy);
QTreeView *outlineView = new OverviewTreeView;
outlineView->header()->hide();
outlineView->setItemsExpandable(true);
m_outlineCombo->setView(outlineView);
m_outlineCombo->setMaxVisibleItems(40); m_outlineCombo->setMaxVisibleItems(40);
outlineView->viewport()->installEventFilter(m_outlineCombo);
m_outlineModel = new OverviewModel(this); m_outlineModel = new OverviewModel(this);
m_proxyModel = new OverviewProxyModel(m_outlineModel, this); m_proxyModel = new OverviewProxyModel(m_outlineModel, this);