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

infoviewer_bb: use OFFSET defines in getBBIconInfo()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b48c657991
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines in getBBIconInfo()

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-01-02 23:51:12 +01:00
parent 017064916e
commit 71213a44ad
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/infoviewer_bb.cpp
View File

@@ -147,7 +147,7 @@ void CInfoViewerBB::getBBIconInfo()
initBBOffset(); initBBOffset();
BBarY = g_InfoViewer->BoxEndY + bottom_bar_offset; BBarY = g_InfoViewer->BoxEndY + bottom_bar_offset;
BBarFontY = BBarY + InfoHeightY_Info - (InfoHeightY_Info - g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()) / 2; /* center in buttonbar */ BBarFontY = BBarY + InfoHeightY_Info - (InfoHeightY_Info - g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()) / 2; /* center in buttonbar */
bbIconMinX = g_InfoViewer->BoxEndX - 8; //should be 10px, but 2px will be reduced for each icon bbIconMinX = g_InfoViewer->BoxEndX - OFFSET_INNER_MID;
CNeutrinoApp* neutrino = CNeutrinoApp::getInstance(); CNeutrinoApp* neutrino = CNeutrinoApp::getInstance();
for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) { for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) {
@@ -190,7 +190,9 @@ void CInfoViewerBB::getBBIconInfo()
break; break;
} }
if (iconView) { if (iconView) {
bbIconMinX -= w + 2; if (i > 0)
bbIconMinX -= OFFSET_INNER_MIN;
bbIconMinX -= w;
bbIconInfo[i].x = bbIconMinX; bbIconInfo[i].x = bbIconMinX;
bbIconInfo[i].h = h; bbIconInfo[i].h = h;
} }
@@ -202,7 +204,7 @@ void CInfoViewerBB::getBBIconInfo()
bbIconMaxH = std::max(bbIconMaxH, bbIconInfo[i].h); bbIconMaxH = std::max(bbIconMaxH, bbIconInfo[i].h);
} }
if (g_settings.infobar_show_sysfs_hdd) if (g_settings.infobar_show_sysfs_hdd)
bbIconMinX -= hddwidth + 2; bbIconMinX -= hddwidth + OFFSET_INNER_MIN;
} }
void CInfoViewerBB::getBBButtonInfo() void CInfoViewerBB::getBBButtonInfo()