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

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2017-03-07 19:43:06 +01:00
parent c2f7e1b1c0 bfa589eb08
commit 6f1cfd42bb
54 changed files with 216 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/widget/msgbox.cpp
View File

@@ -103,7 +103,8 @@ void CMsgBox::init(const int& Height, const int& ShowButtons, const msg_result_t
//set result
if (Default_result != mbrNone)
result = default_result = Default_result;
else
result = mbrNone;
//add and initialize footer buttons with required buttons and basic properties
if (ShowButtons > -1)
mb_show_button = ShowButtons;

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);