mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 00:11:14 +02:00
neutrino: make CListFrame not shorten lines (affects moviebrowser)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@990 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -461,12 +461,8 @@ void CListFrame::refreshLine(int line)
|
|||||||
y += m_nFontListHeight;
|
y += m_nFontListHeight;
|
||||||
for(int row = 0; row < m_pLines->rows; row++)
|
for(int row = 0; row < m_pLines->rows; row++)
|
||||||
{
|
{
|
||||||
width = m_pLines->rowWidth[row] ;
|
width = std::min(m_pLines->rowWidth[row],
|
||||||
if(width > m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - 2*TEXT_BORDER_WIDTH)
|
m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - TEXT_BORDER_WIDTH);
|
||||||
{
|
|
||||||
width = m_cFrameListRel.iWidth - x + m_cFrameListRel.iX - 2*TEXT_BORDER_WIDTH;
|
|
||||||
//TRACE(" normalize to %d,x:%d\r\n",width,x);
|
|
||||||
}
|
|
||||||
m_pcFontList->RenderString(x+m_cFrame.iX, y+m_cFrame.iY,
|
m_pcFontList->RenderString(x+m_cFrame.iX, y+m_cFrame.iY,
|
||||||
width, m_pLines->lineArray[row][line].c_str(),
|
width, m_pLines->lineArray[row][line].c_str(),
|
||||||
color, 0, true); // UTF-8
|
color, 0, true); // UTF-8
|
||||||
@@ -490,9 +486,9 @@ void CListFrame::refreshHeaderList(void)
|
|||||||
for(int row = 0; row < m_pLines->rows && loop == true; row++)
|
for(int row = 0; row < m_pLines->rows && loop == true; row++)
|
||||||
{
|
{
|
||||||
width = m_pLines->rowWidth[row] ;
|
width = m_pLines->rowWidth[row] ;
|
||||||
if(width > m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - 2*TEXT_BORDER_WIDTH)
|
if(width > m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - TEXT_BORDER_WIDTH)
|
||||||
{
|
{
|
||||||
width = m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - 2*TEXT_BORDER_WIDTH;
|
width = m_cFrameHeaderListRel.iWidth - x + m_cFrameHeaderListRel.iX - TEXT_BORDER_WIDTH;
|
||||||
//TRACE(" normalize width to %d , x:%d \r\n",width,x);
|
//TRACE(" normalize width to %d , x:%d \r\n",width,x);
|
||||||
loop = false;
|
loop = false;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user