Fix set_size_inches on HiDPI screens

QuLogic · QuLogic · commit 38691d7aee86 · 2021-09-29T17:39:13.000-04:00
This passes physical pixels to the backend, as it will be more accurate due to the int-cast. Fixes #21090
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1760,7 +1760,7 @@ def blit(self, bbox=None):
         """Blit the canvas in bbox (default entire canvas)."""
 
     def resize(self, w, h):
-        """Set the canvas size in pixels."""
+        """Set the canvas size in (physical) pixels."""
 
     def draw_event(self, renderer):
         """Pass a `DrawEvent` to all functions connected to ``draw_event``."""
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -421,6 +421,8 @@ def set_window_title(self, title):
 
     def resize(self, width, height):
         """Set the canvas size in pixels."""
+        width = int(width / self.canvas.device_pixel_ratio)
+        height = int(height / self.canvas.device_pixel_ratio)
         if self.toolbar:
             toolbar_size = self.toolbar.size_request()
             height += toolbar_size.height
diff --git a/lib/matplotlib/backends/backend_gtk4.py b/lib/matplotlib/backends/backend_gtk4.py
@@ -372,6 +372,8 @@ def set_window_title(self, title):
 
     def resize(self, width, height):
         """Set the canvas size in pixels."""
+        width = int(width / self.canvas.device_pixel_ratio)
+        height = int(height / self.canvas.device_pixel_ratio)
         if self.toolbar:
             min_size, nat_size = self.toolbar.get_preferred_size()
             height += nat_size.height
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -587,12 +587,14 @@ def _get_toolbar(self, canvas, parent):
         return toolbar
 
     def resize(self, width, height):
-        # these are Qt methods so they return sizes in 'virtual' pixels
-        # so we do not need to worry about dpi scaling here.
+        # The Qt methods return sizes in 'virtual' pixels so we do need to
+        # rescale from physical to logical pixels.
+        width = int(width / self.canvas.device_pixel_ratio)
+        height = int(height / self.canvas.device_pixel_ratio)
         extra_width = self.window.width() - self.canvas.width()
         extra_height = self.window.height() - self.canvas.height()
-        self.canvas.resize(width, height)
-        self.window.resize(width + extra_width, height + extra_height)
+        self.canvas.resize(round(width), round(height))
+        self.window.resize(round(width + extra_width), round(height + extra_height))
 
     def show(self):
         self.window.show()
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2657,10 +2657,9 @@ def set_size_inches(self, w, h=None, forward=True):
         if forward:
             canvas = getattr(self, 'canvas')
             if canvas is not None:
-                dpi_ratio = getattr(canvas, '_dpi_ratio', 1)
                 manager = getattr(canvas, 'manager', None)
                 if manager is not None:
-                    manager.resize(*(size * self.dpi / dpi_ratio).astype(int))
+                    manager.resize(*(size * self.dpi).astype(int))
         self.stale = True
 
     def get_size_inches(self):
