fix: Use module separator from config
This commit is contained in:
parent
d359ab6057
commit
8af7388c93
@ -193,6 +193,11 @@ class bar {
|
|||||||
m_bar.wmname = m_conf.get<string>(bs, "wm_name", m_bar.wmname);
|
m_bar.wmname = m_conf.get<string>(bs, "wm_name", m_bar.wmname);
|
||||||
m_bar.wmname = string_util::replace(m_bar.wmname, " ", "-");
|
m_bar.wmname = string_util::replace(m_bar.wmname, " ", "-");
|
||||||
|
|
||||||
|
// }}}
|
||||||
|
// Set misc parameters {{{
|
||||||
|
|
||||||
|
m_bar.separator = string_util::trim(m_conf.get<string>(bs, "separator", ""), '"');
|
||||||
|
|
||||||
// }}}
|
// }}}
|
||||||
// Checking nodraw {{{
|
// Checking nodraw {{{
|
||||||
|
|
||||||
|
@ -392,7 +392,7 @@ class controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
string contents{""};
|
string contents{""};
|
||||||
string separator{m_bar->settings().separator.empty()};
|
string separator{m_bar->settings().separator};
|
||||||
|
|
||||||
string padding_left(m_bar->settings().padding_left, ' ');
|
string padding_left(m_bar->settings().padding_left, ' ');
|
||||||
string padding_right(m_bar->settings().padding_right, ' ');
|
string padding_right(m_bar->settings().padding_right, ' ');
|
||||||
@ -409,7 +409,7 @@ class controller {
|
|||||||
if (module_contents.empty())
|
if (module_contents.empty())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!block_contents.empty())
|
if (!block_contents.empty() && !separator.empty())
|
||||||
block_contents += separator;
|
block_contents += separator;
|
||||||
|
|
||||||
if (!(block.first == alignment::LEFT && module == block.second.front()))
|
if (!(block.first == alignment::LEFT && module == block.second.front()))
|
||||||
|
Loading…
Reference in New Issue
Block a user