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

Allow expanding items in the overview combobox.

Browse Source 
This makes navigation through large files much easier.

Change-Id: Ie55f75078a1727949db6e8824af4795deb96292e
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Francois Ferrand
2012-06-15 14:43:12 +02:00
committed by Leandro Melo
parent c4da217c3e
commit 42a885fc54
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,14 +160,36 @@ public:
class OverviewCombo : public QComboBox class OverviewCombo : public QComboBox
{ {
public: public:
OverviewCombo(QWidget *parent = 0) : QComboBox(parent) OverviewCombo(QWidget *parent = 0) : QComboBox(parent), m_skipNextHide(false)
{} {}
bool eventFilter(QObject* object, QEvent* event)
{
if (event->type() == QEvent::MouseButtonPress && object == view()->viewport()) {
QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
QModelIndex index = view()->indexAt(mouseEvent->pos());
if (!view()->visualRect(index).contains(mouseEvent->pos()))
m_skipNextHide = true;
}
return false;
}
void showPopup() void showPopup()
{ {
static_cast<OverviewTreeView *>(view())->adjustWidth(); static_cast<OverviewTreeView *>(view())->adjustWidth();
QComboBox::showPopup(); QComboBox::showPopup();
} }
virtual void hidePopup()
{
if (m_skipNextHide)
m_skipNextHide = false;
else
QComboBox::hidePopup();
}
private:
bool m_skipNextHide;
}; };
class OverviewProxyModel : public QSortFilterProxyModel class OverviewProxyModel : public QSortFilterProxyModel
@@ -504,9 +526,10 @@ void CPPEditorWidget::createToolBar(CPPEditor *editor)
QTreeView *outlineView = new OverviewTreeView; QTreeView *outlineView = new OverviewTreeView;
outlineView->header()->hide(); outlineView->header()->hide();
outlineView->setItemsExpandable(false); outlineView->setItemsExpandable(true);
m_outlineCombo->setView(outlineView); 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);