mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/widget/listframe.cpp


Origin commit data
------------------
Commit: aa2517293f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
This commit is contained in:
vanhofen
2016-11-07 13:48:21 +01:00
parent 114a75f363 9e86fba5d9
commit 7c249335f1
3 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/moviebrowser/mb.cpp
View File

@@ -1249,6 +1249,8 @@ int CMovieBrowser::paint(void)
return (false);
}
m_pcFilter->setBackGroundRadius(RADIUS_LARGE);
m_pcInfo1->setBackGroundColor(COL_MENUCONTENTDARK_PLUS_0);
m_pcInfo1->setTextColor(COL_MENUCONTENTDARK_TEXT);
m_pcInfo1->setBackGroundRadius(RADIUS_LARGE);

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

@@ -190,9 +190,11 @@ void CListFrame::initVar(void)
m_nCurrentPage = 0;
m_nSelectedLine = 0;
m_nBgRadius = RADIUS_NONE;
m_cFrame.iX = frameBuffer->getScreenX() + ((frameBuffer->getScreenWidth() - MIN_WINDOW_WIDTH) >>1);
m_cFrame.iWidth = MIN_WINDOW_WIDTH;
m_cFrame.iY = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - MIN_WINDOW_HEIGHT) >>1);
m_cFrame.iWidth = MIN_WINDOW_WIDTH;
m_cFrame.iHeight = MIN_WINDOW_HEIGHT;
m_nMaxHeight = MAX_WINDOW_HEIGHT;
@@ -272,14 +274,14 @@ void CListFrame::initFramesRel(void)
m_cFrameScrollRel.iX = m_cFrame.iWidth - SCROLL_FRAME_WIDTH;
m_cFrameScrollRel.iY = m_cFrameTitleRel.iHeight;
m_cFrameScrollRel.iWidth = SCROLL_FRAME_WIDTH;
m_cFrameScrollRel.iHeight = m_cFrameListRel.iHeight + m_cFrameHeaderListRel.iHeight;
m_cFrameScrollRel.iHeight = m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight - m_nBgRadius;
}
else
{
m_cFrameScrollRel.iX = 0;
m_cFrameScrollRel.iY = 0;
m_cFrameScrollRel.iHeight = 0;
m_cFrameScrollRel.iWidth = 0;
m_cFrameScrollRel.iHeight = 0;
}
m_cFrameListRel.iWidth = m_cFrame.iWidth - m_cFrameScrollRel.iWidth;
@@ -354,7 +356,8 @@ void CListFrame::refreshTitle(void)
if( frameBuffer == NULL) return;
frameBuffer->paintBoxRel(m_cFrameTitleRel.iX+m_cFrame.iX, m_cFrameTitleRel.iY+m_cFrame.iY,
m_cFrameTitleRel.iWidth, m_cFrameTitleRel.iHeight, g_settings.theme.menu_Head_gradient ? COL_MENUCONTENT_PLUS_0 : TITLE_BACKGROUND_COLOR); //NI
m_cFrameTitleRel.iWidth, m_cFrameTitleRel.iHeight, g_settings.theme.menu_Head_gradient ? COL_MENUCONTENT_PLUS_0 : TITLE_BACKGROUND_COLOR, //NI
m_nBgRadius, CORNER_TOP);
m_pcFontTitle->RenderString(m_cFrameTitleRel.iX + TEXT_BORDER_WIDTH + m_cFrame.iX,
m_cFrameTitleRel.iY + m_cFrameTitleRel.iHeight + m_cFrame.iY,
@@ -376,7 +379,8 @@ void CListFrame::refreshScroll(void)
if (1)
{
frameBuffer->paintBoxRel(m_cFrameScrollRel.iX+m_cFrame.iX, m_cFrameScrollRel.iY+m_cFrame.iY,
m_cFrameScrollRel.iWidth, m_cFrameScrollRel.iHeight, COL_MENUCONTENT_PLUS_0);
m_cFrameScrollRel.iWidth, m_cFrameHeaderListRel.iHeight + m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0,
m_nBgRadius, CORNER_BOTTOM_RIGHT);
}
if (m_nNrOfPages > 1)
@@ -408,16 +412,17 @@ int CListFrame::paintListIcon(int x, int y, int line)
void CListFrame::refreshList(void)
{
//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,
m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0);
m_cFrameListRel.iWidth, m_cFrameListRel.iHeight, COL_MENUCONTENT_PLUS_0,
m_nBgRadius, CORNER_BOTTOM_LEFT);
if (m_nNrOfLines <= 0)
return;
for(int line = m_nCurrentLine;
line < m_nNrOfLines && line < m_nCurrentLine + m_nLinesPerPage;
line++)
for (int line = m_nCurrentLine; line < m_nNrOfLines && line < m_nCurrentLine + m_nLinesPerPage; line++)
{
refreshLine(line);
}

7
src/gui/widget/listframe.h
View File

@@ -104,6 +104,8 @@ class CListFrame
int m_nCurrentPage;
int m_nSelectedLine;
int m_nBgRadius;
bool m_showSelection;
Font* m_pcFontTitle;
@@ -141,6 +143,11 @@ class CListFrame
bool setTitle(char* title);
bool setSelectedLine(int selection);
void setSelectedMarked(bool enable);
void setBackGroundRadius(const int radius)
{
m_nBgRadius = radius;
initFramesRel();
};
void clearMarked()
{
if (m_pLines)