From d65532fc59988d2a3d03fe438d79e01bfad74159 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 31 Mar 2022 22:51:35 +0200 Subject: [PATCH] Backport PR #22743: Fix configure_subplots with tool manager --- lib/matplotlib/backends/_backend_gtk.py | 3 +-- lib/matplotlib/backends/backend_qt.py | 7 +++++-- lib/matplotlib/backends/backend_wx.py | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/backends/_backend_gtk.py b/lib/matplotlib/backends/_backend_gtk.py index 2b095c3bc7a9..443ae3766cef 100644 --- a/lib/matplotlib/backends/_backend_gtk.py +++ b/lib/matplotlib/backends/_backend_gtk.py @@ -156,8 +156,7 @@ def _get_canvas(self, fig): return self.canvas.__class__(fig) def trigger(self, *args): - _NavigationToolbar2GTK.configure_subplots( - self._make_classic_style_pseudo_toolbar(), None) + _NavigationToolbar2GTK.configure_subplots(self, None) class _BackendGTK(_Backend): diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py index e1158c49a86c..4190dbda4e54 100644 --- a/lib/matplotlib/backends/backend_qt.py +++ b/lib/matplotlib/backends/backend_qt.py @@ -995,9 +995,12 @@ def set_message(self, s): class ConfigureSubplotsQt(backend_tools.ConfigureSubplotsBase): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self._subplot_dialog = None + def trigger(self, *args): - NavigationToolbar2QT.configure_subplots( - self._make_classic_style_pseudo_toolbar()) + NavigationToolbar2QT.configure_subplots(self) class SaveFigureQt(backend_tools.SaveFigureBase): diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py index 1be3f6ae741c..9939f9403640 100644 --- a/lib/matplotlib/backends/backend_wx.py +++ b/lib/matplotlib/backends/backend_wx.py @@ -1294,8 +1294,7 @@ def set_message(self, s): class ConfigureSubplotsWx(backend_tools.ConfigureSubplotsBase): def trigger(self, *args): - NavigationToolbar2Wx.configure_subplots( - self._make_classic_style_pseudo_toolbar()) + NavigationToolbar2Wx.configure_subplots(self) class SaveFigureWx(backend_tools.SaveFigureBase):