1
0
mirror of https://github.com/gryf/wmdocklib.git synced 2025-12-20 04:48:06 +01:00

Use font object information, instead of local list.

This commit is contained in:
2022-05-04 16:30:49 +02:00
parent dca4bf5440
commit c3c75e2cb5

View File

@@ -79,7 +79,6 @@ class DockApp:
""" """
palette = {} palette = {}
patterns = self.patterns patterns = self.patterns
fonts = []
if self.background: if self.background:
palette, background = helpers.read_xpm(self.background) palette, background = helpers.read_xpm(self.background)
@@ -88,13 +87,12 @@ class DockApp:
for font in self.fonts: for font in self.fonts:
if not palette: if not palette:
palette = font.palette palette = font.palette
fonts.append(font.bitmap)
else: else:
# merge background and font_palette and remap characters # merge background and font_palette and remap characters
palette, fontdef = helpers.merge_palettes(palette, palette, fontdef = helpers.merge_palettes(palette,
font.palette, font.palette,
font.bitmap) font.bitmap)
fonts.append(fontdef) font.bitmap = fontdef
if not palette: if not palette:
palette[' '] = 'None' palette[' '] = 'None'