add modality

impact27 · impact27 · commit 7991829f19d5 · 2021-02-23T10:01:15.000+01:00
diff --git a/doc/api/next_api_changes/behavior/18966-QP.rst b/doc/api/next_api_changes/behavior/18966-QP.rst
@@ -0,0 +1,7 @@
+   Modality of _formlayout
+   ~~~~~~~~~~~~~~~~~~~~~~~
+   The `fedit` function and the `FormDialog` class in the private 
+   `matplotlib\backends\qt_editor\_formlayout`
+   gains a new option: `modal`. The current behaviour (modal window) is the default.
+   If modal is set to false, the dialog is shown without returning anything.
+   This allows e.g. using the figures with the options open.
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -781,7 +781,7 @@ def configure_subplots(self):
         image = str(cbook._get_data_path('images/matplotlib.png'))
         dia = SubplotToolQt(self.canvas.figure, self.canvas.parent())
         dia.setWindowIcon(QtGui.QIcon(image))
-        dia.exec_()
+        dia.show()
 
     def save_figure(self, *args):
         filetypes = self.canvas.get_supported_filetypes_grouped()
@@ -870,7 +870,7 @@ def _export_values(self):
             QtGui.QFontMetrics(text.document().defaultFont())
             .size(0, text.toPlainText()).height() + 20)
         text.setMaximumSize(size)
-        dialog.exec_()
+        dialog.show()
 
     def _on_value_changed(self):
         self._figure.subplots_adjust(**{attr: self._widgets[attr].value()
diff --git a/lib/matplotlib/backends/qt_editor/_formlayout.py b/lib/matplotlib/backends/qt_editor/_formlayout.py
@@ -413,10 +413,11 @@ def get(self):
 class FormDialog(QtWidgets.QDialog):
     """Form Dialog"""
     def __init__(self, data, title="", comment="",
-                 icon=None, parent=None, apply=None):
+                 icon=None, parent=None, apply=None, modal=True):
         super().__init__(parent)
 
         self.apply_callback = apply
+        self.modal = modal
 
         # Form
         if isinstance(data[0][0], (list, tuple)):
@@ -469,6 +470,8 @@ def update_buttons(self):
                 btn.setEnabled(valid)
 
     def accept(self):
+        if not self.modal:
+            self.apply_callback(self.formwidget.get())
         self.data = self.formwidget.get()
         super().accept()
 
@@ -484,7 +487,8 @@ def get(self):
         return self.data
 
 
-def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
+def fedit(data, title="", comment="", icon=None, parent=None, apply=None,
+          modal=True):
     """
     Create form dialog and return result
     (if Cancel button is pressed, return None)
@@ -495,6 +499,7 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
     icon: QIcon instance
     parent: parent QWidget
     apply: apply callback (function)
+    modal: modality of dialog
 
     datalist: list/tuple of (field_name, field_value)
     datagroup: list/tuple of (datalist *or* datagroup, title, comment)
@@ -511,13 +516,19 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
       - list/tuple:
           * the first element will be the selected index (or value)
           * the other elements can be couples (key, value) or only values
+
+    If modal is True, the application will block until the result is selected.
+    If modal is false, the dialog will be shown and the function returns None.
     """
 
     # Create a QApplication instance if no instance currently exists
     # (e.g., if the module is used directly from the interpreter)
     if QtWidgets.QApplication.startingUp():
         _app = QtWidgets.QApplication([])
-    dialog = FormDialog(data, title, comment, icon, parent, apply)
+    dialog = FormDialog(data, title, comment, icon, parent, apply, modal)
+    if not modal:
+        dialog.show()
+        return
     if dialog.exec_():
         return dialog.get()
 
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -251,10 +251,8 @@ def apply_callback(data):
         if not (axes.get_xlim() == orig_xlim and axes.get_ylim() == orig_ylim):
             figure.canvas.toolbar.push_current()
 
-    data = _formlayout.fedit(
+    _formlayout.fedit(
         datalist, title="Figure options", parent=parent,
         icon=QtGui.QIcon(
             str(cbook._get_data_path('images', 'qt4_editor_options.svg'))),
-        apply=apply_callback)
-    if data is not None:
-        apply_callback(data)
+        apply=apply_callback, modal=False)
