mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Erase the event list from the display fixed.

Browse Source 
- Related with custom icons.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1795 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2011-10-29 18:03:32 +00:00
parent b1c888e38e
commit 6d9b72ed15
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/eventlist.cpp
View File

@@ -111,6 +111,7 @@ EventList::EventList()
y = frameBuffer->getScreenY() + (frameBuffer->getScreenHeight() - height) / 2; y = frameBuffer->getScreenY() + (frameBuffer->getScreenHeight() - height) / 2;
item_event_ID = 0; item_event_ID = 0;
FunctionBarHeight = 0;
} }
EventList::~EventList() EventList::~EventList()
@@ -952,6 +953,7 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id)
const char * icon = NULL; const char * icon = NULL;
std::string btncaption; std::string btncaption;
bh = std::max(FunctionBarHeight, bh);
frameBuffer->paintBackgroundBoxRel(x,by,width,bh); frameBuffer->paintBackgroundBoxRel(x,by,width,bh);
// -- hide only? // -- hide only?
if (! show) return; if (! show) return;
@@ -980,13 +982,13 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id)
EventListFirstButton[0].locale = LOCALE_EVENTLISTBAR_RECORDEVENT; EventListFirstButton[0].locale = LOCALE_EVENTLISTBAR_RECORDEVENT;
} }
::paintButtons(bx, by, w_button, NUM_EVENTLIST_FIRST_BUTTON, EventListFirstButton); FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_FIRST_BUTTON, EventListFirstButton), FunctionBarHeight);
bx+=w_button+4; bx+=w_button+4;
} }
} }
// Button: Search // Button: Search
::paintButtons(bx, by, w_button, NUM_EVENTLIST_SECOND_BUTTON, EventListSecondButton); FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_SECOND_BUTTON, EventListSecondButton), FunctionBarHeight);
bx+=w_button+4; bx+=w_button+4;
// Button: Timer Channelswitch // Button: Timer Channelswitch
@@ -1004,7 +1006,7 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id)
} }
} }
::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListThirdButton); FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListThirdButton), FunctionBarHeight);
bx+=w_button+4; bx+=w_button+4;
} }
@@ -1013,7 +1015,7 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id)
// FIXME : display other icons depending on g_settings.key_channelList_sort // FIXME : display other icons depending on g_settings.key_channelList_sort
keyhelper.get(&dummy, &icon, g_settings.key_channelList_sort); keyhelper.get(&dummy, &icon, g_settings.key_channelList_sort);
EventListFourthButton[0].button = icon; EventListFourthButton[0].button = icon;
::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListFourthButton); FunctionBarHeight = std::max(::paintButtons(bx, by, w_button, NUM_EVENTLIST_THIRD_BUTTON, EventListFourthButton), FunctionBarHeight);
// bx+=w_button+4; // bx+=w_button+4;
} }
} }

1
src/gui/eventlist.h
View File

@@ -76,6 +76,7 @@ class EventList
t_channel_id m_search_channel_id; t_channel_id m_search_channel_id;
t_bouquet_id m_search_bouquet_id; t_bouquet_id m_search_bouquet_id;
bool m_showChannel; bool m_showChannel;
int FunctionBarHeight;
bool findEvents(void); bool findEvents(void);
// Eventfinder end // Eventfinder end