Merge pull request #15618 from meeseeksmachine/auto-backport-of-pr-15613-on-v3.2.x

timhoffm · web-flow · commit 54655a3145a3 · 2019-11-07T06:52:22.000Z
Backport PR #15613 on branch v3.2.x (Revert "Don't bother with manually resizing the Qt main window.")
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -572,6 +572,16 @@ def __init__(self, canvas, num):
                 statusbar_label = QtWidgets.QLabel()
                 self.window.statusBar().addWidget(statusbar_label)
                 self.toolbar.message.connect(statusbar_label.setText)
+            tbs_height = self.toolbar.sizeHint().height()
+        else:
+            tbs_height = 0
+
+        # resize the main window so it will display the canvas with the
+        # requested size:
+        cs = canvas.sizeHint()
+        sbs = self.window.statusBar().sizeHint()
+        height = cs.height() + tbs_height + sbs.height()
+        self.window.resize(cs.width(), height)
 
         self.window.setCentralWidget(self.canvas)
 
