Ticket #7519: scummvm-stretch12.diff

backends/platform/sdl/graphics.cpp

@@ -316 +316 @@
         _overlayWidth = _screenWidth * _scaleFactor;
         _overlayHeight = _screenHeight * _scaleFactor;
 
-        if (_screenHeight != 200)
+        if (!isStretchable())
                 _adjustAspectRatio = false;
 
         if (_adjustAspectRatio)
@@ -735 +735 @@
 }
 
 void OSystem_SDL::setAspectRatioCorrection(bool enable) {
-        if ((_screenHeight == 200 && _adjustAspectRatio != enable) ||
+        if ((isStretchable() && _adjustAspectRatio != enable) ||
                 _transactionMode == kTransactionCommit) {
                 Common::StackLock lock(_graphicsMutex);
 

backends/platform/sdl/sdl-common.h

@@ -399 +399 @@
 
         virtual bool saveScreenshot(const char *filename); // overloaded by CE backend
 
-        int effectiveScreenHeight() const { return (_adjustAspectRatio ? 240 : _screenHeight) * _scaleFactor; }
+        int effectiveScreenHeight() const { return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight) * _scaleFactor; }
+        bool isStretchable() const { return _screenHeight % 200 == 0; }
 
         void setupIcon();
         void handleKbdMouse();