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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
This commit is contained in:
vanhofen
2017-01-02 23:55:23 +01:00
parent b554e7801c e5df342b4f
commit 8c27915df5
63 changed files with 172 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/infoviewer_bb.cpp
View File

@@ -164,7 +164,7 @@ void CInfoViewerBB::getBBIconInfo()
initBBOffset();
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 */
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();
for (int i = 0; i < CInfoViewerBB::ICON_MAX; i++) {
@@ -207,7 +207,9 @@ void CInfoViewerBB::getBBIconInfo()
break;
}
if (iconView) {
bbIconMinX -= w + 2;
if (i > 0)
bbIconMinX -= OFFSET_INNER_SMALL; //NI
bbIconMinX -= w;
bbIconInfo[i].x = bbIconMinX;
bbIconInfo[i].h = h;
}
@@ -219,7 +221,7 @@ void CInfoViewerBB::getBBIconInfo()
bbIconMaxH = std::max(bbIconMaxH, bbIconInfo[i].h);
}
if (g_settings.infobar_show_sysfs_hdd)
bbIconMinX -= hddwidth + 2;
bbIconMinX -= hddwidth + OFFSET_INNER_MID; //NI
}
void CInfoViewerBB::getBBButtonInfo()
@@ -799,7 +801,7 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o
} else {
icon_space_offset += icon_sizeW[icon_map[caid].first];
px = endx - icon_space_offset;
icon_space_offset += 4;
icon_space_offset += icon_space; //NI
}
if (px) {
@@ -1026,7 +1028,7 @@ void CInfoViewerBB::paint_cam_icons()
int emu_pic_startx = g_InfoViewer->ChanInfoX + (g_settings.infobar_casystem_frame ? 20 : 10);
int py = g_InfoViewer->BoxEndY + (g_settings.infobar_casystem_frame ? 4 : 2);
const char *icon_name[] = {"mgcamd","doscam","oscam","osemu","newcs","gbox"};
static int icon_space[] = {14,14,14,14,14,14};
static int icon_space[] = {10,10,10,10,10,10};
int icon_sizeH = 0;
int icon_sizeW = 0;
bool useCI = CCamManager::getInstance()->getUseCI();