diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2023-01-09 19:52:23 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-09 19:52:23 +1000 |
| commit | 54e13ac5849fd1e9c17167c8d9b939b1f0f828b5 (patch) | |
| tree | d7dcfcab55f7fda9db61a25fca3355bd7699d107 | |
| parent | d1f18298717486ba5532e868251f950229ce14ed (diff) | |
| parent | 47b8f6993ae901e78de4fd78eb7ae3eaadec57f6 (diff) | |
| download | xbmc-54e13ac5849fd1e9c17167c8d9b939b1f0f828b5.tar.xz | |
Merge pull request #22407 from kszaq/resolution-iscreen-Nexus
[backport] Resolution: use iScreenWidth, iScreenHeight in GetMaxAllowedResolution
| -rw-r--r-- | xbmc/windowing/Resolution.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xbmc/windowing/Resolution.cpp b/xbmc/windowing/Resolution.cpp index 79123bcda6..682bcc317a 100644 --- a/xbmc/windowing/Resolution.cpp +++ b/xbmc/windowing/Resolution.cpp @@ -444,11 +444,11 @@ void CResolutionUtils::GetMaxAllowedResolution(unsigned int& width, unsigned int { RESOLUTION res = CDisplaySettings::GetInstance().GetResFromString(mode.asString()); RESOLUTION_INFO resInfo{CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(res)}; - if (static_cast<unsigned int>(resInfo.iWidth) > maxWidth && - static_cast<unsigned int>(resInfo.iHeight) > maxHeight) + if (static_cast<unsigned int>(resInfo.iScreenWidth) > maxWidth && + static_cast<unsigned int>(resInfo.iScreenHeight) > maxHeight) { - maxWidth = static_cast<unsigned int>(resInfo.iWidth); - maxHeight = static_cast<unsigned int>(resInfo.iHeight); + maxWidth = static_cast<unsigned int>(resInfo.iScreenWidth); + maxHeight = static_cast<unsigned int>(resInfo.iScreenHeight); } } } @@ -460,11 +460,11 @@ void CResolutionUtils::GetMaxAllowedResolution(unsigned int& width, unsigned int for (const auto& res : resList) { RESOLUTION_INFO resInfo{CServiceBroker::GetWinSystem()->GetGfxContext().GetResInfo(res)}; - if (static_cast<unsigned int>(resInfo.iWidth) > maxWidth && - static_cast<unsigned int>(resInfo.iHeight) > maxHeight) + if (static_cast<unsigned int>(resInfo.iScreenWidth) > maxWidth && + static_cast<unsigned int>(resInfo.iScreenHeight) > maxHeight) { - maxWidth = static_cast<unsigned int>(resInfo.iWidth); - maxHeight = static_cast<unsigned int>(resInfo.iHeight); + maxWidth = static_cast<unsigned int>(resInfo.iScreenWidth); + maxHeight = static_cast<unsigned int>(resInfo.iScreenHeight); } } } |