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

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Commit: bab10ee438
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-06 (Mon, 06 Mar 2017)
This commit is contained in:
Michael Liebmann
2017-03-06 22:06:38 +01:00
parent 75c7b9c6f4 a6b0409160
commit eb3e1116ac
46 changed files with 152 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/widget/textbox.cpp
View File

@@ -299,9 +299,9 @@ void CTextBox::initFramesRel(void)
if(m_nMode & SCROLL)
{
m_cFrameScrollRel.iX = m_cFrame.iWidth - SCROLL_FRAME_WIDTH;
m_cFrameScrollRel.iY = m_cFrameTextRel.iY + m_nBgRadius;
m_cFrameScrollRel.iWidth = SCROLL_FRAME_WIDTH;
m_cFrameScrollRel.iX = m_cFrame.iWidth - m_cFrameScrollRel.iWidth;
m_cFrameScrollRel.iY = m_cFrameTextRel.iY + m_nBgRadius;
m_cFrameScrollRel.iHeight = m_cFrameTextRel.iHeight - 2*m_nBgRadius;
}
else
@@ -708,7 +708,7 @@ void CTextBox::refreshText(void)
if (m_nMode & CENTER)
x_center /= 2;
if (m_nMode & SCROLL)
x_center -= SCROLL_FRAME_WIDTH;
x_center -= m_cFrameScrollRel.iWidth;
}
x_center = std::max(x_center, 0);