From 6a06c769c8324a5f106ef1147d51bd470ab0454a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 18 Sep 2023 13:09:15 -0400 Subject: [PATCH] indentlog: refactor: tag_config.tag_color uses color_spec --- include/indentlog/tag.hpp | 2 +- include/indentlog/tag_config.hpp | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/indentlog/tag.hpp b/include/indentlog/tag.hpp index 7b22e67b..6c7eafbb 100644 --- a/include/indentlog/tag.hpp +++ b/include/indentlog/tag.hpp @@ -96,7 +96,7 @@ namespace xo { if(PrefixSpace) s << " "; - s << with_color(color_spec_type(tag_config::encoding, tag_config::tag_color), concat((char const *)":", tag.name())) + s << with_color(tag_config::tag_color, concat((char const *)":", tag.name())) << " " << unq(tag.value()); return s; diff --git a/include/indentlog/tag_config.hpp b/include/indentlog/tag_config.hpp index 8b9643e6..f86b2c8f 100644 --- a/include/indentlog/tag_config.hpp +++ b/include/indentlog/tag_config.hpp @@ -9,24 +9,18 @@ namespace xo { /* Tag here b/c we want header-only library */ template struct tag_config_impl { - /* color encoding */ - static color_encoding encoding; /* color to use for tags * os << tag("foo", foovalue) * to produces output like * :foo foovalue * with :foo using .tag_color */ - static std::uint32_t tag_color; + static color_spec_type tag_color; }; /*tag_config_impl*/ template - color_encoding - tag_config_impl::encoding = color_encoding::xterm; - - template - std::uint32_t - tag_config_impl::tag_color = 245; + color_spec_type + tag_config_impl::tag_color = color_spec_type::xterm(245); using tag_config = tag_config_impl; } /*namespace xo*/