From 8dad13496ea2ca545d28191d15f49e5aaddbb361 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 29 Oct 2011 18:03:32 +0000 Subject: [PATCH] Erase the event list from the display fixed. - Related with custom icons. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1795 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/6d9b72ed1552956ce77ccc763160df58c4b4063b Author: Michael Liebmann Date: 2011-10-29 (Sat, 29 Oct 2011) --- src/gui/eventlist.cpp | 10 ++++++---- src/gui/eventlist.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 45377d5a3..3b44601d4 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -111,6 +111,7 @@ EventList::EventList() y = frameBuffer->getScreenY() + (frameBuffer->getScreenHeight() - height) / 2; item_event_ID = 0; + FunctionBarHeight = 0; } EventList::~EventList() @@ -952,6 +953,7 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id) const char * icon = NULL; std::string btncaption; + bh = std::max(FunctionBarHeight, bh); frameBuffer->paintBackgroundBoxRel(x,by,width,bh); // -- hide only? if (! show) return; @@ -980,13 +982,13 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id) 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; } } // 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; // 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; } @@ -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 keyhelper.get(&dummy, &icon, g_settings.key_channelList_sort); 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; } } diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h index 03fe325e7..9b0dc8755 100644 --- a/src/gui/eventlist.h +++ b/src/gui/eventlist.h @@ -76,6 +76,7 @@ class EventList t_channel_id m_search_channel_id; t_bouquet_id m_search_bouquet_id; bool m_showChannel; + int FunctionBarHeight; bool findEvents(void); // Eventfinder end