mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +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-07 16:30:35 +02:00
parent ca83324763 628e8ea3e4
commit 12b5248e4e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/filebrowser.cpp
View File

@@ -1473,7 +1473,7 @@ void CFileBrowser::paint()
paintItem(count); paintItem(count);
//scrollbar //scrollbar
int total_pages = ((filelist.size() - 1) / listmaxshow) + 1; int total_pages = filelist.size() == 0 ? 1 : ((filelist.size() - 1) / listmaxshow) + 1;
int current_page = (selected / listmaxshow); int current_page = (selected / listmaxshow);
paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page); paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);

2
src/gui/record_setup.cpp
View File

@@ -350,7 +350,7 @@ void CRecordSetup::showRecordTimerSetup(CMenuWidget *menu_timersettings)
menu_timersettings->addItem(GenericMenuSeparatorLine); menu_timersettings->addItem(GenericMenuSeparatorLine);
//allow followscreenings //allow followscreenings
CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); CMenuOptionChooser* followscreenings = new CMenuOptionChooser(LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS, &g_settings.timer_followscreenings, timer_followscreenings_options, timer_followscreenings_options_count, true);
followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS); followscreenings->setHint("", LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS);
menu_timersettings->addItem(followscreenings); menu_timersettings->addItem(followscreenings);
} }