Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-04-24 21:33:15 +02:00
19 changed files with 63 additions and 63 deletions

View File

@@ -1767,7 +1767,7 @@ void CAudioPlayerGui::paint()
int ypos = m_y + m_title_height + m_theight;
int sb = m_fheight * m_listmaxshow;
m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0);
m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_SCROLLBAR_PLUS_0);
int sbc = ((m_playlist.size() - 1) / tmp_max) + 1;
int sbs = (m_selected / tmp_max);