set settings window to non modal

impact27 · impact27 · commit 3e42261e6a5c · 2021-06-11T14:01:03.000+02:00
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -778,7 +778,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()
@@ -867,7 +867,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
@@ -470,6 +470,7 @@ def update_buttons(self):
 
     def accept(self):
         self.data = self.formwidget.get()
+        self.apply_callback(self.data)
         super().accept()
 
     def reject(self):
@@ -518,8 +519,7 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
     if QtWidgets.QApplication.startingUp():
         _app = QtWidgets.QApplication([])
     dialog = FormDialog(data, title, comment, icon, parent, apply)
-    if dialog.exec_():
-        return dialog.get()
+    dialog.show()
 
 
 if __name__ == "__main__":
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)
