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

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

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-16 15:10:34 +02:00
parent faa10f0ed6 f649b9e3e1
commit a567246e27
23 changed files with 228 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/timerlist.cpp
View File

@@ -1135,7 +1135,7 @@ void CTimerList::paintItem(int pos)
int real_width=width;
if (timerlist.size() > listmaxshow)
{
real_width-=15; //scrollbar
real_width -= SCROLLBAR_WIDTH; //scrollbar
}
unsigned int currpos = liststart + pos;
@@ -1435,15 +1435,10 @@ void CTimerList::paint()
if (timerlist.size()>listmaxshow)
{
int ypos = y+ theight;
int sb = 2*fheight* listmaxshow;
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0);
unsigned int tmp_max = listmaxshow;
if (!tmp_max)
tmp_max = 1;
int sbc = ((timerlist.size()- 1)/ tmp_max)+ 1;
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ page_nr * (sb-4)/sbc, 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0, RADIUS_SMALL);
int total_pages;
int current_page;
getScrollBarData(&total_pages, &current_page, timerlist.size(), listmaxshow, selected);
paintScrollBar(x + width - SCROLLBAR_WIDTH, y + theight, SCROLLBAR_WIDTH, 2*fheight*listmaxshow, total_pages, current_page);
}
//NI paintFoot();