Make subplot_adjust work and remove work

jklymak · jklymak · commit eb879a94936f · 2021-06-22T09:18:04.000-07:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -260,9 +260,15 @@ def __init__(self, parent, userax=True):
         self.outer_ax.tick_params = self.inner_ax.tick_params
         self.outer_ax.set_xticks = self.inner_ax.set_xticks
         self.outer_ax.set_yticks = self.inner_ax.set_yticks
-        for attr in ["get_position", "set_position", "set_aspect"]:
+        for attr in ["get_position", "set_aspect", 
+                     "_remove_method", "_set_position",
+                     "set_position"]:
             setattr(self, attr, getattr(self.outer_ax, attr))
         self._colorbar_info = None  # used for mpl-created axes
+        if hasattr(self.outer_ax, "get_subplotspec"):
+            attr = "get_subplotspec"
+            setattr(self, attr, getattr(self.outer_ax, attr))
+
         if userax:
             self._colorbar_info = 'user'
             # point the parent's methods all at this axes...
@@ -279,6 +285,7 @@ def draw(self, renderer):
         self.outer_ax.draw(renderer)
 
 
+
 class _ColorbarSpine(mspines.Spine):
     def __init__(self, axes):
         self._ax = axes
@@ -954,12 +961,11 @@ def set_alpha(self, alpha):
     def remove(self):
         """
         Remove this colorbar from the figure.
-
+        
         If the colorbar was created with ``use_gridspec=True`` the previous
         gridspec is restored.
         """
-        self.ax.inner_ax.remove()
-        self.ax.outer_ax.remove()
+        self.ax.remove()
 
         self.mappable.callbacksSM.disconnect(self.mappable.colorbar_cid)
         self.mappable.colorbar = None
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1200,7 +1200,7 @@ def subplots_adjust(self, left=None, bottom=None, right=None, top=None,
                 "disabling constrained_layout.")
         self.subplotpars.update(left, bottom, right, top, wspace, hspace)
         for ax in self.axes:
-            if isinstance(ax, SubplotBase):
+            if hasattr(ax, 'get_subplotspec'):
                 ax._set_position(ax.get_subplotspec().get_position(self))
         self.stale = True
 
