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

[core/theme] make iconsets take precedence over "main" theme

Browse source 
see #648
This commit is contained in:
tobi-wan-kenobi 2020-06-05 20:10:50 +02:00
parent cb9a60668a
commit 034e8eefb9
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

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