mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- listframe: replace some color defines with original defines

Browse Source
This commit is contained in:
svenhoefer
2016-10-19 13:21:58 +02:00
parent d6c85e14cc
commit 91c668efca
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/widget/listframe.cpp
View File

@@ -66,17 +66,11 @@
#define MIN_WINDOW_WIDTH (frameBuffer->getScreenWidth() >> 1) #define MIN_WINDOW_WIDTH (frameBuffer->getScreenWidth() >> 1)
#define MIN_WINDOW_HEIGHT 40 #define MIN_WINDOW_HEIGHT 40
#define TITLE_BACKGROUND_COLOR ((CFBWindow::color_t)COL_MENUHEAD_PLUS_0) #define TITLE_BACKGROUND_COLOR 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_FONT_COLOR COL_MENUHEAD_TEXT #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 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_LIST g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]
#define FONT_HEADER_LIST g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1] #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); //TRACE("[CListFrame]->refreshList: %d\r\n",m_nCurrentLine);
if( frameBuffer == NULL) return; if( frameBuffer == NULL) return;
frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, m_cFrameListRel.iY+m_cFrame.iY, 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) if( m_nNrOfLines <= 0)
return; return;
@@ -440,8 +434,8 @@ void CListFrame::refreshLine(int line)
bool marked = (!m_pLines->marked.empty() && m_pLines->marked[line]); bool marked = (!m_pLines->marked.empty() && m_pLines->marked[line]);
if(line == m_nSelectedLine && m_showSelection == true) if(line == m_nSelectedLine && m_showSelection == true)
{ {
color = marked ? COL_MENUCONTENTINACTIVE_TEXT : LIST_FONT_COLOR_SELECTED; color = marked ? COL_MENUCONTENTINACTIVE_TEXT : COL_MENUCONTENTSELECTED_TEXT;
bgcolor = marked ? COL_MENUCONTENTSELECTED_PLUS_2 : LIST_BACKGROUND_COLOR_SELECTED; bgcolor = marked ? COL_MENUCONTENTSELECTED_PLUS_2 : COL_MENUCONTENTSELECTED_PLUS_0;
radius = RADIUS_LARGE; radius = RADIUS_LARGE;
} }
else if (marked) { else if (marked) {
@@ -450,8 +444,8 @@ void CListFrame::refreshLine(int line)
} }
else else
{ {
color = LIST_FONT_COLOR; color = COL_MENUCONTENT_TEXT;
bgcolor = LIST_BACKGROUND_COLOR; bgcolor = COL_MENUCONTENT_PLUS_0;
} }
frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, y+m_cFrame.iY, frameBuffer->paintBoxRel(m_cFrameListRel.iX+m_cFrame.iX, y+m_cFrame.iY,
m_cFrameListRel.iWidth, m_nFontListHeight, bgcolor, radius); m_cFrameListRel.iWidth, m_nFontListHeight, bgcolor, radius);