jp9000
/
obs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include the terminating \0 character in string measurements of text sources 

Apparently, \0 is not always a zero-width character?
Not including it as part of the string measurement may cut off the final word
on the line when using certain fonts together with outlines and wrapping.

Test case:
• Font: M+ 2p black (downloadable at https://mplus-fonts.osdn.jp/mplus-outline-fonts/download/index-en.html#download, "M+ TESTFLIGHT 060" release)
• ☑ Use Outline
• ☑ Use Custom Text Extents
• ☑ Wrap
• ☐ Scroll Mode (doesn't seem to be affected)
• Text: A, 20
master
nmlgc 2015-10-04 09:52:28 +02:00
parent fb11ea4e50
commit d1adddb450
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/TextOutputSource.cpp
View File

@ -288,6 +288,10 @@ class TextOutputSource : public ImageSource
if(strCurrentText.IsValid())
{
// Apparently, \0 is not always a zero-width character?
// Not including it as part of the string measurement may cut off the final word
// on the line when using certain fonts together with outlines and wrapping.
INT strLength = strCurrentText.Length() + 1;
if(bUseExtents && bWrap)
{
layoutBox.X = layoutBox.Y = 0;
@ -312,14 +316,14 @@ class TextOutputSource : public ImageSource
}
else
{
stat = graphics->MeasureString(strCurrentText, -1, &font, layoutBox, &format, &boundingBox);
stat = graphics->MeasureString(strCurrentText, strLength, &font, layoutBox, &format, &boundingBox);
if(stat != Gdiplus::Ok)
AppWarning(TEXT("TextSource::UpdateTexture: Gdiplus::Graphics::MeasureString failed: %u"), (int)stat);
}
}
else
{
stat = graphics->MeasureString(strCurrentText, -1, &font, Gdiplus::PointF(0.0f, 0.0f), &format, &boundingBox);
stat = graphics->MeasureString(strCurrentText, strLength, &font, Gdiplus::PointF(0.0f, 0.0f), &format, &boundingBox);
if(stat != Gdiplus::Ok)
AppWarning(TEXT("TextSource::UpdateTexture: Gdiplus::Graphics::MeasureString failed: %u"), (int)stat);
if(bUseOutline)