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

- infoviewer: fix overlaps on buttons while zapping

Browse Source
This commit is contained in:
svenhoefer
2016-01-22 10:49:45 +01:00
parent cb7895d981
commit 23242e605c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -1368,7 +1368,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
if ((*(t_channel_id *) data) == current_channel_id) { if ((*(t_channel_id *) data) == current_channel_id) {
if (is_visible && showButtonBar) { if (is_visible && showButtonBar) {
infoViewerBB->showIcon_DD(); infoViewerBB->showIcon_DD();
infoViewerBB->showBBButtons(); // in case button text has changed infoViewerBB->showBBButtons(true /*paintFooter*/); // in case button text has changed
} }
if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio)) if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio))
g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid); g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid);
@@ -1377,7 +1377,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
} else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) { } else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) {
if ((*(t_channel_id *) data) == current_channel_id) { if ((*(t_channel_id *) data) == current_channel_id) {
if (is_visible && showButtonBar) if (is_visible && showButtonBar)
infoViewerBB->showBBButtons(); // in case button text has changed infoViewerBB->showBBButtons(true /*paintFooter*/); // in case button text has changed
} }
return messages_return::handled; return messages_return::handled;
} else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) { } else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) {

4
src/gui/infoviewer_bb.cpp
View File

@@ -377,7 +377,7 @@ void CInfoViewerBB::getBBButtonInfo()
} }
} }
void CInfoViewerBB::showBBButtons(const int modus) void CInfoViewerBB::showBBButtons(bool paintFooter)
{ {
if (!is_visible) if (!is_visible)
return; return;
@@ -406,7 +406,7 @@ void CInfoViewerBB::showBBButtons(const int modus)
int buf_y = BBarY; int buf_y = BBarY;
int buf_w = g_InfoViewer->BoxEndX-buf_x; int buf_w = g_InfoViewer->BoxEndX-buf_x;
int buf_h = InfoHeightY_Info; int buf_h = InfoHeightY_Info;
if (modus != -1) { if (paintFooter) {
pixbuf = new fb_pixel_t[buf_w * buf_h]; pixbuf = new fb_pixel_t[buf_w * buf_h];
//printf("\nbuf_x: %d, buf_y: %d, buf_w: %d, buf_h: %d, pixbuf: %p\n \n", buf_x, buf_y, buf_w, buf_h, pixbuf); //printf("\nbuf_x: %d, buf_y: %d, buf_w: %d, buf_h: %d, pixbuf: %p\n \n", buf_x, buf_y, buf_w, buf_h, pixbuf);
frameBuffer->SaveScreen(buf_x, buf_y, buf_w, buf_h, pixbuf); frameBuffer->SaveScreen(buf_x, buf_y, buf_w, buf_h, pixbuf);

2
src/gui/infoviewer_bb.h
View File

@@ -143,7 +143,7 @@ class CInfoViewerBB
void showIcon_Resolution(); void showIcon_Resolution();
void showIcon_Tuner(void); void showIcon_Tuner(void);
void showIcon_DD(void); void showIcon_DD(void);
void showBBButtons(const int modus=-1); void showBBButtons(bool paintFooter = false);
void paintshowButtonBar(); void paintshowButtonBar();
void getBBButtonInfo(void); void getBBButtonInfo(void);
void reset_allScala(void); void reset_allScala(void);