Skip to content

Commit 20a58c3

Browse files
authored
Merge pull request #183 from TV4Fun/master
Remove white background from file lists
2 parents 9775de2 + 555e6a9 commit 20a58c3

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

tkgui/graphics.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,12 @@ def read_graphics(self):
200200
packs = self.packs = [p[0] for p in graphics.read_graphics()]
201201
self.graphics.set(tuple(sorted([graphics.get_title(p) for p in packs])))
202202
current = graphics.current_pack()
203+
default_bg = Style().lookup('TListbox', 'fill')
203204
for i, p in enumerate(packs):
204205
if p == current:
205206
self.graphicpacks.itemconfig(i, bg='pale green')
206207
else:
207-
self.graphicpacks.itemconfig(i, bg='white')
208+
self.graphicpacks.itemconfig(i, bg=default_bg)
208209

209210
self.select_graphics()
210211

@@ -300,11 +301,12 @@ def read_colors(self):
300301
files = colors.read_colors()
301302
self.colors.set(files)
302303
current = colors.get_installed_file()
304+
default_bg = Style().lookup('TListbox', 'fill')
303305
for i, f in enumerate(files):
304306
if f == current:
305307
self.color_files.itemconfig(i, bg='pale green')
306308
else:
307-
self.color_files.itemconfig(i, bg='white')
309+
self.color_files.itemconfig(i, bg=default_bg)
308310

309311
self.select_colors()
310312

@@ -387,16 +389,17 @@ def read_tilesets(self):
387389
files = graphics.read_tilesets()
388390
self.tilesets.set(files)
389391
current = graphics.current_tilesets()
392+
default_bg = Style().lookup('TListbox', 'fill')
390393
for i, f in enumerate(files):
391394
if f == current[0]:
392395
self.fonts.itemconfig(i, bg='pale green')
393396
else:
394-
self.fonts.itemconfig(i, bg='white')
397+
self.fonts.itemconfig(i, bg=default_bg)
395398
if lnp.settings.version_has_option('GRAPHICS_FONT'):
396399
if f == current[1]:
397400
self.graphicsfonts.itemconfig(i, bg='pale green')
398401
else:
399-
self.graphicsfonts.itemconfig(i, bg='white')
402+
self.graphicsfonts.itemconfig(i, bg=default_bg)
400403

401404
def install_tilesets(self, mode=3):
402405
"""

tkgui/options.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,12 @@ def read_keybinds(self):
265265
files = keybinds.read_keybinds()
266266
self.keybinds.set(files)
267267
current = keybinds.get_installed_file()
268+
default_bg = Style().lookup('TListbox', 'fill')
268269
for i, f in enumerate(files):
269270
if f == current:
270271
self.keybinding_files.itemconfig(i, bg='pale green')
271272
else:
272-
self.keybinding_files.itemconfig(i, bg='white')
273+
self.keybinding_files.itemconfig(i, bg=default_bg)
273274

274275
def load_keybinds(self):
275276
"""Replaces keybindings with selected file."""
@@ -312,11 +313,12 @@ def read_embarks(self):
312313
files = embarks.read_embarks()
313314
self.embarks.set(files)
314315
current = embarks.get_installed_files()
316+
default_bg = Style().lookup('TListbox', 'fill')
315317
for i, f in enumerate(files):
316318
if f in current:
317319
self.embark_files.itemconfig(i, bg='pale green')
318320
else:
319-
self.embark_files.itemconfig(i, bg='white')
321+
self.embark_files.itemconfig(i, bg=default_bg)
320322

321323
def install_embarks(self, listbox):
322324
"""

0 commit comments

Comments
 (0)