Merge pull request matplotlib#28300 from rcomer/empty-titles

timhoffm · web-flow · commit 9a9fce57bafd · 2024-05-28T22:23:18.000+02:00
Faster title alignment
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2985,6 +2985,10 @@ def _update_title_position(self, renderer):
 
         titles = (self.title, self._left_title, self._right_title)
 
+        if not any(title.get_text() for title in titles):
+            # If the titles are all empty, there is no need to update their positions.
+            return
+
         # Need to check all our twins too, aligned axes, and all the children
         # as well.
         axs = set()
@@ -2996,21 +3000,24 @@ def _update_title_position(self, renderer):
             locator = ax.get_axes_locator()
             ax.apply_aspect(locator(self, renderer) if locator else None)
 
+        top = -np.inf
+        for ax in axs:
+            bb = None
+            xticklabel_top = any(tick.label2.get_visible() for tick in
+                                 [ax.xaxis.majorTicks[0], ax.xaxis.minorTicks[0]])
+            if (xticklabel_top or ax.xaxis.get_label_position() == 'top'):
+                bb = ax.xaxis.get_tightbbox(renderer)
+            if bb is None:
+                # Extent of the outline for colorbars, of the axes otherwise.
+                bb = ax.spines.get("outline", ax).get_window_extent()
+            top = max(top, bb.ymax)
+
         for title in titles:
             x, _ = title.get_position()
             # need to start again in case of window resizing
             title.set_position((x, 1.0))
-            top = -np.inf
-            for ax in axs:
-                bb = None
-                if (ax.xaxis.get_ticks_position() in ['top', 'unknown']
-                        or ax.xaxis.get_label_position() == 'top'):
-                    bb = ax.xaxis.get_tightbbox(renderer)
-                if bb is None:
-                    # Extent of the outline for colorbars, of the axes otherwise.
-                    bb = ax.spines.get("outline", ax).get_window_extent()
-                top = max(top, bb.ymax)
-                if title.get_text():
+            if title.get_text():
+                for ax in axs:
                     ax.yaxis.get_tightbbox(renderer)  # update offsetText
                     if ax.yaxis.offsetText.get_text():
                         bb = ax.yaxis.offsetText.get_tightbbox(renderer)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -7118,6 +7118,18 @@ def test_title_no_move_off_page():
     assert tt.get_position()[1] == 1.0
 
 
+def test_title_inset_ax():
+    # Title should be above any child axes
+    mpl.rcParams['axes.titley'] = None
+    fig, ax = plt.subplots()
+    ax.set_title('Title')
+    fig.draw_without_rendering()
+    assert ax.title.get_position()[1] == 1
+    ax.inset_axes([0, 1, 1, 0.1])
+    fig.draw_without_rendering()
+    assert ax.title.get_position()[1] == 1.1
+
+
 def test_offset_label_color():
     # Tests issue 6440
     fig, ax = plt.subplots()
