diff --git a/lib/Terminal/Widgets/Input.rakumod b/lib/Terminal/Widgets/Input.rakumod index 98fdf0c..97ff698 100644 --- a/lib/Terminal/Widgets/Input.rakumod +++ b/lib/Terminal/Widgets/Input.rakumod @@ -2,7 +2,6 @@ use Terminal::Widgets::Utils::Color; use Terminal::Widgets::ColorTheme; -use Terminal::Widgets::ColorThemes; use Terminal::Widgets::Events; use Terminal::Widgets::Widget; use Terminal::Widgets::Form; @@ -18,7 +17,7 @@ role Terminal::Widgets::Input has $.error; has %.color; - has Terminal::Widgets::ColorSet:D $.colorset = $DEFAULT-THEME.variants; + has Terminal::Widgets::ColorSet:D $.colorset = self.terminal.colorset; has Terminal::Widgets::Form $.form; diff --git a/lib/Terminal/Widgets/Terminal.rakumod b/lib/Terminal/Widgets/Terminal.rakumod index c1e9eb2..45feba9 100644 --- a/lib/Terminal/Widgets/Terminal.rakumod +++ b/lib/Terminal/Widgets/Terminal.rakumod @@ -7,6 +7,8 @@ use Terminal::LineEditor::RawTerminalInput; use Terminal::Widgets::Events; use Terminal::Widgets::TopLevel; use Terminal::Widgets::I18N::Locale; +use Terminal::Widgets::ColorTheme; +use Terminal::Widgets::ColorThemes; #| A container for the unique ANSI terminal event pump for a given terminal @@ -16,6 +18,8 @@ class Terminal::Widgets::Terminal has Terminal::Widgets::TopLevel $.current-toplevel; has Terminal::Capabilities:D $.caps .= new; has Terminal::Widgets::I18N::Locale:D $.locale .= new; + has Terminal::Widgets::ColorTheme:D $.color-theme = $DEFAULT-THEME; + has Terminal::Widgets::ColorSet:D $.colorset = $!color-theme.variants; has %.ui-prefs; has Promise:D $.has-initialized .= new;