mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

eventlist: cleanup from unnecessary calculations

Browse Source 
Origin commit data
------------------
Commit: 24a4277863
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-30 (Tue, 30 Apr 2013)

Origin message was:
------------------
- eventlist: cleanup from unnecessary calculations
This commit is contained in:
vanhofen
2013-04-30 16:22:59 +02:00
parent 773449e26b
commit 3ef5238f77
1 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gui/eventlist.cpp
View File

@@ -97,15 +97,14 @@ CNeutrinoEventList::CNeutrinoEventList()
m_search_channel_id = 1; m_search_channel_id = 1;
m_search_bouquet_id= 1; m_search_bouquet_id= 1;
full_width = width = fw = 0; full_width = width = 0;
height = fh = 0; height = 0;
x = y = 0; x = y = 0;
cc_infozone = NULL; cc_infozone = NULL;
infozone_text = ""; infozone_text = "";
item_event_ID = 0; item_event_ID = 0;
FunctionBarHeight = 0;
oldIndex = -1; oldIndex = -1;
oldEventID = -1; oldEventID = -1;
bgRightBoxPaint = false; bgRightBoxPaint = false;
@@ -240,11 +239,6 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
neutrino_msg_data_t data; neutrino_msg_data_t data;
bool in_search = false; bool in_search = false;
showfollow = false; showfollow = false;
// Calculate iheight
struct button_label tmp_button[1] = { { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE } };
fw = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getWidth(); //font width
fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); //font height
full_width = frameBuffer->getScreenWidthRel(); full_width = frameBuffer->getScreenWidthRel();
x = getScreenStartX(full_width); x = getScreenStartX(full_width);
@@ -255,17 +249,14 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
width = full_width; width = full_width;
height = frameBuffer->getScreenHeightRel(); height = frameBuffer->getScreenHeightRel();
// Calculate iheight (we assume the red button is the largest one?)
struct button_label tmp_button[1] = { { NEUTRINO_ICON_BUTTON_RED, LOCALE_EVENTLISTBAR_RECORDEVENT } };
iheight = ::paintButtons(0, 0, 0, 1, tmp_button, 0, 0, "", false, COL_INFOBAR_SHADOW, NULL, 0, false); iheight = ::paintButtons(0, 0, 0, 1, tmp_button, 0, 0, "", false, COL_INFOBAR_SHADOW, NULL, 0, false);
if(iheight < fh)
iheight = fh;
// Calculate theight // Calculate theight
theight = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->getHeight(); theight = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->getHeight();
const int pic_h = 39; const int pic_h = 39;
theight = std::max(theight, pic_h); theight = std::max(theight, pic_h);
int icol_w = 0, icol_h = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h);
theight = std::max(theight, icol_h);
fheight1 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]->getHeight(); fheight1 = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]->getHeight();
{ {
@@ -692,8 +683,6 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
void CNeutrinoEventList::hide() void CNeutrinoEventList::hide()
{ {
frameBuffer->paintBackgroundBoxRel(x,y, full_width,height); frameBuffer->paintBackgroundBoxRel(x,y, full_width,height);
showFunctionBar (false, 0);
} }
CTimerd::CTimerEventTypes CNeutrinoEventList::isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID) CTimerd::CTimerEventTypes CNeutrinoEventList::isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID)
@@ -929,11 +918,16 @@ void CNeutrinoEventList::paint(t_channel_id channel_id)
void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id) void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
{ {
int border_space = 4; int bx = x;
int bx = x + 2*border_space; int bw = full_width;
int bw = full_width - 16;
int bh = iheight; int bh = iheight;
int by = y + height-iheight; int by = y + height - bh;
if (! show) {
// -- hide only?
frameBuffer->paintBackgroundBoxRel(bx,by,bw,bh);
return;
}
CColorKeyHelper keyhelper; //user_menue.h CColorKeyHelper keyhelper; //user_menue.h
neutrino_msg_t dummy = CRCInput::RC_nokey; neutrino_msg_t dummy = CRCInput::RC_nokey;
@@ -941,17 +935,6 @@ void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
struct button_label buttons[5]; struct button_label buttons[5];
int btn_cnt = 0; int btn_cnt = 0;
bh = std::max(FunctionBarHeight, bh);
frameBuffer->paintBackgroundBoxRel(x,by,full_width,bh);
// -- hide only?
if (! show) return;
int icol_w, icol_h;
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
// int fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
frameBuffer->paintBoxRel(x, by, full_width, iheight, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_MID, CORNER_BOTTOM);
int tID = -1; //any value, not NULL int tID = -1; //any value, not NULL
CTimerd::CTimerEventTypes is_timer = isScheduled(channel_id, &evtlist[selected], &tID); CTimerd::CTimerEventTypes is_timer = isScheduled(channel_id, &evtlist[selected], &tID);
@@ -1006,7 +989,7 @@ void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id)
btn_cnt++; btn_cnt++;
} }
FunctionBarHeight = std::max(::paintButtons(bx, by, bw, btn_cnt, buttons, bw), FunctionBarHeight); ::paintButtons(bx, by, bw, btn_cnt, buttons, bw, bh);
} }
int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)