[processing] Fix model designer sometimes opens behind other windows

qgis · Feb 4, 2022 · 08d10a3 · 08d10a3
1 parent 3d5bf07
commit 08d10a3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/python/gui/auto_generated/processing/models/qgsmodeldesignerdialog.sip.in b/python/gui/auto_generated/processing/models/qgsmodeldesignerdialog.sip.in
@@ -65,6 +65,15 @@ Loads a model into the designer from the specified file ``path``.
     void setModelScene( QgsModelGraphicsScene *scene /Transfer/ );
 %Docstring
 Sets the related ``scene``.
+%End
+
+  public slots:
+
+    void activate();
+%Docstring
+Raise, unminimize and activate this window.
+
+.. versionadded:: 3.24
 %End
 
   protected:

diff --git a/python/plugins/processing/modeler/EditModelAction.py b/python/plugins/processing/modeler/EditModelAction.py
@@ -43,6 +43,7 @@ def execute(self):
         dlg = ModelerDialog.create(alg)
         dlg.update_model.connect(self.updateModel)
         dlg.show()
+        dlg.activate()
 
     def updateModel(self):
         QgsApplication.processingRegistry().providerById('model').refreshAlgorithms()
diff --git a/python/plugins/processing/modeler/OpenModelFromFileAction.py b/python/plugins/processing/modeler/OpenModelFromFileAction.py
@@ -55,3 +55,4 @@ def execute(self):
             dlg = ModelerDialog.create()
             dlg.loadModel(filename)
             dlg.show()
+            dlg.activate()
diff --git a/src/gui/processing/models/qgsmodeldesignerdialog.cpp b/src/gui/processing/models/qgsmodeldesignerdialog.cpp
@@ -507,6 +507,14 @@ void QgsModelDesignerDialog::setModelScene( QgsModelGraphicsScene *scene )
     oldScene->deleteLater();
 }
 
+void QgsModelDesignerDialog::activate()
+{
+  show();
+  raise();
+  setWindowState( windowState() & ~Qt::WindowMinimized );
+  activateWindow();
+}
+
 void QgsModelDesignerDialog::updateVariablesGui()
 {
   mBlockUndoCommands++;

diff --git a/src/gui/processing/models/qgsmodeldesignerdialog.h b/src/gui/processing/models/qgsmodeldesignerdialog.h
@@ -94,6 +94,15 @@ class GUI_EXPORT QgsModelDesignerDialog : public QMainWindow, public Ui::QgsMode
      */
     void setModelScene( QgsModelGraphicsScene *scene SIP_TRANSFER );
 
+  public slots:
+
+    /**
+     * Raise, unminimize and activate this window.
+     *
+     * \since QGIS 3.24
+     */
+    void activate();
+
   protected:
 
     // cppcheck-suppress pureVirtualCall