From cd3d6943650024aa6778de8baf562d0bccf9ba7c Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Wed, 26 Aug 2009 14:13:09 -0400 Subject: [PATCH] bug 512472 - Fennec lays pages out too wide, resulting in very small text r=mfinkle --- mobile/chrome/content/BrowserView.js | 4 +++- mobile/chrome/content/browser.js | 9 +-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mobile/chrome/content/BrowserView.js b/mobile/chrome/content/BrowserView.js index 58f9cbaa26cb..4bc49bdc10fa 100644 --- a/mobile/chrome/content/BrowserView.js +++ b/mobile/chrome/content/BrowserView.js @@ -490,7 +490,9 @@ BrowserView.prototype = { return; let [w, h] = BrowserView.Util.getBrowserDimensions(browser); - this.setZoomLevel(BrowserView.Util.pageZoomLevel(this.getVisibleRect(), w, h)); + let pageZoom = BrowserView.Util.pageZoomLevel(this.getVisibleRect(), w, h); + this._browser.markupDocumentViewer.textZoom = 1 / pageZoom; + this.setZoomLevel(pageZoom); }, zoom: function zoom(aDirection) { diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js index 66b3ab6aa1cd..8e2b2aa6e6e2 100644 --- a/mobile/chrome/content/browser.js +++ b/mobile/chrome/content/browser.js @@ -60,7 +60,6 @@ function getBrowser() { return Browser.selectedBrowser; } -const kDefaultTextZoom = 1.2; const kDefaultBrowserWidth = 1024; function debug() { @@ -2248,15 +2247,9 @@ ProgressController.prototype = { _networkStart: function _networkStart() { this._tab.startLoading(); - if (Browser.selectedBrowser == this.browser) { + if (Browser.selectedBrowser == this.browser) BrowserUI.update(TOOLBARSTATE_LOADING); - // We increase the default text size to make the text more readable when - // the page is zoomed out - if (this.browser.markupDocumentViewer.textZoom != kDefaultTextZoom) - this.browser.markupDocumentViewer.textZoom = kDefaultTextZoom; - } - // broadcast a URLChanged message for consumption by InputHandler let event = document.createEvent("Events"); event.initEvent("URLChanged", true, false);