scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-25 08:38:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #170 from chrisgarrity/issue/gh137-paint-calibration

Browse source 
Don’t adjust paintEditor point on Android
This commit is contained in:
chrisgarrity 2018-05-03 09:30:17 -04:00 committed by GitHub
commit d19d63dc73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/painteditor/PaintAction.js
View file

@ -13,7 +13,7 @@ import SVGImage from './SVGImage';
import Camera from './Camera'; import Camera from './Camera';
import Events from '../utils/Events'; import Events from '../utils/Events';
import Rectangle from '../geom/Rectangle'; import Rectangle from '../geom/Rectangle';
import {gn, isTablet, getIdFor} from '../utils/lib'; import {gn, isTablet, isiOS, getIdFor} from '../utils/lib';
/* /*
Type of objects: Type of objects:
- fixed: Only exists on Assets Backgrounds and can it only be fill (color or camera) or removed - fixed: Only exists on Assets Backgrounds and can it only be fill (color or camera) or removed
@ -1131,8 +1131,10 @@ export default class PaintAction {
pt2.x = pt.x; pt2.x = pt.x;
pt2.y = pt.y; pt2.y = pt.y;
var globalPoint = pt2.matrixTransform(Paint.root.getScreenCTM().inverse()); var globalPoint = pt2.matrixTransform(Paint.root.getScreenCTM().inverse());
if (isiOS) {
globalPoint.x = globalPoint.x / Paint.currentZoom; globalPoint.x = globalPoint.x / Paint.currentZoom;
globalPoint.y = globalPoint.y / Paint.currentZoom; globalPoint.y = globalPoint.y / Paint.currentZoom;
}
return globalPoint; return globalPoint;
} }
} }