Include figure-level texts and legends in constrained layout

Arnav-xD · Arnav-xD · commit 92132ec57d5e · 2026-03-30T20:51:38.000+05:30
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
@@ -440,20 +440,20 @@ def make_layout_margins(layoutgrids, fig, renderer, *, w_pad=0, h_pad=0,
 
     # make margins for figure-level legends:
     for leg in fig.legends:
-        # === NEW: handle figure-level texts ===
+    # === NEW: handle figure-level texts ===
         inv_trans_fig = fig.transFigure.inverted().transform_bbox
 
-        for text in fig.texts:
-            if not text.get_visible() or not text.get_in_layout():
-                continue
+for text in fig.texts:
+    if not text.get_visible() or not text.get_in_layout():
+        continue
 
-        try:
-            bbox = inv_trans_fig(text.get_tightbbox(renderer))
-        except Exception:
-            continue
+    try:
+        bbox = inv_trans_fig(text.get_tightbbox(renderer))
+    except Exception:
+        continue
 
-        if bbox is None:
-            continue
+    if bbox is None:
+        continue
 
     w = bbox.width + 2 * w_pad
     h = bbox.height + 2 * h_pad
@@ -494,7 +494,6 @@ def make_layout_margins(layoutgrids, fig, renderer, *, w_pad=0, h_pad=0,
     if bbox.x1 > 1:
         layoutgrids[fig].edit_margin_min('right', w)
 
-
 def make_margin_suptitles(layoutgrids, fig, renderer, *, w_pad=0, h_pad=0):
     # Figure out how large the suptitle is and make the
     # top level figure margin larger.
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -14,19 +14,30 @@
 pytestmark = [
     pytest.mark.usefixtures('text_placeholders')
 ]
-def test_constrainedlayout_fig_text():
+def test_constrainedlayout_fig_text_included():
     import matplotlib.pyplot as plt
 
     fig, ax = plt.subplots(layout="constrained")
-    fig.text(0.5, 0.98, "Title", ha="center")
+    fig.text(0.5, 0.98, "Figure Title", ha="center")
 
     fig.draw_without_rendering()
 
+    # Ensure no overlap: text should be above axes
     ax_bbox = ax.get_position()
-
-    # Axes should not touch the top
     assert ax_bbox.y1 < 0.98
 
+def test_constrainedlayout_fig_legend_included():
+    import matplotlib.pyplot as plt
+
+    fig, ax = plt.subplots(layout="constrained")
+    ax.plot([1, 2, 3], label="line")
+    fig.legend(loc="upper center")
+
+    fig.draw_without_rendering()
+
+    ax_bbox = ax.get_position()
+    assert ax_bbox.y1 < 1.0  # leaves space for legend
+    
 def example_plot(ax, fontsize=12, nodec=False):
     ax.plot([1, 2])
     ax.locator_params(nbins=3)
