Merge branch 'master' into pu/msgbox

Origin commit data
------------------
Commit: fa9e34fcca
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)
This commit is contained in:
2016-10-28 21:19:09 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -587,7 +587,7 @@ void CTextBox::refreshText(void)
//bg variables
int ax = m_cFrameTextRel.iX+m_cFrame.iX;
int ay = m_cFrameTextRel.iY+m_cFrame.iY;
int dx = m_old_cText != m_cText || m_nNrOfPages>1 ? m_cFrameTextRel.iWidth : m_nMaxTextWidth;
int dx = m_old_cText != m_cText || m_nNrOfPages>1 ? m_cFrameTextRel.iWidth : m_nMaxTextWidth - m_nBgRadius;
int dy = m_cFrameTextRel.iHeight;
//avoid artefacts in transparent cornes