From 644bf8031c0c4cdee2e6d3190916bcdf59a7763c Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Sun, 29 Jan 2012 20:05:44 +0200 Subject: [PATCH] Bug 722129 - Tilt visualization mesh isn't correctly positioned when scrollbars are present or when the document body is smaller than the content window; r=rcampbell --- browser/devtools/tilt/TiltVisualizer.jsm | 5 ++--- browser/devtools/tilt/test/browser_tilt_picking.js | 2 +- browser/devtools/tilt/test/browser_tilt_picking_delete.js | 3 +-- .../devtools/tilt/test/browser_tilt_picking_highlight02.js | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/browser/devtools/tilt/TiltVisualizer.jsm b/browser/devtools/tilt/TiltVisualizer.jsm index cd357fdd4cb8..fbbc243cf896 100644 --- a/browser/devtools/tilt/TiltVisualizer.jsm +++ b/browser/devtools/tilt/TiltVisualizer.jsm @@ -552,9 +552,8 @@ TiltVisualizer.Presenter.prototype = { if (!this._initialMeshConfiguration) { this._initialMeshConfiguration = true; - let zoom = this.transforms.zoom; - let width = Math.min(aData.meshWidth * zoom, renderer.width); - let height = Math.min(aData.meshHeight * zoom, renderer.height); + let width = renderer.width; + let height = renderer.height; // set the necessary mesh offsets this.transforms.offset[0] = -width * 0.5; diff --git a/browser/devtools/tilt/test/browser_tilt_picking.js b/browser/devtools/tilt/test/browser_tilt_picking.js index 2ac9b98f570e..653e37f8121b 100644 --- a/browser/devtools/tilt/test/browser_tilt_picking.js +++ b/browser/devtools/tilt/test/browser_tilt_picking.js @@ -23,7 +23,7 @@ function test() { presenter.onSetupMesh = function() { - presenter.pickNode(canvas.width / 2, canvas.height / 2, { + presenter.pickNode(canvas.width / 2, 10, { onpick: function(data) { ok(data.index > 0, diff --git a/browser/devtools/tilt/test/browser_tilt_picking_delete.js b/browser/devtools/tilt/test/browser_tilt_picking_delete.js index dc27a01efee2..98c836085727 100644 --- a/browser/devtools/tilt/test/browser_tilt_picking_delete.js +++ b/browser/devtools/tilt/test/browser_tilt_picking_delete.js @@ -24,8 +24,7 @@ function test() { Services.obs.addObserver(whenNodeRemoved, NODE_REMOVED, false); presenter.onSetupMesh = function() { - presenter.highlightNodeAt(presenter.canvas.width / 2, - presenter.canvas.height / 2, { + presenter.highlightNodeAt(presenter.canvas.width / 2, 10, { onpick: function() { ok(presenter._currentSelection > 0, diff --git a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js b/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js index 9ca5dba84e0a..a378495ff1c0 100644 --- a/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js +++ b/browser/devtools/tilt/test/browser_tilt_picking_highlight02.js @@ -24,8 +24,7 @@ function test() { Services.obs.addObserver(whenHighlighting, HIGHLIGHTING, false); presenter.onSetupMesh = function() { - presenter.highlightNodeAt(presenter.canvas.width / 2, - presenter.canvas.height / 2); + presenter.highlightNodeAt(presenter.canvas.width / 2, 10); }; } });