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

@@ -1455,7 +1455,7 @@ void CFileBrowser::paint()
//scrollbar
int ypos = y+ theight;
int sb = fheight* listmaxshow;
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0);
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0);
int sbc= ((filelist.size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow);