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

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
M. Liebmann
2017-04-24 21:51:25 +02:00
parent cbdf41d9d9 fe5f84c1d0
commit d3ceb0ec7b
14 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/audioplayer.cpp
View File

@@ -1766,7 +1766,7 @@ void CAudioPlayerGui::paint()
int ypos = m_y + m_title_height + m_theight; int ypos = m_y + m_title_height + m_theight;
int sb = m_fheight * m_listmaxshow; 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 sbc = ((m_playlist.size() - 1) / tmp_max) + 1;
int sbs = (m_selected / tmp_max); int sbs = (m_selected / tmp_max);

2
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -127,7 +127,7 @@ void CBEBouquetWidget::paint()
int ypos = y+ theight; int ypos = y+ theight;
int sb = iheight* listmaxshow; int sb = iheight* 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= ((Bouquets->size()- 1)/ listmaxshow)+ 1; int sbc= ((Bouquets->size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow); int sbs= (selected/listmaxshow);

2
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -161,7 +161,7 @@ void CBEChannelWidget::paint()
int ypos = y+ theight; int ypos = y+ theight;
int sb = iheight* listmaxshow; int sb = iheight* 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= ((Channels->size()- 1)/ listmaxshow)+ 1; int sbc= ((Channels->size()- 1)/ listmaxshow)+ 1;
if (sbc < 1) if (sbc < 1)

2
src/gui/bookmarkmanager.cpp
View File

@@ -459,7 +459,7 @@ void CBookmarkManager::paint()
{ {
int ypos = y+ theight; int ypos = y+ theight;
int sb = 2*fheight* listmaxshow; int sb = 2*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);
unsigned int tmp_max = listmaxshow; unsigned int tmp_max = listmaxshow;
if(!tmp_max) if(!tmp_max)
tmp_max = 1; tmp_max = 1;

2
src/gui/channellist.cpp
View File

@@ -2203,7 +2203,7 @@ void CChannelList::paintBody()
const int ypos = y+ theight; const int ypos = y+ theight;
const int sb = height - theight - footerHeight; // paint scrollbar over full height of main box const int sb = height - theight - footerHeight; // paint scrollbar over full height of main box
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);
unsigned int listmaxshow_tmp = listmaxshow ? listmaxshow : 1;//avoid division by zero unsigned int listmaxshow_tmp = listmaxshow ? listmaxshow : 1;//avoid division by zero
int sbc= (((*chanlist).size()- 1)/ listmaxshow_tmp)+ 1; int sbc= (((*chanlist).size()- 1)/ listmaxshow_tmp)+ 1;
const int sbs= (selected/listmaxshow_tmp); const int sbs= (selected/listmaxshow_tmp);

2
src/gui/epgview.cpp
View File

@@ -327,7 +327,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
int sbs= (startPos+ 1)/ medlinecount; int sbs= (startPos+ 1)/ medlinecount;
if (sbc < 1) if (sbc < 1)
sbc = 1; sbc = 1;
frameBuffer->paintBoxRel(sx+ ox- 15, ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); // scrollbar bg frameBuffer->paintBoxRel(sx+ ox- 15, ypos, 15, sb, COL_SCROLLBAR_PLUS_0); // scrollbar bg
frameBuffer->paintBoxRel(sx+ ox- 13, ypos+ 2+ sbs*(sb-4)/sbc , 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0); // scrollbar frameBuffer->paintBoxRel(sx+ ox- 13, ypos+ 2+ sbs*(sb-4)/sbc , 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0); // scrollbar
} }

2
src/gui/eventlist.cpp
View File

@@ -920,7 +920,7 @@ void CEventList::paint(t_channel_id channel_id)
int ypos = y+ theight; int ypos = y+ theight;
int sb = fheight* listmaxshow; 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= ((evtlist.size()- 1)/ listmaxshow)+ 1; int sbc= ((evtlist.size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow); int sbs= (selected/listmaxshow);

2
src/gui/filebrowser.cpp
View File

@@ -1454,7 +1454,7 @@ void CFileBrowser::paint()
//scrollbar //scrollbar
int ypos = y+ theight; int ypos = y+ theight;
int sb = fheight* listmaxshow; 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 sbc= ((filelist.size()- 1)/ listmaxshow)+ 1;
int sbs= (selected/listmaxshow); int sbs= (selected/listmaxshow);

2
src/gui/pictureviewer.cpp
View File

@@ -750,7 +750,7 @@ void CPictureViewerGui::paint()
int ypos = y+ theight; int ypos = y+ theight;
int sb = fheight* listmaxshow; 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);
unsigned int tmp_max = listmaxshow; unsigned int tmp_max = listmaxshow;
if(!tmp_max) if(!tmp_max)

2
src/gui/timerlist.cpp
View File

@@ -1427,7 +1427,7 @@ void CTimerList::paint()
{ {
int ypos = y+ theight; int ypos = y+ theight;
int sb = 2*fheight* listmaxshow; int sb = 2*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);
unsigned int tmp_max = listmaxshow; unsigned int tmp_max = listmaxshow;
if (!tmp_max) if (!tmp_max)
tmp_max = 1; tmp_max = 1;

4
src/gui/upnpbrowser.cpp
View File

@@ -1000,7 +1000,7 @@ void CUpnpBrowserGui::paintDevices()
paintDevice(count); paintDevice(count);
int sb = m_item_height * m_listmaxshow; int sb = m_item_height * m_listmaxshow;
m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PLUS_0);
unsigned int tmp_max = m_listmaxshow; unsigned int tmp_max = m_listmaxshow;
if(!tmp_max) if(!tmp_max)
tmp_max = 1; tmp_max = 1;
@@ -1179,7 +1179,7 @@ void CUpnpBrowserGui::paintItems(std::vector<UPnPEntry> *entry, unsigned int sel
paintItem(entry, count, selected); paintItem(entry, count, selected);
int sb = m_item_height * m_listmaxshow; int sb = m_item_height * m_listmaxshow;
m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0); m_frameBuffer->paintBoxRel(m_x + m_width - 15, m_item_y, 15, sb, COL_SCROLLBAR_PLUS_0);
unsigned int tmp = m_listmaxshow ? m_listmaxshow : 1;//avoid division by zero unsigned int tmp = m_listmaxshow ? m_listmaxshow : 1;//avoid division by zero
int sbc = ((max + offset - 1) / tmp) + 1; int sbc = ((max + offset - 1) / tmp) + 1;
int sbs = ((selected + offset) / tmp); int sbs = ((selected + offset) / tmp);

2
src/gui/widget/listbox.cpp
View File

@@ -69,7 +69,7 @@ void CListBox::paint()
int ypos = y+ theight; int ypos = y+ theight;
int sb = fheight* listmaxshow; 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= ((getItemCount()- 1)/ listmaxshow)+ 1; int sbc= ((getItemCount()- 1)/ listmaxshow)+ 1;
if (sbc < 1) if (sbc < 1)

2
src/gui/widget/listframe.cpp
View File

@@ -385,7 +385,7 @@ void CListFrame::refreshScroll(void)
if (m_nNrOfPages > 1) if (m_nNrOfPages > 1)
{ {
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY,
m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_SCROLLBAR_PASSIVE_PLUS_0, RADIUS_MIN); m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_SCROLLBAR_PLUS_0, RADIUS_MIN);
unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*OFFSET_INNER_MIN) / m_nNrOfPages; unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*OFFSET_INNER_MIN) / m_nNrOfPages;
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + OFFSET_INNER_MIN+m_cFrame.iX, frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + OFFSET_INNER_MIN+m_cFrame.iX,
m_cFrameScrollRel.iY + OFFSET_INNER_MIN + m_nCurrentPage * marker_size +m_cFrame.iY, m_cFrameScrollRel.iY + OFFSET_INNER_MIN + m_nCurrentPage * marker_size +m_cFrame.iY,

2
src/gui/widget/textbox.cpp
View File

@@ -527,7 +527,7 @@ void CTextBox::refreshScroll(void)
{ {
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY, frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY,
m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight,
COL_SCROLLBAR_PASSIVE_PLUS_0, RADIUS_MIN); COL_SCROLLBAR_PLUS_0, RADIUS_MIN);
unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*SCROLL_MARKER_BORDER) / m_nNrOfPages; unsigned int marker_size = (m_cFrameScrollRel.iHeight - 2*SCROLL_MARKER_BORDER) / m_nNrOfPages;
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + SCROLL_MARKER_BORDER + m_cFrame.iX, frameBuffer->paintBoxRel(m_cFrameScrollRel.iX + SCROLL_MARKER_BORDER + m_cFrame.iX,
m_cFrameScrollRel.iY + SCROLL_MARKER_BORDER + m_nCurrentPage * marker_size + m_cFrame.iY, m_cFrameScrollRel.iY + SCROLL_MARKER_BORDER + m_nCurrentPage * marker_size + m_cFrame.iY,