Replace color indexes of the text colors by real color values for RenderString()

- If necessary, Correct data types of the color values
This commit is contained in:
Michael Liebmann
2013-07-11 09:41:27 +02:00
committed by Thilo Graf
parent e60067545f
commit c60c5c5ce3
52 changed files with 341 additions and 336 deletions

View File

@@ -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;
}
}