moonlight-stream/moonlight-qt
1
0 Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-10-26 14:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only accept usable bounds if they differ from the full bounds

Browse Source 
Some platforms (Wayland) just report the full display area, so we
incorrectly assume the entire display is usable for a window.

Fixes #2056
This commit is contained in:
Cameron Gutman committed 2026-10-22 20:53:30 -05:00
1 parent 74020b537b
commit d79536b56d
3 files changed
+84 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/streaming/session.cpp
+37 -23
View File
@@ -1363,34 +1363,48 @@ void Session::getWindowDimensions(int& x, int& y,
}
}
// Get the usable display bounds
SDL_Rect usableBounds;
if (SDL_GetDisplayUsableBounds(displayIndex, &usableBounds) == 0) {
// If the stream resolution fits within the usable display area, use it directly
if (m_StreamConfig.width <= usableBounds.w &&
m_StreamConfig.height <= usableBounds.h) {
width = m_StreamConfig.width;
height = m_StreamConfig.height;
} else {
// Otherwise, use 80% of usable bounds and preserve aspect ratio
SDL_Rect src, dst;
src.x = src.y = dst.x = dst.y = 0;
src.w = m_StreamConfig.width;
src.h = m_StreamConfig.height;
dst.w = ((int)(usableBounds.w * 0.80f)) & ~0x1; // even width
dst.h = ((int)(usableBounds.h * 0.80f)) & ~0x1; // even height
StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
width = dst.w;
height = dst.h;
}
}
else {
if (SDL_GetDisplayUsableBounds(displayIndex, &usableBounds) != 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"SDL_GetDisplayUsableBounds() failed: %s",
SDL_GetError());
SDL_zero(usableBounds);
}
// Use the usable display bounds if they are valid
if (usableBounds.w != 0 &&
WMUtils::hasDisplayUsableBounds() &&
m_StreamConfig.width <= usableBounds.w &&
m_StreamConfig.height <= usableBounds.h) {
// We fit pixel-perfect in the usable area, so don't scale at all
width = m_StreamConfig.width;
height = m_StreamConfig.height;
}
else if (usableBounds.w != 0 || SDL_GetDisplayBounds(displayIndex, &usableBounds) == 0) {
// Otherwise, use 80% of usable bounds and preserve aspect ratio
SDL_Rect src, dst;
src.x = src.y = dst.x = dst.y = 0;
src.w = m_StreamConfig.width;
src.h = m_StreamConfig.height;
dst.w = ((int)(usableBounds.w * 0.80f)) & ~0x1; // even width
dst.h = ((int)(usableBounds.h * 0.80f)) & ~0x1; // even height
StreamUtils::scaleSourceToDestinationSurface(&src, &dst);
// Only scale the size down, never up
if (m_StreamConfig.width >= dst.w || m_StreamConfig.height >= dst.h) {
width = dst.w;
height = dst.h;
}
else {
width = m_StreamConfig.width;
height = m_StreamConfig.height;
}
}
else {
// Oh well, hope for the best
width = m_StreamConfig.width;
height = m_StreamConfig.height;
}