Merge branch 'klickverbot-export-close-border' into develop

2015-05-18 23:08:18 -04:00 · 2015-05-18 23:08:18 -04:00 · b549b93ade
commit b549b93ade
parent be1ed10d9a e3fce3e7bb
2 changed files with 4 additions and 2 deletions
--- a/1
+++ b/1
@ -7,6 +7,7 @@ pyqtgraph-0.9.11  [unreleased]
    - DockArea:
        - Fixed adding Docks to DockArea after all Docks have been removed
        - Fixed DockArea save/restoreState when area is empty
+    - Properly remove select box when export dialog is closed using window decorations

  New Features:
    - Preliminary PyQt5 support
--- a/pyqtgraph/GraphicsScene/exportDialog.py
+++ b/pyqtgraph/GraphicsScene/exportDialog.py
@ -139,5 +139,6 @@ class ExportDialog(QtGui.QWidget):
        self.selectBox.setVisible(False)
        self.setVisible(False)

-
-    
+    def closeEvent(self, event):
+        self.close()
+        QtGui.QWidget.closeEvent(self, event)