mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +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:
@@ -74,7 +74,7 @@ void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX)
|
||||
dx = DX;
|
||||
offx = OFFX;
|
||||
name_start_x = x + offx + icon_frame_w;
|
||||
item_color = COL_MENUCONTENT;
|
||||
item_color = COL_MENUCONTENT_TEXT;
|
||||
item_bgcolor = COL_MENUCONTENT_PLUS_0;
|
||||
}
|
||||
|
||||
@@ -100,17 +100,17 @@ void CMenuItem::initItemColors(const bool select_mode)
|
||||
{
|
||||
if (select_mode)
|
||||
{
|
||||
item_color = COL_MENUCONTENTSELECTED;
|
||||
item_color = COL_MENUCONTENTSELECTED_TEXT;
|
||||
item_bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
|
||||
}
|
||||
else if (!active)
|
||||
{
|
||||
item_color = COL_MENUCONTENTINACTIVE;
|
||||
item_color = COL_MENUCONTENTINACTIVE_TEXT;
|
||||
item_bgcolor = COL_MENUCONTENTINACTIVE_PLUS_0;
|
||||
}
|
||||
else
|
||||
{
|
||||
item_color = COL_MENUCONTENT;
|
||||
item_color = COL_MENUCONTENT_TEXT;
|
||||
item_bgcolor = COL_MENUCONTENT_PLUS_0;
|
||||
}
|
||||
}
|
||||
@@ -1910,12 +1910,12 @@ int CMenuSeparator::paint(bool selected)
|
||||
|
||||
if ((type & SUB_HEAD))
|
||||
{
|
||||
item_color = COL_MENUHEAD;
|
||||
item_color = COL_MENUHEAD_TEXT;
|
||||
item_bgcolor = COL_MENUHEAD_PLUS_0;
|
||||
}
|
||||
else
|
||||
{
|
||||
item_color = COL_MENUCONTENTINACTIVE;
|
||||
item_color = COL_MENUCONTENTINACTIVE_TEXT;
|
||||
item_bgcolor = COL_MENUCONTENT_PLUS_0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user