Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu: refresh: rename variables a bit

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-05-08 22:01:53 +02:00
parent 4d552bef58
commit c540c5afba
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/menu_impl.h
View File

@@ -181,41 +181,42 @@ void Menu<ItemT>::refresh()
} }
size_t line = 0; size_t line = 0;
const size_t end = m_beginning+m_height;
m_drawn_position = m_beginning; m_drawn_position = m_beginning;
for (size_t &i = m_drawn_position; i < m_beginning+m_height; ++i, ++line) for (; m_drawn_position < end; ++m_drawn_position, ++line)
{ {
goToXY(0, line); goToXY(0, line);
if (i >= m_items.size()) if (m_drawn_position >= m_items.size())
{ {
for (; line < m_height; ++line) for (; line < m_height; ++line)
mvwhline(m_window, line, 0, KEY_SPACE, m_width); mvwhline(m_window, line, 0, KEY_SPACE, m_width);
break; break;
} }
if (m_items[i].isSeparator()) if (m_items[m_drawn_position].isSeparator())
{ {
mvwhline(m_window, line, 0, 0, m_width); mvwhline(m_window, line, 0, 0, m_width);
continue; continue;
} }
if (m_items[i].isBold()) if (m_items[m_drawn_position].isBold())
*this << Format::Bold; *this << Format::Bold;
if (m_highlight_enabled && i == m_highlight) if (m_highlight_enabled && m_drawn_position == m_highlight)
{ {
*this << Format::Reverse; *this << Format::Reverse;
*this << m_highlight_color; *this << m_highlight_color;
} }
mvwhline(m_window, line, 0, KEY_SPACE, m_width); mvwhline(m_window, line, 0, KEY_SPACE, m_width);
if (m_items[i].isSelected()) if (m_items[m_drawn_position].isSelected())
*this << m_selected_prefix; *this << m_selected_prefix;
if (m_item_displayer) if (m_item_displayer)
m_item_displayer(*this); m_item_displayer(*this);
if (m_items[i].isSelected()) if (m_items[m_drawn_position].isSelected())
*this << m_selected_suffix; *this << m_selected_suffix;
if (m_highlight_enabled && i == m_highlight) if (m_highlight_enabled && m_drawn_position == m_highlight)
{ {
*this << Color::End; *this << Color::End;
*this << Format::NoReverse; *this << Format::NoReverse;
} }
if (m_items[i].isBold()) if (m_items[m_drawn_position].isBold())
*this << Format::NoBold; *this << Format::NoBold;
} }
Window::refresh(); Window::refresh();