OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

#4106 Stop trying to do recursive setting tab order widget

Browse Source 
* The double pointer was handled wrongly and shift-tab order isn't working anyway.
This commit is contained in:
Gaute Lindkvist committed 2019-02-20 09:33:05 +01:00
1 parent 08c3c4cb0d
commit 66e57890dc
2 files changed
+11 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp
+9 -10
View File
@@ -76,11 +76,12 @@ caf::PdmUiFormLayoutObjectEditor::~PdmUiFormLayoutObjectEditor()
void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn( void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(
const PdmUiOrdering& uiOrdering, const PdmUiOrdering& uiOrdering,
QWidget* containerWidgetWithGridLayout, QWidget* containerWidgetWithGridLayout,
const QString& uiConfigName, const QString& uiConfigName)
QWidget** previousTabOrderWidget)
{ {
CAF_ASSERT(containerWidgetWithGridLayout); CAF_ASSERT(containerWidgetWithGridLayout);
QWidget* previousTabOrderWidget = nullptr;
// Currently, only QGridLayout is supported // Currently, only QGridLayout is supported
QGridLayout* parentLayout = dynamic_cast<QGridLayout*>(containerWidgetWithGridLayout->layout()); QGridLayout* parentLayout = dynamic_cast<QGridLayout*>(containerWidgetWithGridLayout->layout());
CAF_ASSERT(parentLayout); CAF_ASSERT(parentLayout);
@@ -128,7 +129,7 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
{ {
recursivelyAddGroupToGridLayout(currentItem, containerWidgetWithGridLayout, recursivelyAddGroupToGridLayout(currentItem, containerWidgetWithGridLayout,
uiConfigName, parentLayout, currentRowIndex, uiConfigName, parentLayout, currentRowIndex,
currentColumn, itemColumnSpan, previousTabOrderWidget); currentColumn, itemColumnSpan);
currentColumn += itemColumnSpan; currentColumn += itemColumnSpan;
} }
else else
@@ -215,12 +216,11 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
currentColumn += fieldColumnSpan; currentColumn += fieldColumnSpan;
} }
if (previousTabOrderWidget && *previousTabOrderWidget) if (previousTabOrderWidget)
{ {
QWidget::setTabOrder(*previousTabOrderWidget, fieldEditorWidget); QWidget::setTabOrder(previousTabOrderWidget, fieldEditorWidget);
} }
previousTabOrderWidget = fieldEditorWidget;
//previousTabOrderWidget = &fieldEditorWidget;
} }
fieldEditor->updateUi(uiConfigName); fieldEditor->updateUi(uiConfigName);
} }
@@ -240,8 +240,7 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyAddGroupToGridLayout(PdmUiItem
QGridLayout* parentLayout, QGridLayout* parentLayout,
int currentRowIndex, int currentRowIndex,
int currentColumn, int currentColumn,
int itemColumnSpan, int itemColumnSpan)
QWidget** previousTabOrderWidget)
{ {
PdmUiGroup* group = static_cast<PdmUiGroup*>(currentItem); PdmUiGroup* group = static_cast<PdmUiGroup*>(currentItem);
@@ -250,7 +249,7 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyAddGroupToGridLayout(PdmUiItem
/// Insert the group box at the correct position of the parent layout /// Insert the group box at the correct position of the parent layout
parentLayout->addWidget(groupBox, currentRowIndex, currentColumn, 1, itemColumnSpan); parentLayout->addWidget(groupBox, currentRowIndex, currentColumn, 1, itemColumnSpan);
recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(*group, groupBox->contentFrame(), uiConfigName, previousTabOrderWidget); recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(*group, groupBox->contentFrame(), uiConfigName);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h
+2 -3
View File
@@ -74,7 +74,7 @@ protected:
void recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(const PdmUiOrdering& uiOrdering, void recursivelyConfigureAndUpdateUiOrderingInGridLayoutColumn(const PdmUiOrdering& uiOrdering,
QWidget* containerWidgetWithGridLayout, QWidget* containerWidgetWithGridLayout,
const QString& uiConfigName, QWidget** previousTabOrderWidget = nullptr); const QString& uiConfigName);
void recursivelyAddGroupToGridLayout(PdmUiItem* currentItem, void recursivelyAddGroupToGridLayout(PdmUiItem* currentItem,
QWidget* containerWidget, QWidget* containerWidget,
@@ -82,8 +82,7 @@ protected:
QGridLayout* parentLayout, QGridLayout* parentLayout,
int currentRowIndex, int currentRowIndex,
int currentColumn, int currentColumn,
int itemColumnSpan, int itemColumnSpan);
QWidget** previousTabOrderWidget);
QMinimizePanel* findOrCreateGroupBox(QWidget* parent, PdmUiGroup* group, const QString& uiConfigName); QMinimizePanel* findOrCreateGroupBox(QWidget* parent, PdmUiGroup* group, const QString& uiConfigName);
PdmUiFieldEditorHandle* findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName); PdmUiFieldEditorHandle* findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName);