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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: b3ae2c924c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-04 (Sat, 04 Jun 2016)
This commit is contained in:
vanhofen
2016-06-04 22:03:48 +02:00
parent 951f91ec1d e607a775bf
commit 1e4ad90d35
6 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/audioplayer.cpp
View File

@@ -1829,7 +1829,10 @@ void CAudioPlayerGui::paint()
{ {
if (m_show_playlist) if (m_show_playlist)
{ {
m_liststart = (m_selected / m_listmaxshow) * m_listmaxshow; unsigned int tmp_max = m_listmaxshow;
if(!tmp_max)
tmp_max = 1;
m_liststart = (m_selected / tmp_max) * m_listmaxshow;
paintHead(); paintHead();
for (unsigned int count=0; count<m_listmaxshow; count++) for (unsigned int count=0; count<m_listmaxshow; count++)
paintItem(count); paintItem(count);
@@ -1838,8 +1841,8 @@ void CAudioPlayerGui::paint()
int sb = m_fheight * m_listmaxshow; int sb = m_fheight * m_listmaxshow;
m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_MENUCONTENT_PLUS_1); m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc = ((m_playlist.size() - 1) / m_listmaxshow) + 1; int sbc = ((m_playlist.size() - 1) / tmp_max) + 1;
int sbs = (m_selected / m_listmaxshow); int sbs = (m_selected / tmp_max);
if (sbc < 1) if (sbc < 1)
sbc = 1; sbc = 1;

6
src/gui/bookmarkmanager.cpp
View File

@@ -469,8 +469,10 @@ 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_MENUCONTENT_PLUS_1); frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
unsigned int tmp_max = listmaxshow;
int sbc= ((bookmarks.size()- 1)/ listmaxshow)+ 1; if(!tmp_max)
tmp_max = 1;
int sbc= ((bookmarks.size()- 1)/ tmp_max)+ 1;
if (sbc < 1) if (sbc < 1)
sbc = 1; sbc = 1;

7
src/gui/pictureviewer.cpp
View File

@@ -772,8 +772,11 @@ void CPictureViewerGui::paint()
int sb = fheight* listmaxshow; int sb = fheight* listmaxshow;
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1); frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((playlist.size()- 1)/ listmaxshow)+ 1; unsigned int tmp_max = listmaxshow;
int sbs= (selected/listmaxshow); if(!tmp_max)
tmp_max = 1;
int sbc= ((playlist.size()- 1)/ tmp_max)+ 1;
int sbs= (selected/tmp_max);
if (sbc < 1) if (sbc < 1)
sbc = 1; sbc = 1;

6
src/gui/timerlist.cpp
View File

@@ -881,8 +881,10 @@ 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_MENUCONTENT_PLUS_1); frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
unsigned int tmp_max = listmaxshow;
int sbc= ((timerlist.size()- 1)/ listmaxshow)+ 1; 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_MENUCONTENT_PLUS_3, RADIUS_SMALL); frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ page_nr * (sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
} }

8
src/gui/upnpbrowser.cpp
View File

@@ -971,9 +971,11 @@ void CUpnpBrowserGui::paintDevices()
ypos = m_y + m_title_height + m_theight; 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_MENUCONTENT_PLUS_1); m_frameBuffer->paintBoxRel(m_x + m_width - 15, ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
unsigned int tmp_max = m_listmaxshow;
int sbc = ((m_devices.size() - 1) / m_listmaxshow) + 1; if(!tmp_max)
int sbs = ((m_selecteddevice) / m_listmaxshow); tmp_max = 1;
int sbc = ((m_devices.size() - 1) / tmp_max) + 1;
int sbs = ((m_selecteddevice) / tmp_max);
m_frameBuffer->paintBoxRel(m_x + m_width - 13, ypos + 2 + sbs*(sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3); m_frameBuffer->paintBoxRel(m_x + m_width - 13, ypos + 2 + sbs*(sb-4)/sbc, 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3);

19
src/system/localize.cpp
View File

@@ -223,17 +223,18 @@ CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const l
fclose(fd); fclose(fd);
if(buf) if(buf)
free(buf); free(buf);
char *_mem = (char *) realloc(*mem, memp - *mem); if(memp - *mem > 0){
if (_mem) { char *_mem = (char *) realloc(*mem, memp - *mem);
if (_mem != *mem) { if (_mem) {
// most likely doesn't happen if (_mem != *mem) {
for(unsigned int i = 1; i < sizeof(locale_real_names)/sizeof(const char *); i++) // most likely doesn't happen
if (loadData[i] != locale_real_names[i]) for(unsigned int i = 1; i < sizeof(locale_real_names)/sizeof(const char *); i++)
loadData[i] -= *mem - _mem; if (loadData[i] != locale_real_names[i])
*mem = _mem; loadData[i] -= *mem - _mem;
*mem = _mem;
}
} }
} }
for (unsigned j = 1; j < (sizeof(locale_real_names)/sizeof(const char *)); j++) for (unsigned j = 1; j < (sizeof(locale_real_names)/sizeof(const char *)); j++)
if (loadData[j] == locale_real_names[j]) if (loadData[j] == locale_real_names[j])
{ {