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

#4090 Update fix for crash with no label editors

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-02-15 11:08:59 +01:00
parent 833a29c3c2
commit a6d29c6f96
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp
View File

@ -176,9 +176,9 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
labelAndFieldVerticalLayout, currentRowIndex, currentColumn, 1, itemColumnSpan, Qt::AlignTop);
labelAndFieldVerticalLayout->addWidget(fieldLabelWidget, 0, Qt::AlignTop);
labelAndFieldVerticalLayout->addWidget(fieldEditorWidget, 1, Qt::AlignTop);
// Apply margins determined by the editor type
fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins());
}
else
{
@ -198,10 +198,13 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
parentLayout->addWidget(fieldLabelWidget, currentRowIndex, currentColumn, 1, leftLabelColumnSpan, Qt::AlignTop);
currentColumn += leftLabelColumnSpan;
// Apply margins determined by the editor type
fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins());
}
}
if (fieldLabelWidget && labelPos != PdmUiItemInfo::TOP) // Already added if TOP
if (labelPos != PdmUiItemInfo::TOP) // Already added if TOP
{
fieldColumnSpan += spareColumnsToAssign;
@ -209,10 +212,6 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
fieldColumnSpan = std::max(1, fieldColumnSpan);
parentLayout->addWidget(fieldEditorWidget, currentRowIndex, currentColumn, 1, fieldColumnSpan, Qt::AlignTop);
// Apply margins determined by the editor type
fieldLabelWidget->setContentsMargins(fieldEditor->labelContentMargins());
currentColumn += fieldColumnSpan;
}
@ -221,10 +220,7 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
QWidget::setTabOrder(*previousTabOrderWidget, fieldEditorWidget);
}
if (fieldLabelWidget)
{
previousTabOrderWidget = &fieldLabelWidget;
}
previousTabOrderWidget = &fieldEditorWidget;
}
fieldEditor->updateUi(uiConfigName);
}