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

fix merge of smaller piskel into bigger piskel

Browse Source
This commit is contained in:
juliandescottes 2017-05-09 00:06:22 +02:00 committed by Julian Descottes
parent 4d07a4eb90
commit 92934502e8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/utils/MergeUtils.js
View File

@ -17,11 +17,15 @@
* @return {Piskel} The new Piskel instance created * @return {Piskel} The new Piskel instance created
*/ */
merge : function (piskel, importedPiskel, options) { merge : function (piskel, importedPiskel, options) {
var isImportedPiskelBigger =
importedPiskel.getWidth() > piskel.getWidth() ||
importedPiskel.getHeight() > piskel.getHeight();
// First make sure both the piskel and the imported piskel use the target dimensions. // First make sure both the piskel and the imported piskel use the target dimensions.
if (options.resize === 'expand') { if (isImportedPiskelBigger && options.resize === 'expand') {
piskel = pskl.utils.ResizeUtils.resizePiskel(piskel, { piskel = pskl.utils.ResizeUtils.resizePiskel(piskel, {
width : importedPiskel.getWidth(), width : Math.max(piskel.getWidth(), importedPiskel.getWidth()),
height : importedPiskel.getHeight(), height : Math.max(piskel.getHeight(), importedPiskel.getHeight()),
origin : options.origin, origin : options.origin,
resizeContent: false resizeContent: false
}); });