mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- epgplus: use CComponenentsFooter to paint buttonbar

Browse Source
This commit is contained in:
vanhofen
2017-04-08 14:11:28 +02:00
committed by svenhoefer
parent df49551258
commit 0ee10f1516
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/epgplus.cpp
View File

@@ -516,8 +516,8 @@ void EpgPlus::Footer::paintEventDetails(const std::string & description, const s
struct button_label buttonLabels[] = struct button_label buttonLabels[] =
{ {
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_EPGPLUS_ACTIONS }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_EPGPLUS_ACTIONS },
{NEUTRINO_ICON_BUTTON_GREEN, LOCALE_EPGPLUS_PREV_BOUQUET /*LOCALE_EPGPLUS_PAGE_UP*/}, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_EPGPLUS_PREV_BOUQUET },
{NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_EPGPLUS_NEXT_BOUQUET /*LOCALE_EPGPLUS_PAGE_DOWN*/}, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_EPGPLUS_NEXT_BOUQUET },
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGPLUS_OPTIONS }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_EPGPLUS_OPTIONS },
{ NEUTRINO_ICON_BUTTON_INFO_SMALL,LOCALE_EPGMENU_EVENTINFO } { NEUTRINO_ICON_BUTTON_INFO_SMALL,LOCALE_EPGMENU_EVENTINFO }
}; };
@@ -525,7 +525,8 @@ struct button_label buttonLabels[] =
void EpgPlus::Footer::paintButtons(button_label * pbuttonLabels, int numberOfButtons) void EpgPlus::Footer::paintButtons(button_label * pbuttonLabels, int numberOfButtons)
{ {
int buttonWidth = (this->width); int buttonWidth = (this->width);
::paintButtons(this->x, this->buttonY, buttonWidth, numberOfButtons, pbuttonLabels, buttonWidth, buttonHeight); CComponentsFooter _footer;
_footer.paintButtons(this->x, this->buttonY, buttonWidth, buttonHeight, numberOfButtons, pbuttonLabels, buttonWidth/numberOfButtons);
} }
EpgPlus::EpgPlus() EpgPlus::EpgPlus()
@@ -710,7 +711,7 @@ void EpgPlus::init()
int timeLineHeight = TimeLine::getUsedHeight(); int timeLineHeight = TimeLine::getUsedHeight();
this->entryHeight = ChannelEntry::getUsedHeight(); this->entryHeight = ChannelEntry::getUsedHeight();
int buttonHeight = ::paintButtons(0, 0, 0, sizeof(buttonLabels)/sizeof(button_label), buttonLabels, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); int buttonHeight = headerHeight;
int footerHeight = Footer::getUsedHeight(); int footerHeight = Footer::getUsedHeight();