kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #717 from Leander1P/html5-handleresize-int

Browse Source 
HTML5Window.handleResize: various "prefer exact integers" fixes...
This commit is contained in:
Joshua Granick
2016-05-29 17:22:06 -07:00
parent 39f16cda89 ca2a5cba9a
commit d196806c21
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lime/_backend/html5/HTML5Window.hx
View File

@@ -389,29 +389,42 @@ class HTML5Window {
} else {
var scaleX = element.clientWidth / setWidth;
var scaleY = element.clientHeight / setHeight;
var scaleX = (setWidth != 0) ? (element.clientWidth / setWidth) : 1;
var scaleY = (setHeight != 0) ? (element.clientHeight / setHeight) : 1;
var currentRatio = scaleX / scaleY;
var targetRatio = Math.min (scaleX, scaleY);
var targetW = element.clientWidth;
var targetH = element.clientHeight;
var marginLeft = 0;
var marginTop = 0;
if (scaleX < scaleY)
{
targetH = Math.floor(setHeight * scaleX);
marginTop = Math.floor((element.clientHeight - targetH) / 2);
}
else
{
targetW = Math.floor(setWidth * scaleY);
marginLeft = Math.floor((element.clientWidth - targetW) / 2);
}
if (canvas != null) {
if (element != cast canvas) {
canvas.style.width = setWidth * targetRatio + "px";
canvas.style.height = setHeight * targetRatio + "px";
canvas.style.marginLeft = ((element.clientWidth - (setWidth * targetRatio)) / 2) + "px";
canvas.style.marginTop = ((element.clientHeight - (setHeight * targetRatio)) / 2) + "px";
canvas.style.width = targetW + "px";
canvas.style.height = targetH + "px";
canvas.style.marginLeft = marginLeft + "px";
canvas.style.marginTop = marginTop + "px";
}
} else {
div.style.width = setWidth * targetRatio + "px";
div.style.height = setHeight * targetRatio + "px";
div.style.marginLeft = ((element.clientWidth - (setWidth * targetRatio)) / 2) + "px";
div.style.marginTop = ((element.clientHeight - (setHeight * targetRatio)) / 2) + "px";
div.style.width = targetW + "px";
div.style.height = targetH + "px";
div.style.marginLeft = marginLeft + "px";
div.style.marginTop = marginTop + "px";
}