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

[core/theme] Make theme iconsets *not* override settings

Browse source 
Make sure that iconsets used as part of a theme do *not* override
anything already existing inside the theme.

Only iconsets that are manually specified can override settings in the
theme now (because those, you typically specify on the CLI).

TODO: Write unit test for this

fixes #666
This commit is contained in:
tobi-wan-kenobi 2020-06-28 20:01:08 +02:00
parent 8f3d48c0e6
commit 320bba97d0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bumblebee_status/core/theme.py
View file

@ -53,7 +53,7 @@ class Theme(object):
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", []): for icons in self.__data.get("icons", []):
self.__data = util.algorithm.merge(self.load(icons, "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 colors in self.__data.get("colors", []): for colors in self.__data.get("colors", []):