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

allow animated zooming to continue seemlessly if animation is already in progress

Browse Source
This commit is contained in:
Benjamin Stover 2010-09-02 16:49:14 -07:00
parent 92ac0814cc
commit f8db2a5344
2 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
mobile/chrome/content/AnimatedZoom.js
View File

@ -46,28 +46,63 @@ let Cu = Components.utils;
/**
* Responsible for zooming in to a given view rectangle
*/
function AnimatedZoom() {
// Render a snapshot of the viewport contents around the visible rect
this.animationDuration = Services.prefs.getIntPref("browser.ui.zoom.animationDuration");
}
const animatedZoom = {
/** Starts an animated zoom to zoomRect. */
animateTo: function(aZoomRect) {
if (!aZoomRect)
return;
AnimatedZoom.prototype = {
startTimer: function() {
if (this.zoomTo && !this.beginTime) {
Browser.hideSidebars();
Browser.hideTitlebar();
Browser.forceChromeReflow();
this.zoomTo = aZoomRect.clone();
if (this.animationDuration === undefined)
this.animationDuration = Services.prefs.getIntPref("browser.ui.zoom.animationDuration");
Browser.hideSidebars();
Browser.hideTitlebar();
Browser.forceChromeReflow();
this.beginTime = Date.now();
// Check if zooming animations were occuring before.
if (this.zoomFrom) {
this.zoomFrom = this.zoomRect;
}
else {
let browserRect = Rect.fromRect(getBrowser().getBoundingClientRect());
this.zoomFrom = browserRect.translate(getBrowser()._frameLoader.viewportScrollX, getBrowser()._frameLoader.viewportScrollY);
let scrollX = {}, scrollY = {};
getBrowser().getPosition(scrollX, scrollY);
this.zoomFrom = browserRect.translate(scrollX.value, scrollY.value);
this.updateTo(this.zoomFrom);
this.beginTime = Date.now();
window.addEventListener("MozBeforePaint", this, false);
mozRequestAnimationFrame();
}
},
/** Updates the zoom to new rect. */
updateTo: function(nextRect) {
let zoomRatio = window.innerWidth / nextRect.width;
let zoomLevel = getBrowser().scale * zoomRatio;
// XXX using the underlying frameLoader APIs is undesirable and is not a
// pattern to propagate. The browser binding should be taking care of this!
// There is some bug that I have not yet discovered that make browser.scrollTo
// not behave correctly and there is no intelligence in browser.scale to keep
// the actual resolution changes small.
getBrowser()._frameLoader.setViewportScale(zoomLevel, zoomLevel);
getBrowser()._frameLoader.scrollViewportTo(nextRect.left * zoomRatio, nextRect.top * zoomRatio);
this.zoomRect = nextRect;
},
/** Stop animation, zoom to point, and clean up. */
finish: function() {
window.removeEventListener("MozBeforePaint", this, false);
Browser.setVisibleRect(this.zoomTo);
this.beginTime = null;
this.zoomTo = null;
this.zoomFrom = null;
this.zoomRect = null;
},
handleEvent: function(aEvent) {
try {
let tdiff = aEvent.timeStamp - this.beginTime;
@ -87,32 +122,5 @@ AnimatedZoom.prototype = {
this.finish();
throw e;
}
},
/** Updates the zoom to new rect. */
updateTo: function(nextRect) {
let zoomRatio = window.innerWidth / nextRect.width;
let zoomLevel = getBrowser().scale * zoomRatio;
// XXX using the underlying frameLoader APIs is undesirable and is not a
// pattern to propagate. The browser binding should be taking care of this!
// There is some bug that I have not yet discovered that make browser.scrollTo
// not behave correctly and there is no intelligence in browser.scale to keep
// the actual resolution changes small.
getBrowser()._frameLoader.setViewportScale(zoomLevel, zoomLevel);
getBrowser()._frameLoader.scrollViewportTo(nextRect.left * zoomRatio, nextRect.top * zoomRatio);
},
/** Starts an animated zoom to zoomRect. */
animateTo: function(aZoomRect) {
this.zoomTo = aZoomRect.clone();
this.startTimer();
},
/** Stop animation, zoom to point, and clean up. */
finish: function() {
window.removeEventListener("MozBeforePaint", this, false);
Browser.setVisibleRect(this.zoomTo);
this.beginTime = null;
this.zoomTo = null;
}
};

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

@ -911,8 +911,7 @@ var Browser = {
},
animatedZoomTo: function animatedZoomTo(rect) {
let zoom = new AnimatedZoom();
zoom.animateTo(rect);
animatedZoom.animateTo(rect);
},
setVisibleRect: function setVisibleRect(rect) {