mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 712386 - Limit how much zoom can be applied. r=Cwiiis
This commit is contained in:
parent
19621b98f1
commit
20d96ebe14
@ -937,6 +937,14 @@ public class PanZoomController
|
|||||||
|
|
||||||
synchronized (mController) {
|
synchronized (mController) {
|
||||||
float newZoomFactor = mController.getZoomFactor() * spanRatio;
|
float newZoomFactor = mController.getZoomFactor() * spanRatio;
|
||||||
|
if (newZoomFactor >= MAX_ZOOM) {
|
||||||
|
// apply resistance when zooming past MAX_ZOOM,
|
||||||
|
// such that it asymptotically reaches MAX_ZOOM + 1.0
|
||||||
|
// but never exceeds that
|
||||||
|
float excessZoom = newZoomFactor - MAX_ZOOM;
|
||||||
|
excessZoom = 1.0f - (float)Math.exp(-excessZoom);
|
||||||
|
newZoomFactor = MAX_ZOOM + excessZoom;
|
||||||
|
}
|
||||||
|
|
||||||
mController.scrollBy(new PointF(mLastZoomFocus.x - detector.getFocusX(),
|
mController.scrollBy(new PointF(mLastZoomFocus.x - detector.getFocusX(),
|
||||||
mLastZoomFocus.y - detector.getFocusY()));
|
mLastZoomFocus.y - detector.getFocusY()));
|
||||||
|
Loading…
Reference in New Issue
Block a user