funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-02-25 10:41:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved text alignment when text is larger than the allowed image width.

Browse Source
This commit is contained in:
Pieter Hulshoff 2016-07-23 11:05:48 +02:00
parent d1263ccc92
commit 92b0ca41c3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
RetroFE/Source/Graphics/Component/Text.cpp
View File

@ -78,6 +78,9 @@ void Text::draw()
imageHeight = (float)font->getHeight(); imageHeight = (float)font->getHeight();
float scale = (float)baseViewInfo.FontSize / (float)imageHeight; float scale = (float)baseViewInfo.FontSize / (float)imageHeight;
unsigned int textIndexMax = 0;
unsigned int emptySpace = 0;
// determine image width // determine image width
for(unsigned int i = 0; i < textData_.size(); ++i) for(unsigned int i = 0; i < textData_.size(); ++i)
{ {
@ -90,9 +93,14 @@ void Text::draw()
} }
if ((imageWidth + glyph.advance)*scale > imageMaxWidth ) if ((imageWidth + glyph.advance)*scale > imageMaxWidth )
break; {
imageWidth -= emptySpace;
break;
}
imageWidth += glyph.advance; textIndexMax = i;
emptySpace = glyph.advance - glyph.maxX;
imageWidth += glyph.advance;
} }
} }
@ -119,7 +127,7 @@ void Text::draw()
SDL_Rect rect; SDL_Rect rect;
rect.x = static_cast<int>(xOrigin); rect.x = static_cast<int>(xOrigin);
for(unsigned int i = 0; i < textData_.size(); ++i) for(unsigned int i = 0; i <= textIndexMax; ++i)
{ {
Font::GlyphInfo glyph; Font::GlyphInfo glyph;
@ -146,10 +154,6 @@ void Text::draw()
rect.x += static_cast<int>(glyph.advance * scale); rect.x += static_cast<int>(glyph.advance * scale);
if((static_cast<float>(rect.x) - xOrigin) > imageMaxWidth)
{
break;
}
} }
} }
} }