mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-15 11:07:32 +02:00
parent 5a43934c6b 8b3c5e2fab
commit faa10f0ed6
39 changed files with 430 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/bouquetlist.cpp
View File

@@ -721,7 +721,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();
@@ -754,9 +753,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);
}