Merge pull request #14817 from meeseeksmachine/auto-backport-of-pr-14697-on-v3.1.x

timhoffm · web-flow · commit 7190fe5e3eed · 2019-07-17T10:23:28.000+02:00
Backport PR #14697 on branch v3.1.x (Fix NavigationToolbar2QT height)
diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py
@@ -745,14 +745,14 @@ def buttons(self):
     def adj_window(self):
         return None
 
-    if is_pyqt5():
-        # For some reason, self.setMinimumHeight doesn't seem to carry over to
-        # the actual sizeHint, so override it instead in order to make the
-        # aesthetic adjustments noted above.
-        def sizeHint(self):
-            size = super().sizeHint()
+    def sizeHint(self):
+        size = super().sizeHint()
+        if is_pyqt5() and self.canvas._dpi_ratio > 1:
+            # For some reason, self.setMinimumHeight doesn't seem to carry over
+            # to the actual sizeHint, so override it instead in order to make
+            # the aesthetic adjustments noted above.
             size.setHeight(max(48, size.height()))
-            return size
+        return size
 
     def edit_parameters(self):
         axes = self.canvas.figure.get_axes()
