Enhancement : Layers merge

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

View File

@ -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') {

View File

@ -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",

View File

@ -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",

File diff suppressed because one or more lines are too long