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

Enhancement : Layers merge

Browse Source 
Added drawing test + fixed drawing test runner on Mac OS X
This commit is contained in:
juliandescottes 2014-09-13 20:21:40 +02:00
parent 4ed7338f25
commit 9325abb924
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/devtools/DrawingTestPlayer.js
View File

@ -101,6 +101,10 @@
var screenCoordinates = pskl.app.drawingController.getScreenCoordinates(recordEvent.coords.x, recordEvent.coords.y); var screenCoordinates = pskl.app.drawingController.getScreenCoordinates(recordEvent.coords.x, recordEvent.coords.y);
event.clientX = screenCoordinates.x; event.clientX = screenCoordinates.x;
event.clientY = screenCoordinates.y; event.clientY = screenCoordinates.y;
if (pskl.utils.UserAgent.isMac && event.ctrlKey) {
event.metaKey = true;
}
if (event.type == 'mousedown') { if (event.type == 'mousedown') {
pskl.app.drawingController.onMousedown_(event); pskl.app.drawingController.onMousedown_(event);
} else if (event.type == 'mouseup') { } else if (event.type == 'mouseup') {

1
test/drawing/DrawingTests.browser.js
View File

@ -4,6 +4,7 @@
"color.picker.json", "color.picker.json",
"frames.fun.json", "frames.fun.json",
"layers.fun.json", "layers.fun.json",
"layers.merge.json",
"lighten.darken.json", "lighten.darken.json",
"move.json", "move.json",
"pen.secondary.color.json", "pen.secondary.color.json",

1
test/drawing/DrawingTests.casper.js
View File

@ -3,6 +3,7 @@
"color.picker.json", "color.picker.json",
"frames.fun.json", "frames.fun.json",
"layers.fun.json", "layers.fun.json",
"layers.merge.json",
"move.json", "move.json",
"pen.secondary.color.json", "pen.secondary.color.json",
"squares.circles.json", "squares.circles.json",

1
test/drawing/tests/layers.merge.json Normal file
View File

File diff suppressed because one or more lines are too long