Merge pull request #28629 from rcomer/axis-in_layout

timhoffm · web-flow · commit 121282ff8cf8 · 2024-07-30T21:36:15.000+02:00
FIX: `Axis.set_in_layout` respected
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1362,7 +1362,7 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
         collapsed to near zero.  This allows tight/constrained_layout to ignore
         too-long labels when doing their layout.
         """
-        if not self.get_visible():
+        if not self.get_visible() or for_layout_only and not self.get_in_layout():
             return
         if renderer is None:
             renderer = self.figure._get_renderer()
diff --git a/lib/matplotlib/tests/test_axis.py b/lib/matplotlib/tests/test_axis.py
@@ -8,3 +8,24 @@ def test_tick_labelcolor_array():
     # Smoke test that we can instantiate a Tick with labelcolor as array.
     ax = plt.axes()
     XTick(ax, 0, labelcolor=np.array([1, 0, 0, 1]))
+
+
+def test_axis_not_in_layout():
+    fig1, (ax1_left, ax1_right) = plt.subplots(ncols=2, layout='constrained')
+    fig2, (ax2_left, ax2_right) = plt.subplots(ncols=2, layout='constrained')
+
+    # 100 label overlapping the end of the axis
+    ax1_left.set_xlim([0, 100])
+    # 100 label not overlapping the end of the axis
+    ax2_left.set_xlim([0, 120])
+
+    for ax in ax1_left, ax2_left:
+        ax.set_xticks([0, 100])
+        ax.xaxis.set_in_layout(False)
+
+    for fig in fig1, fig2:
+        fig.draw_without_rendering()
+
+    # Positions should not be affected by overlapping 100 label
+    assert ax1_left.get_position().bounds == ax2_left.get_position().bounds
+    assert ax1_right.get_position().bounds == ax2_right.get_position().bounds
