mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Fix : Lighten tooltip + fix for #170
Issue 170 : both selected frame and layer are kept after a resize
This commit is contained in:
parent
d8772bdd8d
commit
1401c30d87
|
@ -9,10 +9,17 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
ns.PiskelController.prototype.setPiskel = function (piskel) {
|
/**
|
||||||
|
* Set the current piskel. Will reset the selected frame and layer unless specified
|
||||||
|
* @param {Object} piskel
|
||||||
|
* @param {Boolean} preserveState if true, keep the selected frame and layer
|
||||||
|
*/
|
||||||
|
ns.PiskelController.prototype.setPiskel = function (piskel, preserveState) {
|
||||||
this.piskel = piskel;
|
this.piskel = piskel;
|
||||||
|
if (!preserveState) {
|
||||||
this.currentLayerIndex = 0;
|
this.currentLayerIndex = 0;
|
||||||
this.currentFrameIndex = 0;
|
this.currentFrameIndex = 0;
|
||||||
|
}
|
||||||
|
|
||||||
this.layerIdCounter = 1;
|
this.layerIdCounter = 1;
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
pskl.app.shortcutService.addShortcut('shift+n', this.duplicateCurrentFrame.bind(this));
|
pskl.app.shortcutService.addShortcut('shift+n', this.duplicateCurrentFrame.bind(this));
|
||||||
};
|
};
|
||||||
|
|
||||||
ns.PublicPiskelController.prototype.setPiskel = function (piskel) {
|
ns.PublicPiskelController.prototype.setPiskel = function (piskel, preserveState) {
|
||||||
this.piskelController.setPiskel(piskel);
|
this.piskelController.setPiskel(piskel, preserveState);
|
||||||
|
|
||||||
$.publish(Events.FRAME_SIZE_CHANGED);
|
$.publish(Events.FRAME_SIZE_CHANGED);
|
||||||
$.publish(Events.PISKEL_RESET);
|
$.publish(Events.PISKEL_RESET);
|
||||||
|
|
|
@ -32,7 +32,8 @@
|
||||||
var resizedLayers = this.piskelController.getLayers().map(this.resizeLayer_.bind(this));
|
var resizedLayers = this.piskelController.getLayers().map(this.resizeLayer_.bind(this));
|
||||||
|
|
||||||
var piskel = pskl.model.Piskel.fromLayers(resizedLayers, this.piskelController.getPiskel().getDescriptor());
|
var piskel = pskl.model.Piskel.fromLayers(resizedLayers, this.piskelController.getPiskel().getDescriptor());
|
||||||
pskl.app.piskelController.setPiskel(piskel);
|
|
||||||
|
pskl.app.piskelController.setPiskel(piskel, true);
|
||||||
$.publish(Events.CLOSE_SETTINGS_DRAWER);
|
$.publish(Events.CLOSE_SETTINGS_DRAWER);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
ns.Lighten = function() {
|
ns.Lighten = function() {
|
||||||
this.superclass.constructor.call(this);
|
this.superclass.constructor.call(this);
|
||||||
this.toolId = "tool-lighten";
|
this.toolId = "tool-lighten";
|
||||||
this.helpText = "Lighten / Darken";
|
this.helpText = "Lighten or ctrl:Darken";
|
||||||
this.step = 3;
|
this.step = 3;
|
||||||
this.resetUsedPixels_();
|
this.resetUsedPixels_();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user