From ba82f5a50ff3070f0f8158c5237f5eef22f77924 Mon Sep 17 00:00:00 2001 From: tobi-wan-kenobi Date: Sat, 6 Jun 2020 15:59:19 +0200 Subject: [PATCH] [core/theme] Fix loading of iconsets * First, make iconsets override anything already present in the "base" configuration * Second, make sure that CLI provided iconsets have higher priority than "built-in" ones see #648 --- bumblebee_status/core/theme.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py index e4220bd..f50286a 100644 --- a/bumblebee_status/core/theme.py +++ b/bumblebee_status/core/theme.py @@ -51,10 +51,11 @@ class Theme(object): self.__keywords = {} self.__value_idx = {} self.__data = raw_data if raw_data else self.load(name) + + for icons in self.__data.get("icons", []): + self.__data = util.algorithm.merge(self.load(icons, "icons"), self.__data) if iconset != "auto": self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data) - for icons in self.__data.get("icons", []): - util.algorithm.merge(self.__data, self.load(icons, "icons")) for colors in self.__data.get("colors", []): util.algorithm.merge(self.__keywords, self.load_keywords(colors))