diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp index ae219cf92..ad6a7520d 100644 --- a/src/gui/widget/listframe.cpp +++ b/src/gui/widget/listframe.cpp @@ -66,17 +66,11 @@ #define MIN_WINDOW_WIDTH (frameBuffer->getScreenWidth() >> 1) #define MIN_WINDOW_HEIGHT 40 -#define TITLE_BACKGROUND_COLOR ((CFBWindow::color_t)COL_MENUHEAD_PLUS_0) -#define HEADER_LIST_BACKGROUND_COLOR ((CFBWindow::color_t)COL_MENUCONTENT_PLUS_0) -#define LIST_BACKGROUND_COLOR ((CFBWindow::color_t)COL_MENUCONTENT_PLUS_0) -//#define LIST_BACKGROUND_COLOR_SELECTED ((CFBWindow::color_t)COL_MENUCONTENT_PLUS_1) -#define LIST_BACKGROUND_COLOR_SELECTED ((CFBWindow::color_t)COL_MENUCONTENTSELECTED_PLUS_0) - +#define TITLE_BACKGROUND_COLOR COL_MENUHEAD_PLUS_0 #define TITLE_FONT_COLOR COL_MENUHEAD_TEXT + +#define HEADER_LIST_BACKGROUND_COLOR COL_MENUCONTENT_PLUS_0 #define HEADER_LIST_FONT_COLOR COL_MENUCONTENT_TEXT -#define LIST_FONT_COLOR COL_MENUCONTENT_TEXT -//#define LIST_FONT_COLOR_SELECTED COL_MENUCONTENT_TEXT -#define LIST_FONT_COLOR_SELECTED COL_MENUCONTENTSELECTED_TEXT #define FONT_LIST g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2] #define FONT_HEADER_LIST g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1] @@ -410,7 +404,7 @@ void CListFrame::refreshList(void) //TRACE("[CListFrame]->refreshList: %d\r\n",m_nCurrentLine); if( frameBuffer == NULL) return; frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, m_cFrameListRel.iY+m_cFrame.iY, - m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, LIST_BACKGROUND_COLOR); + m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0); if( m_nNrOfLines <= 0) return; @@ -440,8 +434,8 @@ void CListFrame::refreshLine(int line) bool marked = (!m_pLines->marked.empty() && m_pLines->marked[line]); if(line == m_nSelectedLine && m_showSelection == true) { - color = marked ? COL_MENUCONTENTINACTIVE_TEXT : LIST_FONT_COLOR_SELECTED; - bgcolor = marked ? COL_MENUCONTENTSELECTED_PLUS_2 : LIST_BACKGROUND_COLOR_SELECTED; + color = marked ? COL_MENUCONTENTINACTIVE_TEXT : COL_MENUCONTENTSELECTED_TEXT; + bgcolor = marked ? COL_MENUCONTENTSELECTED_PLUS_2 : COL_MENUCONTENTSELECTED_PLUS_0; radius = RADIUS_LARGE; } else if (marked) { @@ -450,8 +444,8 @@ void CListFrame::refreshLine(int line) } else { - color = LIST_FONT_COLOR; - bgcolor = LIST_BACKGROUND_COLOR; + color = COL_MENUCONTENT_TEXT; + bgcolor = COL_MENUCONTENT_PLUS_0; } frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, y+m_cFrame.iY, m_cFrameListRel.iWidth, m_nFontListHeight, bgcolor, radius);