matplotlib
diff --git a/‎lib/matplotlib/tests/baseline_images/test_figure/test_subfigure.png
682 Bytes b/‎lib/matplotlib/tests/baseline_images/test_figure/test_subfigure.png
682 Bytes
diff --git a/‎lib/matplotlib/tests/test_figure.py
Lines changed: 34 additions & 8 deletions b/‎lib/matplotlib/tests/test_figure.py
Lines changed: 34 additions & 8 deletions
@@ -813,7 +813,7 @@ def test_figure_clear(clear_meth):
     assert fig.axes == []
 
     # c) a figure multiple unnested axes
-    axes = [fig.add_subplot(2, 1, i+1) for i in range(2)]
+    axes = [fig.add_subplot(2, 1, i + 1) for i in range(2)]
     getattr(fig, clear_meth)()
     assert fig.axes == []
 
@@ -1287,15 +1287,21 @@ def test_subfigure():
 
     fig.suptitle('Figure suptitle', fontsize='xx-large')
 
+    # below tests for the draw zorder of subfigures.
+    leg = fig.legend(handles=[plt.Line2D([0], [0], label='Line{}'.format(i))
+                     for i in range(5)], loc='center')
+    sub[0].set_zorder(leg.get_zorder() - 1)
+    sub[1].set_zorder(leg.get_zorder() + 1)
+
 
 def test_subfigure_tightbbox():
     # test that we can get the tightbbox with a subfigure...
     fig = plt.figure(layout='constrained')
     sub = fig.subfigures(1, 2)
 
     np.testing.assert_allclose(
-            fig.get_tightbbox(fig.canvas.get_renderer()).width,
-            8.0)
+        fig.get_tightbbox(fig.canvas.get_renderer()).width,
+        8.0)
 
 
 def test_subfigure_dpi():
@@ -1386,11 +1392,11 @@ def test_subfigure_spanning():
 
     w = 640
     h = 480
-    np.testing.assert_allclose(sub_figs[0].bbox.min, [0., h * 2/3])
+    np.testing.assert_allclose(sub_figs[0].bbox.min, [0., h * 2 / 3])
     np.testing.assert_allclose(sub_figs[0].bbox.max, [w / 3, h])
 
     np.testing.assert_allclose(sub_figs[1].bbox.min, [w / 3, h / 3])
-    np.testing.assert_allclose(sub_figs[1].bbox.max, [w * 2/3, h])
+    np.testing.assert_allclose(sub_figs[1].bbox.max, [w * 2 / 3, h])
 
     np.testing.assert_allclose(sub_figs[2].bbox.min, [w / 3, 0])
     np.testing.assert_allclose(sub_figs[2].bbox.max, [w, h / 3])
@@ -1431,7 +1437,7 @@ def test_subfigure_ticks():
 
 
 @image_comparison(['test_subfigure_scatter_size.png'], style='mpl20',
-                   remove_text=True)
+                  remove_text=True)
 def test_subfigure_scatter_size():
     # markers in the left- and right-most subplots should be the same
     fig = plt.figure()
@@ -1458,7 +1464,7 @@ def test_subfigure_pdf():
 
 
 def test_subfigures_wspace_hspace():
-    sub_figs = plt.figure().subfigures(2, 3, hspace=0.5, wspace=1/6.)
+    sub_figs = plt.figure().subfigures(2, 3, hspace=0.5, wspace=1 / 6.)
 
     w = 640
     h = 480
@@ -1482,6 +1488,26 @@ def test_subfigures_wspace_hspace():
     np.testing.assert_allclose(sub_figs[1, 2].bbox.max, [w, h * 0.4])
 
 
+@check_figures_equal(extensions=["svg", "pdf", "eps", "png"])
+def test_subfigure_drawzorder(fig_test, fig_ref):
+    # this tests check that subfigures are actually drawn at the proper zorder
+    line = plt.Line2D([0], [0], label='Line')
+    handles = [line for i in range(9)]
+    fig_ref.set_layout_engine('constrained')
+    fig_test.set_layout_engine('constrained')
+
+    axarr = fig_ref.subplots(2, 2)
+    fig_ref.legend(handles=handles, loc='center', ncol=3)
+    for ax in axarr[-1]:
+        ax.set_zorder(10)
+
+    subfigs = fig_test.subfigures(nrows=2, ncols=1)
+    for subfig in subfigs:
+        axarr = subfig.subplots(1, 2)
+    subfigs[-1].set_zorder(10)
+    fig_test.legend(handles=handles, loc='center', ncol=3)
+
+
 def test_add_subplot_kwargs():
     # fig.add_subplot() always creates new axes, even if axes kwargs differ.
     fig = plt.figure()
@@ -1614,7 +1640,7 @@ def test_deepcopy():
 def test_unpickle_with_device_pixel_ratio():
     fig = Figure(dpi=42)
     fig.canvas._set_device_pixel_ratio(7)
-    assert fig.dpi == 42*7
+    assert fig.dpi == 42 * 7
     fig2 = pickle.loads(pickle.dumps(fig))
     assert fig2.dpi == 42