mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Enhancement : Layers merge
Added drawing test + fixed drawing test runner on Mac OS X
This commit is contained in:
parent
4ed7338f25
commit
9325abb924
@ -101,6 +101,10 @@
|
||||
var screenCoordinates = pskl.app.drawingController.getScreenCoordinates(recordEvent.coords.x, recordEvent.coords.y);
|
||||
event.clientX = screenCoordinates.x;
|
||||
event.clientY = screenCoordinates.y;
|
||||
if (pskl.utils.UserAgent.isMac && event.ctrlKey) {
|
||||
event.metaKey = true;
|
||||
}
|
||||
|
||||
if (event.type == 'mousedown') {
|
||||
pskl.app.drawingController.onMousedown_(event);
|
||||
} else if (event.type == 'mouseup') {
|
||||
|
@ -4,6 +4,7 @@
|
||||
"color.picker.json",
|
||||
"frames.fun.json",
|
||||
"layers.fun.json",
|
||||
"layers.merge.json",
|
||||
"lighten.darken.json",
|
||||
"move.json",
|
||||
"pen.secondary.color.json",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"color.picker.json",
|
||||
"frames.fun.json",
|
||||
"layers.fun.json",
|
||||
"layers.merge.json",
|
||||
"move.json",
|
||||
"pen.secondary.color.json",
|
||||
"squares.circles.json",
|
||||
|
1
test/drawing/tests/layers.merge.json
Normal file
1
test/drawing/tests/layers.merge.json
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user