mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Issue #305 : Allow DrawingController to zoom out to real size

Browse Source
This commit is contained in:
jdescottes 2015-09-13 22:44:59 +02:00
parent 089b4ea14d
commit 1fe327495c
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/js/controller/DrawingController.js
View File

@ -225,17 +225,24 @@
};
ns.DrawingController.prototype.onMousewheel_ = function (jQueryEvent) {
var event = jQueryEvent.originalEvent;
var evt = jQueryEvent.originalEvent;
// Ratio between wheelDeltaY (mousewheel event) and deltaY (wheel event) is -40
var delta;
if (pskl.utils.UserAgent.isChrome) {
delta = event.wheelDeltaY;
delta = evt.wheelDeltaY;
} else if (pskl.utils.UserAgent.isIE11) {
delta = event.wheelDelta;
delta = evt.wheelDelta;
} else if (pskl.utils.UserAgent.isFirefox) {
delta = -40 * event.deltaY;
delta = -40 * evt.deltaY;
}
var modifier = Math.abs(delta / 120);
if (pskl.utils.UserAgent.isMac ? evt.metaKey : evt.ctrlKey) {
modifier = modifier * 5;
// prevent default to prevent the default browser UI resize
evt.preventDefault();
}
if (delta > 0) {
this.increaseZoom_(modifier);
} else if (delta < 0) {
@ -422,7 +429,7 @@
};
ns.DrawingController.prototype.getZoomStep_ = function () {
return this.calculateZoom_() / 10;
return Math.max(0.1, this.renderer.getZoom() / 15);
};
ns.DrawingController.prototype.setZoom_ = function (zoom) {

3
src/js/controller/preview/PreviewController.js
View File

@ -39,6 +39,7 @@
pskl.utils.Event.addEventListener(this.realSizePreview, 'click', this.onRealSizePreviewClick_, this);
pskl.app.shortcutService.addShortcut('alt+O', this.toggleOnionSkin_.bind(this));
pskl.app.shortcutService.addShortcut('ctrl+1', this.onRealSizePreviewClick_.bind(this));
$.subscribe(Events.FRAME_SIZE_CHANGED, this.onFrameSizeChange_.bind(this));
$.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
@ -62,6 +63,8 @@
ns.PreviewController.prototype.onRealSizePreviewClick_ = function () {
var realSizeEnabled = pskl.UserSettings.get(pskl.UserSettings.REAL_SIZE_PREVIEW);
pskl.UserSettings.set(pskl.UserSettings.REAL_SIZE_PREVIEW, !realSizeEnabled);
// ctrl + 1 is a browser shortcut : return false to prevent default (see ShortcutService)
return false;
};
ns.PreviewController.prototype.onUserSettingsChange_ = function (evt, name, value) {

10
src/js/rendering/frame/FrameRenderer.js
View File

@ -75,7 +75,14 @@
};
ns.FrameRenderer.prototype.setZoom = function (zoom) {
if (zoom > Constants.MINIMUM_ZOOM) {
if (zoom < Constants.MINIMUM_ZOOM) {
zoom = Constants.MINIMUM_ZOOM;
}
if (zoom == this.zoom) {
return;
}
// back up center coordinates
var centerX = this.offset.x + (this.displayWidth / (2 * this.zoom));
var centerY = this.offset.y + (this.displayHeight / (2 * this.zoom));
@ -86,7 +93,6 @@
centerX - (this.displayWidth / (2 * this.zoom)),
centerY - (this.displayHeight / (2 * this.zoom))
);
}
};
ns.FrameRenderer.prototype.getZoom = function () {