Really hide actions menu from forms when empty

because actions() does something else
nyalldawson · Feb 19, 2020 · bcf0e48 · bcf0e48
1 parent dbf999b
commit bcf0e48
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/gui/qgsactionmenu.cpp b/src/gui/qgsactionmenu.cpp
@@ -205,3 +205,8 @@ QgsExpressionContextScope QgsActionMenu::expressionContextScope() const
 {
   return mExpressionContextScope;
 }
+
+QList<QgsAction> QgsActionMenu::menuActions()
+{
+  return mActions;
+}
diff --git a/src/gui/qgsactionmenu.h b/src/gui/qgsactionmenu.h
@@ -112,6 +112,13 @@ class GUI_EXPORT QgsActionMenu : public QMenu
      */
     QgsExpressionContextScope expressionContextScope() const;
 
+    /**
+     * Returns menu actions
+     *
+     * \since QGIS 3.12
+     */
+    QList<QgsAction> menuActions();
+
   signals:
     void reinit();
 

diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -122,7 +122,7 @@ void QgsAttributeDialog::init( QgsVectorLayer *layer, QgsFeature *feature, const
   connect( layer, &QObject::destroyed, this, &QWidget::close );
 
   mMenu = new QgsActionMenu( layer, mAttributeForm->feature(), QStringLiteral( "Feature" ), this );
-  if ( !mMenu->actions().isEmpty() )
+  if ( !mMenu->menuActions().isEmpty() )
   {
     QMenuBar *menuBar = new QMenuBar( this );
     menuBar->addMenu( mMenu );