diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2016-12-22 16:31:41 +0100 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2016-12-23 22:52:47 +0100 |
| commit | a488c2d89d1101a3688ca568ee298af8c3f5c7d3 (patch) | |
| tree | e665d4e294d4641d2da75c5da7ece8b6e465073a /src/status.cpp | |
| parent | 9c13827b62029c1c51e08ab69c7a66635a9e5bf8 (diff) | |
Support attaching format information to selected color variables
Diffstat (limited to 'src/status.cpp')
| -rw-r--r-- | src/status.cpp | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/status.cpp b/src/status.cpp index ec9acb1d..4a0e7617 100644 --- a/src/status.cpp +++ b/src/status.cpp @@ -687,7 +687,10 @@ void Status::Changes::elapsedTime(bool update_elapsed) *wHeader << NC::XY(second_start, 1); writeCyclicBuffer(second, *wHeader, second_line_scroll_begin, COLS-ps.length()-8-2, L" ** "); - *wHeader << NC::XY(wHeader->getWidth()-VolumeState.length(), 0) << Config.volume_color << VolumeState << NC::Color::End; + *wHeader << NC::XY(wHeader->getWidth()-VolumeState.length(), 0) + << Config.volume_color + << VolumeState + << NC::FormattedColor::End(Config.volume_color); flags(); } @@ -719,11 +722,14 @@ void Status::Changes::flags() *wHeader << Config.state_line_color; mvwhline(wHeader->raw(), 1, 0, 0, COLS); + *wHeader << NC::FormattedColor::End(Config.state_line_color); + if (!switch_state.empty()) - *wHeader << NC::XY(COLS-switch_state.length()-3, 1) << "[" + *wHeader << NC::XY(COLS-switch_state.length()-3, 1) + << "[" << Config.state_flags_color - << NC::Format::Bold << switch_state << NC::Format::NoBold - << NC::Color::End + << switch_state + << NC::FormattedColor::End(Config.state_flags_color) << "]"; break; case Design::Alternative: @@ -735,12 +741,15 @@ void Status::Changes::flags() switch_state += m_crossfade ? m_crossfade : '-'; switch_state += m_db_updating ? m_db_updating : '-'; switch_state += ']'; - *wHeader << NC::XY(COLS-switch_state.length(), 1) << NC::Format::Bold << Config.state_flags_color << switch_state << NC::Color::End << NC::Format::NoBold; + *wHeader << NC::XY(COLS-switch_state.length(), 1) + << Config.state_flags_color + << switch_state + << NC::FormattedColor::End(Config.state_flags_color); if (!Config.header_visibility) // in this case also draw separator { - *wHeader << NC::Format::Bold << Config.alternative_ui_separator_color; + *wHeader << Config.alternative_ui_separator_color; mvwhline(wHeader->raw(), 2, 0, 0, COLS); - *wHeader << NC::Color::End << NC::Format::NoBold; + *wHeader << NC::FormattedColor::End(Config.alternative_ui_separator_color); } break; } @@ -749,7 +758,8 @@ void Status::Changes::flags() void Status::Changes::mixer() { - if (!Config.display_volume_level || (!Config.header_visibility && Config.design == Design::Classic)) + if (!Config.display_volume_level + || (!Config.header_visibility && Config.design == Design::Classic)) return; switch (Config.design) @@ -768,9 +778,10 @@ void Status::Changes::mixer() VolumeState += boost::lexical_cast<std::string>(m_volume); VolumeState += "%"; } - *wHeader << Config.volume_color; - *wHeader << NC::XY(wHeader->getWidth()-VolumeState.length(), 0) << VolumeState; - *wHeader << NC::Color::End; + *wHeader << NC::XY(wHeader->getWidth()-VolumeState.length(), 0) + << Config.volume_color + << VolumeState + << NC::FormattedColor::End(Config.volume_color); wHeader->refresh(); } |