mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
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:
@@ -259,7 +259,7 @@ void CDBoxInfoWidget::paint()
|
||||
if (p)
|
||||
hw=++p;
|
||||
hw+=" Info";
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10, y + hheight+1, width - 10, hw.c_str(), COL_MENUHEAD, 0, true); // UTF-8
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->RenderString(x+10, y + hheight+1, width - 10, hw.c_str(), COL_MENUHEAD_TEXT, 0, true); // UTF-8
|
||||
break;
|
||||
}
|
||||
i++;
|
||||
@@ -267,7 +267,7 @@ void CDBoxInfoWidget::paint()
|
||||
continue;
|
||||
if (read > 0 && buffer[read-1] == '\n')
|
||||
buffer[read-1] = '\0';
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, buffer, COL_MENUCONTENT);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, buffer, COL_MENUCONTENT_TEXT);
|
||||
ypos+= mheight;
|
||||
}
|
||||
fclose(fd);
|
||||
@@ -313,7 +313,7 @@ void CDBoxInfoWidget::paint()
|
||||
LOAD_INT(info.loads[1]), LOAD_FRAC(info.loads[1]),
|
||||
LOAD_INT(info.loads[2]), LOAD_FRAC(info.loads[2]));
|
||||
strcat(sbuf, ubuf);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, sbuf, COL_MENUCONTENT);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ 10, ypos+ mheight, width - 10, sbuf, COL_MENUCONTENT_TEXT);
|
||||
ypos+= mheight/2;
|
||||
ypos+= mheight;
|
||||
int headOffset=0;
|
||||
@@ -340,7 +340,7 @@ void CDBoxInfoWidget::paint()
|
||||
headOffset = nameOffset + (sizeOffset+10)*3+15;
|
||||
break;
|
||||
}
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ headOffset, ypos+ mheight, width - 10, head[j], COL_MENUCONTENTINACTIVE);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x+ headOffset, ypos+ mheight, width - 10, head[j], COL_MENUCONTENTINACTIVE_TEXT);
|
||||
}
|
||||
ypos+= mheight;
|
||||
|
||||
@@ -434,7 +434,7 @@ void CDBoxInfoWidget::paint()
|
||||
snprintf(ubuf, buf_size, "%4d%%", percent_used);
|
||||
break;
|
||||
}
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + mpOffset, ypos+ mheight, width - 10, ubuf, rec_mp ? COL_MENUCONTENTINACTIVE:COL_MENUCONTENT);
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x + mpOffset, ypos+ mheight, width - 10, ubuf, rec_mp ? COL_MENUCONTENTINACTIVE_TEXT:COL_MENUCONTENT_TEXT);
|
||||
rec_mp = false;
|
||||
}
|
||||
int pbw = width - offsetw - 10;
|
||||
|
Reference in New Issue
Block a user