Merge pull request #1333 from kraasch/master

In case alpha value exists remove it for urwid.
pimutils · Jan 29, 2024 · d5e6ed3 · d5e6ed3
2 parents acf3bae + 0059b65
commit d5e6ed3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/khal/cli.py b/khal/cli.py
@@ -175,7 +175,7 @@ def build_collection(conf, selection):
                     'color': cal['color'],
                     'priority': cal['priority'],
                     'ctype': cal['type'],
-                    'addresses': cal['addresses'],
+                    'addresses': cal['addresses'] if 'addresses' in cal else '',
                 }
         collection = khalendar.CalendarCollection(
             calendars=props,

diff --git a/khal/ui/__init__.py b/khal/ui/__init__.py
@@ -1321,6 +1321,14 @@ def _add_calendar_colors(
             color = collection.default_color
         else:
             color = cal['color']
+
+        # In case the color contains an alpha value, remove it for urwid.
+        # eg '#RRGGBBAA' -> '#RRGGBB' and '#RGBA' -> '#RGB'.
+        if len(color) == 9:
+            color = color[0:7]
+        elif len(color) == 5:
+            color = color[0:4]
+
         entry = _urwid_palette_entry(
             attr_template.format(cal['name']),
             color,