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

[core/theme] fix mergeing of iconsets

Browse source 
iconsets should only overwrite parameters that are *not* set in the main
theme file.

fixes #666
This commit is contained in:
tobi-wan-kenobi 2020-06-29 20:07:24 +02:00
parent e006344dcc
commit 227a23fdb5
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) self.__data = util.algorithm.merge(self.__data, self.load(icons, "icons"))
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", []):