mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-03-08 01:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(parser): Proper handling of %{R} #585

Browse Source
This commit is contained in:
Michael Carlberg
2017-05-17 23:11:06 +02:00
parent 5af5292808
commit 0bd8f1f69a
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/parser.cpp
View File

@ -83,7 +83,7 @@ void parser::codeblock(string&& data, const bar_settings& bar) {
switch (tag) {
case 'B': {
m_sig.emit(change_background{parse_color(m_bg, value, 0UL)});
m_sig.emit(change_background{parse_color(m_bg, value, bar.background)});
break;
}
@ -110,8 +110,7 @@ void parser::codeblock(string&& data, const bar_settings& bar) {
break;
case 'R':
m_sig.emit(change_background{parse_color_string(value, bar.foreground)});
m_sig.emit(change_foreground{parse_color_string(value, bar.background)});
m_sig.emit(reverse_colors{});
break;
case 'O':

10
src/components/renderer.cpp
View File

@ -205,7 +205,7 @@ void renderer::begin(xcb_rectangle_t rect) {
m_align = alignment::NONE;
// Reset colors
m_bg = 0;
m_bg = m_bar.background;
m_fg = m_bar.foreground;
m_ul = m_bar.underline.color;
m_ol = m_bar.overline.color;
@ -700,6 +700,14 @@ bool renderer::on(const signals::parser::change_alignment& evt) {
return true;
}
bool renderer::on(const signals::parser::reverse_colors&) {
m_log.trace_x("renderer: reverse_colors");
m_fg = m_fg + m_bg;
m_bg = m_fg - m_bg;
m_fg = m_fg - m_bg;
return true;
}
bool renderer::on(const signals::parser::offset_pixel& evt) {
m_log.trace_x("renderer: offset_pixel(%f)", evt.cast());
m_blocks[m_align].x += evt.cast();