morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,sdl] ignore scale change if call fails

Browse Source 
If SDL_GetWindowDisplayScale fails ignore the change.
This commit is contained in:
akallabeth
2025-05-03 09:23:32 +02:00
parent 1e2b44e73e
commit 0b4893d59c
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
client/SDL/SDL3/sdl_freerdp.cpp
View File

@@ -1019,18 +1019,31 @@ static int sdl_run(SdlContext* sdl)
SDL_GetWindowSizeInPixels(win, &w_pix, &h_pix);
assert(rcpix);
auto scale = SDL_GetWindowDisplayScale(win);
assert(SDL_isnanf(scale) == 0);
assert(SDL_isinff(scale) == 0);
assert(scale > SDL_FLT_EPSILON);
auto w_gdi = sdl->context()->gdi->width;
auto h_gdi = sdl->context()->gdi->height;
auto pix2point = [=](int pix)
{ return static_cast<int>(static_cast<float>(pix) / scale); };
if (w_pix != w_gdi || h_pix != h_gdi)
if (scale <= SDL_FLT_EPSILON)
{
[[maybe_unused]] auto ssws = SDL_SetWindowSize(
win, pix2point(w_gdi), pix2point(h_gdi));
assert(ssws);
auto err = SDL_GetError();
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"SDL_GetWindowDisplayScale() failed with %s",
err);
}
else
{
assert(SDL_isnanf(scale) == 0);
assert(SDL_isinff(scale) == 0);
assert(scale > SDL_FLT_EPSILON);
auto w_gdi = sdl->context()->gdi->width;
auto h_gdi = sdl->context()->gdi->height;
auto pix2point = [=](int pix)
{
return static_cast<int>(static_cast<float>(pix) /
scale);
};
if (w_pix != w_gdi || h_pix != h_gdi)
{
[[maybe_unused]] auto ssws = SDL_SetWindowSize(
win, pix2point(w_gdi), pix2point(h_gdi));
assert(ssws);
}
}
}
break;