pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(modules): Move default format values to the config

Browse Source 
Fallback values for all module formats can now be set
in the configuration. For example:

    [settings]
    format-padding = 2
    format-underline = #00f
This commit is contained in:
Michael Carlberg 2017-01-26 01:50:01 +01:00
parent 8138a12381
commit b16c105514
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/meta/base.cpp
View File

@ -69,18 +69,21 @@ namespace modules {
// module_formatter {{{ // module_formatter {{{
void module_formatter::add(string name, string fallback, vector<string>&& tags, vector<string>&& whitelist) { void module_formatter::add(string name, string fallback, vector<string>&& tags, vector<string>&& whitelist) {
const auto formatdef = [&](
const string& param, const auto& fallback) { return m_conf.get("settings", "format-" + param, fallback); };
auto format = make_unique<module_format>(); auto format = make_unique<module_format>();
format->value = m_conf.get(m_modname, name, move(fallback)); format->value = m_conf.get(m_modname, name, move(fallback));
format->fg = m_conf.get(m_modname, name + "-foreground", format->fg); format->fg = m_conf.get(m_modname, name + "-foreground", formatdef("foreground", format->fg));
format->bg = m_conf.get(m_modname, name + "-background", format->bg); format->bg = m_conf.get(m_modname, name + "-background", formatdef("background", format->bg));
format->ul = m_conf.get(m_modname, name + "-underline", format->ul); format->ul = m_conf.get(m_modname, name + "-underline", formatdef("underline", format->ul));
format->ol = m_conf.get(m_modname, name + "-overline", format->ol); format->ol = m_conf.get(m_modname, name + "-overline", formatdef("overline", format->ol));
format->ulsize = m_conf.get(m_modname, name + "-underline-size", format->ulsize); format->ulsize = m_conf.get(m_modname, name + "-underline-size", formatdef("underline-size", format->ulsize));
format->olsize = m_conf.get(m_modname, name + "-overline-size", format->olsize); format->olsize = m_conf.get(m_modname, name + "-overline-size", formatdef("overline-size", format->olsize));
format->spacing = m_conf.get(m_modname, name + "-spacing", format->spacing); format->spacing = m_conf.get(m_modname, name + "-spacing", formatdef("spacing", format->spacing));
format->padding = m_conf.get(m_modname, name + "-padding", format->padding); format->padding = m_conf.get(m_modname, name + "-padding", formatdef("padding", format->padding));
format->margin = m_conf.get(m_modname, name + "-margin", format->margin); format->margin = m_conf.get(m_modname, name + "-margin", formatdef("margin", format->margin));
format->offset = m_conf.get(m_modname, name + "-offset", format->offset); format->offset = m_conf.get(m_modname, name + "-offset", formatdef("offset", format->offset));
format->tags.swap(tags); format->tags.swap(tags);
try { try {