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

CppEditor: Select also non-root items in the combo box

Browse Source 
Temporarily setting setRootModelIndex allows us to do so.
This commit is contained in:
Kai Koehne
2010-07-13 11:44:05 +02:00
parent 97444004ec
commit 0659559a62
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1115,16 +1115,20 @@ void CPPEditor::updateOutlineIndexNow()
m_updateOutlineIndexTimer->stop(); m_updateOutlineIndexTimer->stop();
m_outlineModelIndex = QModelIndex(); //invalidate m_outlineModelIndex = QModelIndex(); //invalidate
// ComboBox only let's you select top level indexes!
QModelIndex comboIndex = outlineModelIndex(); QModelIndex comboIndex = outlineModelIndex();
while (comboIndex.parent().isValid())
comboIndex = comboIndex.parent();
if (comboIndex.isValid()) { if (comboIndex.isValid()) {
bool blocked = m_outlineCombo->blockSignals(true); bool blocked = m_outlineCombo->blockSignals(true);
// There is no direct way to select a non-root item
m_outlineCombo->setRootModelIndex(m_proxyModel->mapFromSource(comboIndex.parent()));
m_outlineCombo->setCurrentIndex(m_proxyModel->mapFromSource(comboIndex).row()); m_outlineCombo->setCurrentIndex(m_proxyModel->mapFromSource(comboIndex).row());
m_outlineCombo->setRootModelIndex(QModelIndex());
updateOutlineToolTip(); updateOutlineToolTip();
(void) m_outlineCombo->blockSignals(blocked);
m_outlineCombo->blockSignals(blocked);
} }
} }