From 0c8c1989b7a7247a3e7ed8c848b00be3c6689ca9 Mon Sep 17 00:00:00 2001 From: Sean Smith Date: Wed, 4 Sep 2019 21:42:34 -0400 Subject: [PATCH] Fix module color config Make sure we use `moduleConfig` with appropriate path And `colorsConfig` for appropriate fallback --- cfg/common_settings.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/common_settings.go b/cfg/common_settings.go index 1cf262be..e58308d4 100644 --- a/cfg/common_settings.go +++ b/cfg/common_settings.go @@ -62,12 +62,12 @@ func NewCommonSettingsFromModule(name, defaultTitle string, moduleConfig *config common := Common{ Colors: Colors{ - Background: moduleConfig.UString("background", globalSettings.UString("background", "transparent")), + Background: moduleConfig.UString("colors.background", colorsConfig.UString("background", "transparent")), BorderFocusable: colorsConfig.UString("border.focusable", "red"), BorderFocused: colorsConfig.UString("border.focused", "orange"), BorderNormal: colorsConfig.UString("border.normal", "gray"), Checked: colorsConfig.UString("checked", "white"), - Foreground: moduleConfig.UString("foreground", colorsConfig.UString("foreground", "white")), + Foreground: moduleConfig.UString("colors.foreground", colorsConfig.UString("foreground", "white")), HighlightFore: colorsConfig.UString("highlight.fore", "black"), HighlightBack: colorsConfig.UString("highlight.back", "green"), Text: moduleConfig.UString("colors.text", colorsConfig.UString("text", "white")),