Fix DD form label hidden in tabs

Fixes #43103
qgis · May 30, 2021 · 7a9c6b4 · 7a9c6b4
1 parent bbb74b8
commit 7a9c6b4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -2132,7 +2132,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
           }
         }
 
-        if ( widgetInfo.labelText.isNull() )
+        if ( widgetInfo.labelText.isNull() || ! widgetInfo.showLabel )
         {
           gbLayout->addWidget( widgetInfo.widget, row, column, 1, 2 );
           column += 2;
@@ -2198,6 +2198,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
 
       newWidgetInfo.labelText = QString();
       newWidgetInfo.labelOnTop = true;
+      newWidgetInfo.showLabel = widgetDef->showLabel();
       break;
     }
 
@@ -2241,8 +2242,6 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
       break;
   }
 
-  newWidgetInfo.showLabel = widgetDef->showLabel();
-
   return newWidgetInfo;
 }