Fix?

jklymak · jklymak · commit 9c407395e51f · 2021-07-01T08:27:12.000-07:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -576,6 +576,9 @@ def _reposition_colorbar(cbax, renderer, *, offset=None):
     cbax.set_transform(fig.transSubfigure)
     cbax._set_position(pbcb)
     cbax.set_anchor(anchor)
+    if location in ['bottom', 'top']:
+        aspect = 1 / aspect
+    print('CL', aspect, location)
     cbax.set_box_aspect(aspect)
     cbax.set_aspect('auto')
     return offset
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -231,7 +231,7 @@ def draw(self, renderer):
 
 class _ColorbarAxesLocator:
     """
-    Shrink the axes if there are vertical extends.
+    Shrink the axes if there are extend triangles or rectangles.
     """
     def __init__(self, cbar):
         self._cbar = cbar
@@ -267,7 +267,7 @@ def __call__(self, ax, renderer):
             pos = pos.shrunk(1, shrink).translated(0, offset * pos.height)
         else:
             if aspect:
-                self._cbar.set_aspect(1 / (aspect / shrink))
+                self._cbar.set_aspect((aspect / shrink))
             pos = pos.shrunk(shrink, 1).translated(offset * pos.width, 0)
         return pos
 
@@ -621,7 +621,7 @@ def _do_extends(self, extendlen):
             # rectangle:
             xyout = np.array([[0, 0], [0, bot], [1, bot], [1, 0],
                               [1, 1], [1, top], [0, top], [0, 1],
-                              [0, bot]])
+                              [0, 0]])
 
         if self.orientation == 'horizontal':
             xyout = xyout[:, ::-1]
@@ -915,7 +915,7 @@ def set_alpha(self, alpha):
         """Set the transparency between 0 (transparent) and 1 (opaque)."""
         self.alpha = alpha
 
-    def set_scale(self, scale,  **kwargs):
+    def set_scale(self, scale, **kwargs):
         """
         Set the colorbar long axis scale.
 
@@ -1090,7 +1090,6 @@ def _mesh(self):
                 (self.__scale == 'manual')):
             # if a norm doesn't have a named scale, or we are not using a norm:
             dv = self.vmax - self.vmin
-            # x = x * dv + self.vmin
             y = y * dv + self.vmin
         else:
             y = norm.inverse(y)
@@ -1318,7 +1317,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
 
     anchor = kw.pop('anchor', loc_settings['anchor'])
     panchor = kw.pop('panchor', loc_settings['panchor'])
-
+    aspect0 = aspect
     # turn parents into a list if it is not already. We do this w/ np
     # because `plt.subplots` can return an ndarray and is natural to
     # pass to `colorbar`.
@@ -1376,7 +1375,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
         anchor=anchor,
         panchor=panchor,
         fraction=fraction,
-        aspect=aspect,
+        aspect=aspect0,
         pad=pad)
     # and we need to set the aspect ratio by hand...
     cax.set_anchor(anchor)
@@ -1435,7 +1434,7 @@ def make_axes_gridspec(parent, *, location=None, orientation=None,
     panchor = kw.pop('panchor', loc_settings['panchor'])
     pad = kw.pop('pad', loc_settings["pad"])
     wh_space = 2 * pad / (1 - pad)
-
+    aspect0 = aspect
     if location in ('left', 'right'):
         # for shrinking
         height_ratios = [
@@ -1492,7 +1491,7 @@ def make_axes_gridspec(parent, *, location=None, orientation=None,
         anchor=anchor,
         panchor=panchor,
         fraction=fraction,
-        aspect=aspect,
+        aspect=aspect0,
         pad=pad)
     return cax, kw
 
