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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
This commit is contained in:
vanhofen
2016-08-15 19:08:28 +02:00
parent a2fdd5e661 e49ee18fb3
commit 2be5df305e
28 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/hdd_info.cpp
View File

@@ -238,7 +238,7 @@ void CHDDInfoWidget::paint(const std::string &Key)
int hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
int mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
int sheight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
int sheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight();
int offset = 20;
int bheight = offset + locale_itemsCount*mheight + offset; // body height
@@ -401,10 +401,10 @@ void CHDDInfoWidget::paint(const std::string &Key)
}
// footer with centered content
int wtmp = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(g_Locale->getText(LOCALE_HDD_INFO_INFO));
int wtmp = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getRenderWidth(g_Locale->getText(LOCALE_HDD_INFO_INFO));
xpos = x + width/2 - wtmp/2;
ypos = y + hheight + bheight + offset/4 + sheight;
g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(xpos, ypos, wtmp, g_Locale->getText(LOCALE_HDD_INFO_INFO), COL_MENUCONTENTINACTIVE_TEXT);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->RenderString(xpos, ypos, wtmp, g_Locale->getText(LOCALE_HDD_INFO_INFO), COL_MENUCONTENTINACTIVE_TEXT);
// finally paint data
xpos = x + offset + locwidth + sepwidth;