Use scratch 2 default font

This commit is contained in:
Paul Kaplan 2018-03-29 11:46:02 -04:00
parent b1447b01da
commit 5c0219e745
2 changed files with 10 additions and 7 deletions

View file

@ -208,8 +208,11 @@ $border-radius: 0.25rem;
background: transparent;
border: none;
display: none;
font-family: Times;
font-size: 30px;
/* @todo needs to match the text tool font/size */
font-family: Helvetica;
font-size: 22px;
outline: none;
overflow: hidden;
padding: 0px;

View file

@ -47,7 +47,7 @@ class TextTool extends paper.Tool {
this.boundingBoxTool = new BoundingBoxTool(Modes.TEXT, setSelectedItems, clearSelectedItems, onUpdateSvg);
this.nudgeTool = new NudgeTool(this.boundingBoxTool, onUpdateSvg);
this.lastEvent = null;
// We have to set these functions instead of just declaring them because
// paper.js tools hook up the listeners in the setter functions.
this.onMouseDown = this.handleMouseDown;
@ -193,8 +193,8 @@ class TextTool extends paper.Tool {
this.textBox = new paper.PointText({
point: event.point,
content: '',
font: 'Times',
fontSize: 30,
font: 'Helvetica',
fontSize: 22,
fillColor: this.colorState.fillColor,
// Default leading for both the HTML text area and paper.PointText
// is 120%, but for some reason they are slightly off from each other.
@ -215,7 +215,7 @@ class TextTool extends paper.Tool {
}
handleMouseUp (event) {
if (event.event.button > 0 || !this.active) return; // only first mouse button
if (this.mode === TextTool.SELECT_MODE) {
this.boundingBoxTool.onMouseUp(event);
this.isBoundingBoxMode = null;
@ -234,7 +234,7 @@ class TextTool extends paper.Tool {
// Ignore nudge if a text input field is focused
return;
}
if (this.mode === TextTool.SELECT_MODE) {
this.nudgeTool.onKeyUp(event);
}