scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2025-01-10 14:42:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' into convertToBitmap

Browse source
This commit is contained in:
DD 2018-04-09 20:11:57 -04:00
commit 8ffe666478
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/helper/blob-tools/blob.js
View file

@ -141,9 +141,10 @@ class Blobbiness {
blob.mergeBrush(lastPath); blob.mergeBrush(lastPath);
} }
// Remove cursor preview during snapshot, then bring it back
blob.cursorPreview.remove(); blob.cursorPreview.remove();
blob.cursorPreview = null;
blob.onUpdateSvg(); blob.onUpdateSvg();
blob.cursorPreview.parent = getGuideLayer();
// Reset // Reset
blob.brush = null; blob.brush = null;

7
src/helper/tools/text-tool.js
View file

@ -225,6 +225,11 @@ class TextTool extends paper.Tool {
this.active = false; this.active = false;
} }
handleKeyUp (event) { handleKeyUp (event) {
if (event.event.target instanceof HTMLInputElement) {
// Ignore nudge if a text input field is focused
return;
}
if (this.mode === TextTool.SELECT_MODE) { if (this.mode === TextTool.SELECT_MODE) {
this.nudgeTool.onKeyUp(event); this.nudgeTool.onKeyUp(event);
} }
@ -236,7 +241,7 @@ class TextTool extends paper.Tool {
} }
if (this.mode === TextTool.SELECT_MODE) { if (this.mode === TextTool.SELECT_MODE) {
this.nudgeTool.onKeyUp(event); this.nudgeTool.onKeyDown(event);
} }
} }
handleTextInput (event) { handleTextInput (event) {