Merge pull request #5090 from Laserlicht/fix_prescale

fix margin if image prescaled and not equal to current scaling

client/renderSDL/SDLImage.cpp

@@ -19,6 +19,8 @@
 #include "../render/CDefFile.h"
 #include "../render/Graphics.h"
 #include "../xBRZ/xbrz.h"
+#include "../gui/CGuiHandler.h"
+#include "../render/IScreenHandler.h"
 
 #include <tbb/parallel_for.h>
 #include <SDL_surface.h>
@@ -276,6 +278,12 @@ void SDLImageShared::optimizeSurface()
 		margins.x += left;
 		margins.y += top;
 	}
+
+	if(preScaleFactor > 1 && preScaleFactor != GH.screenHandler().getScalingFactor())
+	{
+		margins.x = margins.x * GH.screenHandler().getScalingFactor() / preScaleFactor;
+		margins.y = margins.y * GH.screenHandler().getScalingFactor() / preScaleFactor;
+	}
 }
 
 std::shared_ptr<const ISharedImage> SDLImageShared::scaleInteger(int factor, SDL_Palette * palette, EImageBlitMode mode) const