Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DOMElement for retina screens #732

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix DOMElement for retina screens #732

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
61bfa43
add devicePixelRatio for retina screens
Feb 15, 2016
236dde3
add getDevicePixelRatio to DOMElement prototype and remove BrowserDet…
mattcolman Mar 11, 2017
ea4096a
formatting and docs
mattcolman Mar 11, 2017
8d5da41
formatting
mattcolman Mar 11, 2017
8b1425b
formatting
mattcolman Mar 11, 2017
e823fd9
formatting
mattcolman Mar 11, 2017
88f6f2c
formatting
mattcolman Mar 11, 2017
d6a11b0
formatting
mattcolman Mar 11, 2017
65132ee
formatting
mattcolman Mar 11, 2017
a7d440b
formatting
mattcolman Mar 11, 2017
6ed2793
formatting
mattcolman Mar 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/easeljs/display/DOMElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ this.createjs = this.createjs||{};
* @protected
*/
this._oldProps = null;
this._devicePixelRatio = this._getDevicePixelRatio();
}
var p = createjs.extend(DOMElement, createjs.DisplayObject);

Expand Down Expand Up @@ -255,9 +256,9 @@ this.createjs = this.createjs||{};
var n = 10000; // precision

if (!oldMtx || !oldMtx.equals(mtx)) {
var str = "matrix(" + (mtx.a*n|0)/n +","+ (mtx.b*n|0)/n +","+ (mtx.c*n|0)/n +","+ (mtx.d*n|0)/n +","+ (mtx.tx+0.5|0);
style.transform = style.WebkitTransform = style.OTransform = style.msTransform = str +","+ (mtx.ty+0.5|0) +")";
style.MozTransform = str +"px,"+ (mtx.ty+0.5|0) +"px)";
var str = "matrix(" + (mtx.a*n|0)/n/this._devicePixelRatio +","+ (mtx.b*n|0)/n +","+ (mtx.c*n|0)/n +","+ (mtx.d*n|0)/n/this._devicePixelRatio +","+ (mtx.tx+0.5|0)/this._devicePixelRatio;
style.transform = style.WebkitTransform = style.OTransform = style.msTransform = str +","+ (mtx.ty+0.5|0)/this._devicePixelRatio +")";
style.MozTransform = str +"px,"+ (mtx.ty+0.5|0)/this._devicePixelRatio +"px)";
if (!oldProps) { oldProps = this._oldProps = new createjs.DisplayProps(true, NaN); }
oldProps.matrix.copy(mtx);
}
Expand All @@ -268,6 +269,21 @@ this.createjs = this.createjs||{};
}
};

/**
* @method _getDevicePixelRatio
* @protected
*/
p._getDevicePixelRatio = function() {
var ratio = 1;
// To account for zoom, change to use deviceXDPI instead of systemXDPI
if (window.screen.systemXDPI != null && window.screen.logicalXDPI != null && window.screen.systemXDPI > window.screen.logicalXDPI) {
// Only allow for values > 1
ratio = window.screen.systemXDPI / window.screen.logicalXDPI;
} else if (window.devicePixelRatio != null) {
ratio = window.devicePixelRatio;
}
return ratio;
};

createjs.DOMElement = createjs.promote(DOMElement, "DisplayObject");
}());