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

CInfoViewer: allign vizualized record mode icon

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 163df1f149
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2018-01-03 22:35:01 +01:00
committed by vanhofen
parent 2d36f08ca0
commit 142041acd2
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/infoviewer.cpp
View File

@@ -322,18 +322,19 @@ void CInfoViewer::showRecordIcon (const bool show)
int box_w = 0; int box_w = 0;
int box_h = txt_h; int box_h = txt_h;
int icon_space = OFFSET_SHADOW/2; int icon_space = OFFSET_INTER;
int rec_icon_x = 0, rec_icon_w = 0, rec_icon_h = 0; int rec_icon_x = 0, rec_icon_w = 0, rec_icon_h = 0;
int ts_icon_x = 0, ts_icon_w = 0, ts_icon_h = 0; int ts_icon_x = 0, ts_icon_w = 0, ts_icon_h = 0;
frameBuffer->getIconSize(rec_icon.c_str(), &rec_icon_w, &rec_icon_h); frameBuffer->getIconSize(rec_icon.c_str(), &rec_icon_w, &rec_icon_h);
frameBuffer->getIconSize(ts_icon.c_str(), &ts_icon_w, &ts_icon_h); frameBuffer->getIconSize(ts_icon.c_str(), &ts_icon_w, &ts_icon_h);
int icon_h = std::max(rec_icon_h, ts_icon_h); int icon_h = std::max(rec_icon_h, ts_icon_h);
box_h = std::max(box_h, icon_h+icon_space*2); box_h = std::max(box_h, icon_h);
box_h += icon_space;
int icon_y = box_y + (box_h - icon_h)/2;
int icon_y = box_y + box_h/2 - icon_h/2;
int txt_y = box_y + (box_h + txt_h)/2; int txt_y = box_y + (box_h + txt_h)/2;
char records_msg[8]; char records_msg[8];
@@ -343,13 +344,13 @@ void CInfoViewer::showRecordIcon (const bool show)
snprintf(records_msg, sizeof(records_msg)-1, "%d%s", records, "x"); snprintf(records_msg, sizeof(records_msg)-1, "%d%s", records, "x");
txt_w = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(records_msg); txt_w = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(records_msg);
box_w = rec_icon_w + txt_w + icon_space*5; box_w = rec_icon_w + txt_w + icon_space*3;
rec_icon_x = box_x + icon_space*2; rec_icon_x = box_x + icon_space;
} }
else if (rec_mode == CRecordManager::RECMODE_TSHIFT) else if (rec_mode == CRecordManager::RECMODE_TSHIFT)
{ {
box_w = ts_icon_w + icon_space*4; box_w = ts_icon_w + icon_space*2;
ts_icon_x = box_x + icon_space*2; ts_icon_x = box_x + icon_space;
} }
else if (rec_mode == CRecordManager::RECMODE_REC_TSHIFT) else if (rec_mode == CRecordManager::RECMODE_REC_TSHIFT)
{ {
@@ -358,9 +359,9 @@ void CInfoViewer::showRecordIcon (const bool show)
snprintf(records_msg, sizeof(records_msg)-1, "%d%s", records, "x"); snprintf(records_msg, sizeof(records_msg)-1, "%d%s", records, "x");
txt_w = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(records_msg); txt_w = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(records_msg);
box_w = ts_icon_w + rec_icon_w + txt_w + icon_space*7; box_w = ts_icon_w + rec_icon_w + txt_w + icon_space*5;
ts_icon_x = box_x + icon_space*2; ts_icon_x = box_x + icon_space;
rec_icon_x = ts_icon_x + ts_icon_w + icon_space*2; rec_icon_x = ts_icon_x + ts_icon_w + icon_space;
} }
if (show) if (show)
@@ -382,16 +383,16 @@ void CInfoViewer::showRecordIcon (const bool show)
if (rec_mode == CRecordManager::RECMODE_REC) if (rec_mode == CRecordManager::RECMODE_REC)
{ {
frameBuffer->paintIcon(rec_icon, rec_icon_x, icon_y); paintImage(rec_icon, rec_icon_x, icon_y);
} }
else if (rec_mode == CRecordManager::RECMODE_TSHIFT) else if (rec_mode == CRecordManager::RECMODE_TSHIFT)
{ {
frameBuffer->paintIcon(ts_icon, ts_icon_x, icon_y); paintImage(ts_icon, ts_icon_x, icon_y);
} }
else if (rec_mode == CRecordManager::RECMODE_REC_TSHIFT) else if (rec_mode == CRecordManager::RECMODE_REC_TSHIFT)
{ {
frameBuffer->paintIcon(rec_icon, rec_icon_x, icon_y); paintImage(rec_icon, rec_icon_x, icon_y);
frameBuffer->paintIcon(ts_icon, ts_icon_x, icon_y); paintImage(ts_icon, ts_icon_x, icon_y);
} }
} }
else else