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

fix(progressbar): Make sure index is within bounds

Browse Source
This commit is contained in:
Michael Carlberg 2016-10-11 19:58:22 +02:00
parent e1b6238564
commit 700cc89963
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/drawtypes/progressbar.hpp
View File

@ -40,12 +40,11 @@ namespace drawtypes {
m_colors = forward<decltype(colors)>(colors); m_colors = forward<decltype(colors)>(colors);
} }
string output(float percentage, bool floor_percentage = false) { string output(float percentage) {
if (m_colors.empty()) if (m_colors.empty())
m_colors.emplace_back(m_fill->m_foreground); m_colors.emplace_back(m_fill->m_foreground);
float add = floor_percentage ? 0 : 0.5; int fill_width = m_width * percentage / 100.0f + 0.5f;
int fill_width = (int)m_width * percentage / 100 + add;
int empty_width = m_width - fill_width; int empty_width = m_width - fill_width;
int color_step = m_width / m_colors.size() + 0.5f; int color_step = m_width / m_colors.size() + 0.5f;
@ -61,11 +60,11 @@ namespace drawtypes {
} }
if (!m_gradient) { if (!m_gradient) {
auto color = m_colors.size() * percentage / 100; auto idx = static_cast<int>((m_colors.size() - 1) * percentage / 100.0f + 0.5f);
if (color >= m_colors.size()) m_fill->m_foreground = m_colors[idx];
color = 0; while (fill_width--) {
m_fill->m_foreground = m_colors[color - 1]; m_builder->node(m_fill);
while (fill_width--) m_builder->node(m_fill); }
} else { } else {
int i = 0; int i = 0;
for (auto color : m_colors) { for (auto color : m_colors) {