Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zomm step changed to 50%

Browse source
This commit is contained in:
Maxim Kadushkin 2018-02-01 17:14:11 +03:00
parent e7d08c0e5d
commit 1497eae9d2
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/common/main/lib/util/utils.js
View file

@ -109,30 +109,25 @@ Common.Utils = _.extend(new(function() {
me = this,
checkSize = function() {
me.zoom = 1;
if (isChrome && !isOpera && !isMobile && document && document.firstElementChild && document.body)
{
if (isChrome && !isOpera && !isMobile && document && document.firstElementChild && document.body) {
// делаем простую проверку
// считаем: 0 < window.devicePixelRatio < 2 => _devicePixelRatio = 1; zoom = window.devicePixelRatio / _devicePixelRatio;
// считаем: window.devicePixelRatio >= 2 => _devicePixelRatio = 2; zoom = window.devicePixelRatio / _devicePixelRatio;
if (window.devicePixelRatio > 0.1)
{
if (window.devicePixelRatio < 1.99)
{
var _devicePixelRatio = 1;
me.zoom = window.devicePixelRatio / _devicePixelRatio;
if (window.devicePixelRatio > 0.1) {
var _fraction = window.devicePixelRatio % 1;
var _devicePixelRatio = Math.floor(window.devicePixelRatio);
if ( !(_fraction < .5) ) {
_devicePixelRatio += .5;
}
else
{
var _devicePixelRatio = 2;
me.zoom = window.devicePixelRatio / _devicePixelRatio;
}
// chrome 54.x: zoom = "reset" - clear retina zoom (windows)
//document.firstElementChild.style.zoom = "reset";
document.firstElementChild.style.zoom = 1.0 / me.zoom;
}
else
document.firstElementChild.style.zoom = "normal";
}
me.innerWidth = window.innerWidth * me.zoom;
me.innerHeight = window.innerHeight * me.zoom;
};
@ -143,6 +138,8 @@ Common.Utils = _.extend(new(function() {
$(window).on('resize', checkSize);
return {
checkSize: checkSize,
userAgent: userAgent,
isStrict: isStrict,
isIEQuirks: isIE && (!isStrict && (isIE6 || isIE7 || isIE8 || isIE9)),

1
apps/documenteditor/main/app/controller/Main.js
View file

@ -964,6 +964,7 @@ define([
me.applyLicense();
$(window).off('resize');
$(window).on('resize', Common.Utils.checkSize);
}
}, 50);
} else {