From ecaf871a9e55b6e3d62b5c812325d40ea335701a Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Mon, 2 Dec 2019 22:20:12 +0100 Subject: [PATCH] Fixed width < 0 scaling issues. --- RetroFE/Source/Graphics/ViewInfo.cpp | 8 ++++---- RetroFE/Source/Version.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RetroFE/Source/Graphics/ViewInfo.cpp b/RetroFE/Source/Graphics/ViewInfo.cpp index bd83413..28a296e 100644 --- a/RetroFE/Source/Graphics/ViewInfo.cpp +++ b/RetroFE/Source/Graphics/ViewInfo.cpp @@ -161,12 +161,12 @@ float ViewInfo::ScaledWidth() const float ViewInfo::AbsoluteHeight() const { - if(Height == -1 && Width == -1) + if(Height < 0 && Width < 0) { return ImageHeight; } - if (Height == -1 && ImageWidth != 0) + if (Height < 0 && ImageWidth != 0) { return ImageHeight * Width / ImageWidth; } @@ -176,12 +176,12 @@ float ViewInfo::AbsoluteHeight() const float ViewInfo::AbsoluteWidth() const { - if(Height == -1 && Width == -1) + if(Height < 0 && Width < 0) { return ImageWidth; } - if (Width == -1 && ImageHeight != 0) + if (Width < 0 && ImageHeight != 0) { return ImageWidth * Height / ImageHeight; } diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index 7acbce7..202d2f0 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -21,7 +21,7 @@ std::string retrofe_version_major = "0"; std::string retrofe_version_minor = "9"; -std::string retrofe_version_build = "14"; +std::string retrofe_version_build = "15"; std::string Version::getString( )