use strokeColor instead of adding a new field

This commit is contained in:
Faustino Kialungila 2020-01-03 17:19:24 +01:00
parent 12519b18de
commit ce6f5759dc

View file

@ -111,7 +111,6 @@ function newElement(
y: number, y: number,
strokeColor: string, strokeColor: string,
backgroundColor: string, backgroundColor: string,
textColor: string,
width = 0, width = 0,
height = 0 height = 0
) { ) {
@ -124,7 +123,6 @@ function newElement(
isSelected: false, isSelected: false,
strokeColor: strokeColor, strokeColor: strokeColor,
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
textColor: textColor,
draw(rc: RoughCanvas, context: CanvasRenderingContext2D) {} draw(rc: RoughCanvas, context: CanvasRenderingContext2D) {}
}; };
return element; return element;
@ -347,12 +345,14 @@ function generateDraw(element: ExcaliburElement) {
element.draw = (rc, context) => { element.draw = (rc, context) => {
const font = context.font; const font = context.font;
context.font = element.font; context.font = element.font;
context.fillStyle = element.textColor; const fillStyle = context.fillStyle;
context.fillStyle = element.strokeColor;
context.fillText( context.fillText(
element.text, element.text,
element.x, element.x,
element.y + element.actualBoundingBoxAscent element.y + element.actualBoundingBoxAscent
); );
context.fillStyle = fillStyle;
context.font = font; context.font = font;
}; };
} else { } else {
@ -418,7 +418,6 @@ type AppState = {
exportPadding: number; exportPadding: number;
currentItemStrokeColor: string; currentItemStrokeColor: string;
currentItemBackgroundColor: string; currentItemBackgroundColor: string;
textColor: string;
viewBackgroundColor: string; viewBackgroundColor: string;
}; };
@ -461,7 +460,6 @@ class App extends React.Component<{}, AppState> {
exportPadding: 10, exportPadding: 10,
currentItemStrokeColor: "#000000", currentItemStrokeColor: "#000000",
currentItemBackgroundColor: "#ffffff", currentItemBackgroundColor: "#ffffff",
textColor: "#000000",
viewBackgroundColor: "#ffffff" viewBackgroundColor: "#ffffff"
}; };
@ -587,8 +585,7 @@ class App extends React.Component<{}, AppState> {
x, x,
y, y,
this.state.currentItemStrokeColor, this.state.currentItemStrokeColor,
this.state.currentItemBackgroundColor, this.state.currentItemBackgroundColor
this.state.textColor
); );
let isDraggingElements = false; let isDraggingElements = false;
const cursorStyle = document.documentElement.style.cursor; const cursorStyle = document.documentElement.style.cursor;
@ -770,16 +767,6 @@ class App extends React.Component<{}, AppState> {
/> />
Shape Background Shape Background
</label> </label>
<label>
<input
type="color"
value={this.state.textColor}
onChange={e => {
this.setState({ textColor: e.target.value });
}}
/>
Text Color
</label>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>Export</legend> <legend>Export</legend>