wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 672411 - Calculate the viewport height correctly for non-scalable pages [r=wesj]

Browse Source
This commit is contained in:
Matt Brubeck 2011-07-29 07:18:50 -07:00
parent 08eba5f725
commit 303c5e0ae1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/chrome/content/browser.js
View File

@ -2731,8 +2731,8 @@ Tab.prototype = {
// Make sure the viewport height is not shorter than the window when
// the page is zoomed out to show its full width.
if (viewportH * this.clampZoomLevel(this.getPageZoomLevel()) < screenH)
viewportH = Math.max(viewportH, screenH * (browser.contentDocumentWidth / screenW));
let minScale = this.clampZoomLevel(this.getPageZoomLevel());
viewportH = Math.max(viewportH, screenH / minScale);
if (browser.contentWindowWidth != viewportW || browser.contentWindowHeight != viewportH)
browser.setWindowSize(viewportW, viewportH);
@ -2865,10 +2865,13 @@ Tab.prototype = {
},
clampZoomLevel: function clampZoomLevel(aScale) {
let md = this.metadata;
if (!this.allowZoom)
return (md && md.defaultZoom) ? md.defaultZoom : this.getPageZoomLevel();
let browser = this._browser;
let bounded = Util.clamp(aScale, ZoomManager.MIN, ZoomManager.MAX);
let md = this.metadata;
if (md && md.minZoom)
bounded = Math.max(bounded, md.minZoom);
if (md && md.maxZoom)