mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10741 from akallabeth/sdl3-api-update

Browse Source 
[client,sdl3] update to current API
This commit is contained in:
akallabeth 2024-10-15 09:00:54 +02:00 committed by GitHub
commit 60609251fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/SDL/SDL3/dialogs/sdl_widget.cpp
View File

@ -96,9 +96,29 @@ SDL_Texture* SdlWidget::render_text(SDL_Renderer* renderer, const std::string& t
return nullptr;
}
std::unique_ptr<TTF_TextEngine, decltype(&TTF_DestroySurfaceTextEngine)> engine(
TTF_CreateRendererTextEngine(renderer), TTF_DestroySurfaceTextEngine);
if (!engine)
{
widget_log_error(-1, "TTF_CreateRendererTextEngine");
return nullptr;
}
std::unique_ptr<TTF_Text, decltype(&TTF_DestroyText)> txt(
TTF_CreateText(engine.get(), _font, text.c_str(), text.size()), TTF_DestroyText);
if (!txt)
{
widget_log_error(-1, "TTF_CreateText");
return nullptr;
}
int w = 0;
int h = 0;
TTF_GetTextSize(_font, text.c_str(), 0, &w, &h);
if (!TTF_GetTextSize(txt.get(), &w, &h))
{
widget_log_error(-1, "TTF_GetTextSize");
return nullptr;
}
src.w = w;
src.h = h;
@ -133,9 +153,6 @@ static float scale(float dw, float dh)
SDL_Texture* SdlWidget::render_text_wrapped(SDL_Renderer* renderer, const std::string& text,
SDL_Color fgcolor, SDL_FRect& src, SDL_FRect& dst)
{
Sint32 w = 0;
Sint32 h = 0;
TTF_GetTextSize(_font, " ", 0, &w, &h);
auto surface = TTF_RenderText_Blended_Wrapped(_font, text.c_str(), 0, fgcolor, _text_width);
if (!surface)
{