From 71213a44adc8a448b60d3915db8d22bed7dde12d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 2 Jan 2017 23:51:12 +0100 Subject: [PATCH] infoviewer_bb: use OFFSET defines in getBBIconInfo() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b48c6579911ff5f330189d11221df99b186fdc49 Author: vanhofen 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 --- src/gui/infoviewer_bb.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index fb95da0db..1545c2baf 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -147,7 +147,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++) { @@ -190,7 +190,9 @@ void CInfoViewerBB::getBBIconInfo() break; } if (iconView) { - bbIconMinX -= w + 2; + if (i > 0) + bbIconMinX -= OFFSET_INNER_MIN; + bbIconMinX -= w; bbIconInfo[i].x = bbIconMinX; bbIconInfo[i].h = h; } @@ -202,7 +204,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_MIN; } void CInfoViewerBB::getBBButtonInfo()