FIX: new approach

jklymak · jklymak · commit 32e67eff6d6b · 2020-03-21T18:16:42.000-07:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -171,9 +171,6 @@ def set_title(self, label, fontdict=None, loc=None, pad=None, **kwargs):
             default["color"] = titlecolor
         if pad is None:
             pad = rcParams['axes.titlepad']
-            self._autotitlepos = None
-        else:
-            self._autotitlepos = False
         self._set_title_offset_trans(float(pad))
         title.set_text(label)
         title.update(default)
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2602,16 +2602,9 @@ def _update_title_position(self, renderer):
                     bb = ax.get_window_extent(renderer)
                 if bb is not None:
                     top = max(top, bb.ymax)
-            if title.get_window_extent(renderer).ymin < top:
+            if top > 0:
                 _, y = self.transAxes.inverted().transform((0, top))
                 title.set_position((x, y))
-                # empirically, this doesn't always get the min to top,
-                # so we need to adjust again.
-                if title.get_window_extent(renderer).ymin < top:
-                    _, y = self.transAxes.inverted().transform(
-                        (0., 2 * top - title.get_window_extent(renderer).ymin))
-                    title.set_position((x, y))
-
         ymax = max(title.get_position()[1] for title in titles)
         for title in titles:
             # now line up all the titles at the highest baseline.
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5479,7 +5479,7 @@ def test_title_noauto_pad():
     assert ax.title.get_position()[1] == 1.0
     ax.set_title(f"Title 2")
     fig.canvas.draw()
-    assert ax.title.get_position()[1] > 1.04
+    assert ax.title.get_position()[1] == 1.0
 
 
 def test_offset_label_color():
