l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core/theme] Fix loading of iconsets

Browse source 
* 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
This commit is contained in:
tobi-wan-kenobi 2020-06-06 15:59:19 +02:00
parent 034e8eefb9
commit ba82f5a50f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bumblebee_status/core/theme.py
View file

@ -51,10 +51,11 @@ class Theme(object):
self.__keywords = {} self.__keywords = {}
self.__value_idx = {} self.__value_idx = {}
self.__data = raw_data if raw_data else self.load(name) 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": if iconset != "auto":
self.__data = util.algorithm.merge(self.load(iconset, "icons"), self.__data) 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", []): for colors in self.__data.get("colors", []):
util.algorithm.merge(self.__keywords, self.load_keywords(colors)) util.algorithm.merge(self.__keywords, self.load_keywords(colors))