mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values
Origin commit data
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -259,9 +259,9 @@ void CScreenSetup::paintIcons(int pselected)
|
||||
frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, x_box + 5, y_box+BoxHeight, BoxHeight);
|
||||
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_box + icol_w + 10, y_box + BoxHeight, BoxWidth,
|
||||
g_Locale->getText(LOCALE_SCREENSETUP_UPPERLEFT ), (pselected == 0) ? COL_MENUCONTENTSELECTED:COL_MENUCONTENT , 0, true); // UTF-8
|
||||
g_Locale->getText(LOCALE_SCREENSETUP_UPPERLEFT ), (pselected == 0) ? COL_MENUCONTENTSELECTED_TEXT:COL_MENUCONTENT_TEXT , 0, true); // UTF-8
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x_box + icol_w + 10, y_box + BoxHeight * 2, BoxWidth,
|
||||
g_Locale->getText(LOCALE_SCREENSETUP_LOWERRIGHT), (pselected == 1) ? COL_MENUCONTENTSELECTED:COL_MENUCONTENT, 0, true); // UTF-8
|
||||
g_Locale->getText(LOCALE_SCREENSETUP_LOWERRIGHT), (pselected == 1) ? COL_MENUCONTENTSELECTED_TEXT:COL_MENUCONTENT_TEXT, 0, true); // UTF-8
|
||||
}
|
||||
|
||||
void CScreenSetup::paintBorderUL()
|
||||
@@ -296,7 +296,7 @@ void CScreenSetup::paintCoords()
|
||||
/* the code is smaller with this loop instead of open-coded 4x RenderString() :-) */
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
f->RenderString(x2, y2, w, str[i], COL_MENUCONTENT);
|
||||
f->RenderString(x2, y2, w, str[i], COL_MENUCONTENT_TEXT);
|
||||
y2 += fh;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user