mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 10:21:04 +02:00
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
acinclude.m4
lib/hardware/coolstream/hardware_caps.cpp
src/Makefile.am
src/driver/screenshot.cpp
src/gui/epgplus.cpp
src/gui/scan_setup.cpp
src/neutrino.cpp
src/zapit/src/frontend.cpp
Origin commit data
------------------
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
This commit is contained in:
@@ -1443,14 +1443,10 @@ void EpgPlus::paint()
|
||||
this->timeLine->paintGrid();
|
||||
|
||||
// paint slider
|
||||
int total_pages;
|
||||
int current_page;
|
||||
getScrollBarData(&total_pages, ¤t_page,
|
||||
this->channelList->getSize(),
|
||||
this->maxNumberOfDisplayableEntries,
|
||||
this->selectedChannelEntry == NULL ? 0 : this->selectedChannelEntry->index);
|
||||
int total_pages = ((this->channelList->getSize() - 1) / this->maxNumberOfDisplayableEntries) + 1;
|
||||
int current_page = this->selectedChannelEntry == NULL ? 0 : (this->selectedChannelEntry->index / this->maxNumberOfDisplayableEntries);
|
||||
|
||||
paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL);
|
||||
paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page);
|
||||
}
|
||||
|
||||
// -- EPG+ Menue Handler Class
|
||||
|
Reference in New Issue
Block a user