mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-06-15 12:32:31 +02:00
parent 6179aa7d38 78f1b294a9
commit 4c3002cb26
43 changed files with 473 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/bouquetlist.cpp
View File

@@ -711,7 +711,6 @@ void CBouquetList::paint()
CInfoClock::getInstance()->disableInfoClock();
liststart = (selected/listmaxshow)*listmaxshow;
int lastnum = liststart + listmaxshow;
int bsize = Bouquets.empty() ? 1 : Bouquets.size();
numwidth = 0;
int maxDigitWidth = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getMaxDigitWidth();
@@ -744,9 +743,9 @@ void CBouquetList::paint()
}
}
int _listmaxshow = listmaxshow ? listmaxshow : 1; //avoid division by zero
int total_pages = ((bsize - 1) / _listmaxshow) + 1;
int current_page = selected / _listmaxshow;
int total_pages;
int current_page;
getScrollBarData(&total_pages, &current_page, Bouquets.size(), listmaxshow, selected);
paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
}