Merge pull request #22003 from anntzer/cairoinitwh

QuLogic · web-flow · commit 6f2a1d52c70f · 2021-12-21T01:08:54.000-05:00
Initialize RendererCairo.{width,height} in constructor.
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -129,6 +129,8 @@ class RendererCairo(RendererBase):
     def __init__(self, dpi):
         self.dpi = dpi
         self.gc = GraphicsContextCairo(renderer=self)
+        self.width = None
+        self.height = None
         self.text_ctx = cairo.Context(
            cairo.ImageSurface(cairo.FORMAT_ARGB32, 1, 1))
         super().__init__()
diff --git a/lib/matplotlib/backends/backend_qtcairo.py b/lib/matplotlib/backends/backend_qtcairo.py
@@ -6,10 +6,6 @@
 
 
 class FigureCanvasQTCairo(FigureCanvasQT, FigureCanvasCairo):
-    def __init__(self, figure=None):
-        super().__init__(figure=figure)
-        self._renderer.set_width_height(-1, -1)  # Invalid values.
-
     def draw(self):
         if hasattr(self._renderer.gc, "ctx"):
             self._renderer.dpi = self.figure.dpi
