yeyinlaoying/moonlight-qt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable the text outline when line wrapping is required

Browse Source
This commit is contained in:
Cameron Gutman
2026-07-01 23:43:40 -05:00
parent 9067db8915
commit fd34a1fd28
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/video/overlaymanager.cpp
+16 -1
View File
@@ -171,9 +171,24 @@ SDL_Surface* OverlayManager::RenderTextOutlinedWrapped(TTF_Font* font, const cha
return nullptr; return nullptr;
} }
// Draw text twice, but outline is a bit bigger
int oldOutline = TTF_GetFontOutline(font); int oldOutline = TTF_GetFontOutline(font);
TTF_SetFontOutline(font, outlineWidth); TTF_SetFontOutline(font, outlineWidth);
// Verify that the string won't require wrapping (which could cause the outline and the text
// to diverge due to different wrapping positions).
//
// FIXME: We do this rather than just disabling wrapping entirely (wrapWidth = 0) because we
// need further testing to ensure that all renderers can handle non-NPOT overlay textures.
for (const QString& line : QString(text).split('\n')) {
int extent, count;
if (TTF_MeasureUTF8(font, line.toUtf8(), wrapWidth, &extent, &count) == 0 && count < line.size()) {
// If it requires wrapping, render it without the outline
TTF_SetFontOutline(font, oldOutline);
return TTF_RenderUTF8_Blended_Wrapped(font, text, textColor, wrapWidth);
}
}
// Draw text twice, but outline is a bit bigger
auto outlineSurface = TTF_RenderUTF8_Blended_Wrapped(font, text, outlineColor, wrapWidth); auto outlineSurface = TTF_RenderUTF8_Blended_Wrapped(font, text, outlineColor, wrapWidth);
TTF_SetFontOutline(font, 0); TTF_SetFontOutline(font, 0);
auto textSurface = TTF_RenderUTF8_Blended_Wrapped(font, text, textColor, wrapWidth); auto textSurface = TTF_RenderUTF8_Blended_Wrapped(font, text, textColor, wrapWidth);