FIX: add autopos to suplabels

jklymak · jklymak · commit aef1db18acd7 · 2021-03-27T23:44:27.000-07:00
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -291,21 +291,21 @@ def _make_margin_suptitles(fig, renderer, *, w_pad=0, h_pad=0):
 
     if fig._suptitle is not None and fig._suptitle.get_in_layout():
         p = fig._suptitle.get_position()
-        if p == (0.5, 0.98):  # default position, so assume we can move
+        if fig._suptitle._autopos:  # default position, so assume we can move
             fig._suptitle.set_position((p[0], 1 - h_pad_local))
             bbox = inv_trans_fig(fig._suptitle.get_tightbbox(renderer))
             fig._layoutgrid.edit_margin_min('top', bbox.height + 2 * h_pad)
 
     if fig._supxlabel is not None and fig._supxlabel.get_in_layout():
         p = fig._supxlabel.get_position()
-        if p == (0.5, 0.01):
+        if fig._supxlabel._autopos:
             fig._supxlabel.set_position((p[0], h_pad_local))
             bbox = inv_trans_fig(fig._supxlabel.get_tightbbox(renderer))
             fig._layoutgrid.edit_margin_min('bottom', bbox.height + 2 * h_pad)
 
     if fig._supylabel is not None and fig._supxlabel.get_in_layout():
         p = fig._supylabel.get_position()
-        if p == (0.02, 0.5,):
+        if fig._supxlabel._autopos:
             fig._supylabel.set_position((w_pad_local, p[1]))
             bbox = inv_trans_fig(fig._supylabel.get_tightbbox(renderer))
             fig._layoutgrid.edit_margin_min('left', bbox.width + 2 * w_pad)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -372,8 +372,16 @@ def _suplabels(self, t, info, **kwargs):
         manual_position = ('x' in kwargs or 'y' in kwargs)
         suplab = getattr(self, info['name'])
 
-        x = kwargs.pop('x', info['x0'])
-        y = kwargs.pop('y', info['y0'])
+        x = kwargs.pop('x', None)
+        y = kwargs.pop('y', None)
+        if x is None and y is None:
+            autopos = True
+        else:
+            autopos = False
+        if x is None:
+            x = info['x0']
+        if y is None:
+            y = info['y0']
 
         if 'horizontalalignment' not in kwargs and 'ha' not in kwargs:
             kwargs['horizontalalignment'] = info['ha']
@@ -396,6 +404,7 @@ def _suplabels(self, t, info, **kwargs):
             sup.remove()
         else:
             suplab = sup
+        suplab._autopos = autopos
         setattr(self, info['name'], suplab)
         self.stale = True
         return suplab
