Merge pull request matplotlib#15045 from dstansby/qt5-fig-size

timhoffm · web-flow · commit 8df7fe1c68b1 · 2019-08-26T20:57:47.000+02:00
Resize canvas when changing figure size
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -622,7 +622,8 @@ def resize(self, width, height):
         # so we do not need to worry about dpi scaling here.
         extra_width = self.window.width() - self.canvas.width()
         extra_height = self.window.height() - self.canvas.height()
-        self.window.resize(width+extra_width, height+extra_height)
+        self.canvas.resize(width, height)
+        self.window.resize(width + extra_width, height + extra_height)
 
     def show(self):
         self.window.show()
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
@@ -4,6 +4,7 @@
 
 import matplotlib
 from matplotlib import pyplot as plt
+from matplotlib import rcParams
 from matplotlib._pylab_helpers import Gcf
 
 import pytest
@@ -272,3 +273,23 @@ def test_figureoptions():
             "matplotlib.backends.qt_editor._formlayout.FormDialog.exec_",
             lambda self: None):
         fig.canvas.manager.toolbar.edit_parameters()
+
+
+@pytest.mark.backend('Qt5Agg')
+def test_double_resize():
+    # Check that resizing a figure twice keeps the same window size
+    fig, ax = plt.subplots()
+    fig.canvas.draw()
+    window = fig.canvas.manager.window
+
+    w, h = 3, 2
+    fig.set_size_inches(w, h)
+    assert fig.canvas.width() == w * rcParams['figure.dpi']
+    assert fig.canvas.height() == h * rcParams['figure.dpi']
+
+    old_width = window.width()
+    old_height = window.height()
+
+    fig.set_size_inches(w, h)
+    assert window.width() == old_width
+    assert window.height() == old_height
