added logic to inherit hatchcolor from edgecolor

r3kste · Impaler343 · commit 871019a76881 · 2024-08-10T21:24:05.000+05:30
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -168,6 +168,8 @@ def __init__(self, *,
         self._linewidths = [0]
 
         self._gapcolor = None  # Currently only used by LineCollection.
+        self._original_edgecolor = None
+        self._original_hatchcolor = None
 
         # Flags set by _set_mappable_flags: are colors from mapping an array?
         self._face_is_mapped = None
@@ -810,9 +812,17 @@ def _set_edgecolor(self, c):
                 c = 'none'
         if cbook._str_lower_equal(c, 'face'):
             self._edgecolors = 'face'
+            if self._original_hatchcolor is None:
+                self._set_hatchcolor('black')
             self.stale = True
             return
         self._edgecolors = mcolors.to_rgba_array(c, self._alpha)
+        if self._original_hatchcolor is None:
+            if isinstance(c, str) and c == 'none':
+                self._set_hatchcolor('black')
+            else:
+                self._hatchcolors = self._edgecolors
+                self._hatch_color = self._hatchcolors[0]
         self.stale = True
 
     def set_edgecolor(self, c):
@@ -836,7 +846,18 @@ def set_edgecolor(self, c):
     def _set_hatchcolor(self, c):
         c = mpl._val_or_rc(c, "hatch.color")
         if c == "inherit":
-            c = mpl.rcParams["patch.edgecolor"]
+            if self._original_edgecolor is not None:
+                c = self._original_edgecolor
+            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"
+
         self._hatchcolors = mcolors.to_rgba_array(c, self._alpha)
         self._hatch_color = self._hatchcolors[0]
         self.stale = True
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -36,7 +36,7 @@ patch.force_edgecolor  : True
 patch.edgecolor        : k
 patch.antialiased      : True    # render patches in antialiased (no jaggies)
 
-hatch.color            : k
+hatch.color            : inherit
 hatch.linewidth        : 1.0
 
 hist.bins              : 10
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -72,9 +72,8 @@ def __init__(self, *,
         if joinstyle is None:
             joinstyle = JoinStyle.miter
 
-        hatchcolor = mpl._val_or_rc(hatchcolor, "hatch.color")
-        if hatchcolor == 'inherit':
-            hatchcolor = mpl.rcParams["patch.edgecolor"]
+        self._original_edgecolor = None
+        self._original_hatchcolor = None
 
         self._fill = bool(fill)  # needed for set_facecolor call
         if color is not None:
@@ -373,6 +372,8 @@ def _set_edgecolor(self, color):
                 color = 'none'
 
         self._edgecolor = colors.to_rgba(color, self._alpha)
+        if self._original_hatchcolor is None:
+            self._hatch_color = self._edgecolor
         self.stale = True
 
     def set_edgecolor(self, color):
@@ -422,6 +423,12 @@ def set_color(self, c):
         self.set_facecolor(c)
 
     def _set_hatchcolor(self, color):
+        color = mpl._val_or_rc(color, "hatch.color")
+        if color == 'inherit':
+            if self._original_edgecolor is not None:
+                color = self._original_edgecolor
+            else:
+                color = mpl.rcParams['patch.edgecolor']
         self._hatch_color = colors.to_rgba(color, self._alpha)
         self.stale = True
 
