OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor and rename QIconProvider -> IconProvider (#5893)

Browse Source 
* Refactor and rename QIconProvider -> IconProvider
* Generate icons on demand as unique_ptrs
This commit is contained in:
Gaute Lindkvist
2020-05-09 11:25:11 +02:00
committed by GitHub
parent b84e868564
commit 2e79cf614f
42 changed files with 383 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
View File

@@ -211,7 +211,11 @@ void PdmUiComboBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
{
for (const auto& option : options)
{
m_comboBox->addItem(option.icon(), option.optionUiText());
auto icon = option.icon();
if (icon)
m_comboBox->addItem(*icon, option.optionUiText());
else
m_comboBox->addItem(option.optionUiText());
m_comboBox->setIconSize(m_attributes.iconSize);
}
m_comboBox->setCurrentIndex(uiField()->uiValue().toInt());