Merge pull request #5450 from livecodeian/bugfix-18939

livecodepanos · web-flow · commit 79cc7fe01a21 · 2017-05-12T11:11:27.000+01:00
[[ Bug 18939 ]] Draw player snapshot image at correct scale on hi-dpi displays.
diff --git a/docs/notes/bugfix-18939.md b/docs/notes/bugfix-18939.md
@@ -0,0 +1 @@
+# Fix player image incorrectly scaled in edit mode
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
@@ -2355,8 +2355,14 @@ void MCPlayer::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 					MCGImageCreateWithRaster(t_raster, t_image.image);
 				else
 					MCGImageCreateWithRasterNoCopy(t_raster, t_image.image);
+				
 				if (t_image . image != nil)
+				{
+					// IM-2017-05-11: [[ Bug 18939 ]] Set x/y scales for image, which may be scaled.
+					t_image.x_scale = MCGFloat(MCGImageGetWidth(t_image.image)) / MCGFloat(trect.width);
+					t_image.y_scale = MCGFloat(MCGImageGetHeight(t_image.image)) / MCGFloat(trect.height);
 					dc -> drawimage(t_image, 0, 0, trect.width, trect.height, trect.x, trect.y);
+				}
 				
 				MCGImageRelease(t_image.image);
 				MCPlatformUnlockPlayerBitmap(m_platform_player, t_bitmap);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix player image incorrectly scaled in edit mode`