removed _hatch_color param in favor of _hatchcolors

r3kste · r3kste · commit 3fb9b0cabb92 · 2024-08-10T18:39:18.000+05:30
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -363,11 +363,12 @@ def _iter_collection(self, gc, path_ids, offsets, offset_trans, facecolors,
         N = max(Npaths, Noffsets)
         Nfacecolors = len(facecolors)
         Nedgecolors = len(edgecolors)
+        Nhatchcolors = len(hatchcolors)
         Nlinewidths = len(linewidths)
         Nlinestyles = len(linestyles)
         Nurls = len(urls)
 
-        if (Nfacecolors == 0 and Nedgecolors == 0) or Npaths == 0:
+        if (Nfacecolors == 0 and Nedgecolors == 0 and Nhatchcolors == 0) or Npaths == 0:
             return
 
         gc0 = self.new_gc()
@@ -382,6 +383,7 @@ def cycle_or_default(seq, default=None):
         toffsets = cycle_or_default(offset_trans.transform(offsets), (0, 0))
         fcs = cycle_or_default(facecolors)
         ecs = cycle_or_default(edgecolors)
+        hcs = cycle_or_default(hatchcolors)
         lws = cycle_or_default(linewidths)
         lss = cycle_or_default(linestyles)
         aas = cycle_or_default(antialiaseds)
@@ -390,8 +392,8 @@ def cycle_or_default(seq, default=None):
         if Nedgecolors == 0:
             gc0.set_linewidth(0.0)
 
-        for pathid, (xo, yo), fc, ec, lw, ls, aa, url in itertools.islice(
-                zip(pathids, toffsets, fcs, ecs, lws, lss, aas, urls), N):
+        for pathid, (xo, yo), fc, ec, hc, lw, ls, aa, url in itertools.islice(
+                zip(pathids, toffsets, fcs, ecs, hcs, lws, lss, aas, urls), N):
             if not (np.isfinite(xo) and np.isfinite(yo)):
                 continue
             if Nedgecolors:
@@ -403,6 +405,8 @@ def cycle_or_default(seq, default=None):
                     gc0.set_linewidth(0)
                 else:
                     gc0.set_foreground(ec)
+            if Nhatchcolors:
+                gc0.set_hatch_color(hc)
             if fc is not None and len(fc) == 4 and fc[3] == 0:
                 fc = None
             gc0.set_antialiased(aa)
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -365,7 +365,6 @@ def draw(self, renderer):
 
         if self._hatch:
             gc.set_hatch(self._hatch)
-            gc.set_hatch_color(self._hatch_color)
 
         if self.get_sketch_params() is not None:
             gc.set_sketch_params(*self.get_sketch_params())
@@ -822,7 +821,6 @@ def _set_edgecolor(self, c):
                 self._set_hatchcolor('black')
             else:
                 self._hatchcolors = self._edgecolors
-                self._hatch_color = self._hatchcolors[0]
         self.stale = True
 
     def set_edgecolor(self, c):
@@ -851,15 +849,10 @@ def _set_hatchcolor(self, c):
             else:
                 c = mpl.rcParams["patch.edgecolor"]
 
-        if not isinstance(c, str):
-            if len(c) == 0:
-                c = "black"
-        else:
-            if c in ('none', 'face'):
-                c = "black"
+        if isinstance(c, str) and c in ('none', 'face'):
+            c = 'black'
 
         self._hatchcolors = mcolors.to_rgba_array(c, self._alpha)
-        self._hatch_color = self._hatchcolors[0]
         self.stale = True
 
     def set_hatchcolor(self, c):
@@ -996,7 +989,6 @@ def update_from(self, other):
         self._pickradius = other._pickradius
         self._hatch = other._hatch
         self._hatchcolors = other._hatchcolors
-        self._hatch_color = other._hatch_color
 
         # update_from for scalarmappable
         self._A = other._A
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -790,12 +790,11 @@ def get_first(prop_array):
         # Directly set Patch color attributes (must be RGBA tuples).
         legend_handle._facecolor = first_color(orig_handle.get_facecolor())
         legend_handle._edgecolor = first_color(orig_handle.get_edgecolor())
+        legend_handle._hatch_color = first_color(orig_handle.get_hatchcolor())
         legend_handle._original_facecolor = orig_handle._original_facecolor
         legend_handle._original_edgecolor = orig_handle._original_edgecolor
         legend_handle._fill = orig_handle.get_fill()
         legend_handle._hatch = orig_handle.get_hatch()
-        # Hatch color is anomalous in having no getters and setters.
-        legend_handle._hatch_color = orig_handle._hatch_color
         # Setters are fine for the remaining attributes.
         legend_handle.set_linewidth(get_first(orig_handle.get_linewidths()))
         legend_handle.set_linestyle(get_first(orig_handle.get_linestyles()))
