diff options
| author | bob <bcz@cs.brown.edu> | 2019-06-24 10:51:50 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-06-24 10:51:50 -0400 |
| commit | e7da3532dea3f51ffbd432e7ea64f4a34f651e08 (patch) | |
| tree | a3db7cfa1ca86d2e74952fb04f4244d6e0541e2e /src/client/views | |
| parent | 62cbed8b69ca2b2a6c8e42053bca900646f7d0d1 (diff) | |
| parent | 52051829373bc4acfe9d705b64c30e3fddebf439 (diff) | |
Merge branch 'master' into templatesMac
Diffstat (limited to 'src/client/views')
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx index 20a9a172c..71964ef82 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx @@ -218,7 +218,7 @@ export class CollectionFreeFormView extends CollectionSubView(PanZoomDocument) { } else { // if (modes[e.deltaMode] === 'pixels') coefficient = 50; // else if (modes[e.deltaMode] === 'lines') coefficient = 1000; // This should correspond to line-height?? - let deltaScale = (1 - (e.deltaY / coefficient)); + let deltaScale = e.deltaY > 0 ? (1 / 1.1) : 1.1; if (deltaScale * this.zoomScaling() < 1 && this.isAnnotationOverlay) { deltaScale = 1 / this.zoomScaling(); } |
