Make Attribute.NORMAL clean up all other attributes

getcuia · Dec 7, 2021 · 26ff507 · 26ff507
1 parent 7cebadb
commit 26ff507
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/cusser/__init__.py b/src/cusser/__init__.py
@@ -48,7 +48,6 @@ class Cusser:
     )
 
     _ON_ATTR_MAP = {
-        Attribute.NORMAL: curses.A_NORMAL,
         Attribute.BOLD: curses.A_BOLD,
         Attribute.DIM: curses.A_DIM,
         Attribute.ITALIC: curses.A_ITALIC,
@@ -100,10 +99,12 @@ def addstr(self, text: Text) -> None:
 
     def _set_attribute(self, attribute: Attribute) -> None:
         """Set the current attribute."""
+        if attribute == Attribute.NORMAL:
+            self._set_color(ColorRole.FOREGROUND, None)
+            self._set_color(ColorRole.BACKGROUND, None)
+            return self.window.attrset(curses.A_NORMAL)
+
         if attribute in self._ON_ATTR_MAP:
-            if attribute == Attribute.NORMAL:
-                self._set_color(ColorRole.FOREGROUND, None)
-                self._set_color(ColorRole.BACKGROUND, None)
             return self.window.attron(self._ON_ATTR_MAP[attribute])
 
         if attribute in self._OFF_ATTR_MAP: