Allow for forced new lines when wrapping. Did I do this right?
This commit is contained in:
@@ -346,17 +346,24 @@ void BitmapText::SetText( CString sText, CString sAlternateText, int iWrapWidthP
|
|||||||
{
|
{
|
||||||
CString sToAdd = " " + sWord;
|
CString sToAdd = " " + sWord;
|
||||||
int iWidthToAdd = m_pFont->GetLineWidthInSourcePixels(L" ") + iWidthWord;
|
int iWidthToAdd = m_pFont->GetLineWidthInSourcePixels(L" ") + iWidthWord;
|
||||||
if( iCurLineWidth + iWidthToAdd <= iWrapWidthPixels ) // will fit on current line
|
if( sWord == "\n" ) //Check to see if it's a forced newline
|
||||||
{
|
|
||||||
sCurLine += sToAdd;
|
|
||||||
iCurLineWidth += iWidthToAdd;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
m_wTextLines.push_back( CStringToWstring(sCurLine) );
|
m_wTextLines.push_back( CStringToWstring(sCurLine) );
|
||||||
sCurLine = sWord;
|
sCurLine = "";
|
||||||
iCurLineWidth = iWidthWord;
|
iCurLineWidth = 0;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
if( iCurLineWidth + iWidthToAdd <= iWrapWidthPixels ) // will fit on current line
|
||||||
|
{
|
||||||
|
sCurLine += sToAdd;
|
||||||
|
iCurLineWidth += iWidthToAdd;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_wTextLines.push_back( CStringToWstring(sCurLine) );
|
||||||
|
sCurLine = sWord;
|
||||||
|
iCurLineWidth = iWidthWord;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_wTextLines.push_back( CStringToWstring(sCurLine) );
|
m_wTextLines.push_back( CStringToWstring(sCurLine) );
|
||||||
|
|||||||
Reference in New Issue
Block a user