Merge pull request #3968 from yurydelendik/hidpi-2

Fixes find position in HiDPI displays
This commit is contained in:
Brendan Dahl 2013-11-25 09:32:21 -08:00
commit fe2700ca2d
2 changed files with 7 additions and 2 deletions

View File

@ -455,8 +455,8 @@ var PageView = function pageView(container, id, scale,
outputScale.scaled = true; outputScale.scaled = true;
} }
canvas.width = Math.floor(viewport.width * outputScale.sx); canvas.width = (Math.floor(viewport.width) * outputScale.sx) | 0;
canvas.height = Math.floor(viewport.height * outputScale.sy); canvas.height = (Math.floor(viewport.height) * outputScale.sy) | 0;
canvas.style.width = Math.floor(viewport.width) + 'px'; canvas.style.width = Math.floor(viewport.width) + 'px';
canvas.style.height = Math.floor(viewport.height) + 'px'; canvas.style.height = Math.floor(viewport.height) + 'px';
// Add the viewport so it's known what it was originally drawn with. // Add the viewport so it's known what it was originally drawn with.
@ -489,6 +489,8 @@ var PageView = function pageView(container, id, scale,
(1 / outputScale.sy) + ')'; (1 / outputScale.sy) + ')';
CustomStyle.setProp('transform' , textLayerDiv, cssScale); CustomStyle.setProp('transform' , textLayerDiv, cssScale);
CustomStyle.setProp('transformOrigin' , textLayerDiv, '0% 0%'); CustomStyle.setProp('transformOrigin' , textLayerDiv, '0% 0%');
textLayerDiv.dataset._scaleX = outputScale.sx;
textLayerDiv.dataset._scaleY = outputScale.sy;
} }
//#if (FIREFOX || MOZCENTRAL) //#if (FIREFOX || MOZCENTRAL)

View File

@ -113,6 +113,9 @@ function scrollIntoView(element, spot) {
return; return;
} }
while (parent.clientHeight == parent.scrollHeight) { while (parent.clientHeight == parent.scrollHeight) {
if (parent.dataset._scaleY) {
offsetY /= parent.dataset._scaleY;
}
offsetY += parent.offsetTop; offsetY += parent.offsetTop;
parent = parent.offsetParent; parent = parent.offsetParent;
if (!parent) if (!parent)