Only show shape preview if using a brush
parent
b20caab1d7
commit
e0572c82a1
|
@ -25,6 +25,7 @@
|
|||
let mousePixelX: number = 0
|
||||
let mousePixelY: number = 0
|
||||
|
||||
export let currentTool: Tool
|
||||
export let primaryColorIndex: number
|
||||
export let secondaryColorIndex: number
|
||||
export let brushSize: number
|
||||
|
@ -164,6 +165,7 @@
|
|||
ctx.lineWidth = 1
|
||||
|
||||
// Draw brush preview.
|
||||
if (currentTool instanceof BrushTool) {
|
||||
let shape: PixelPosition[]
|
||||
if (brushType === 'square' || brushSize <= 2) {
|
||||
// FIXME: This is daft to adjust +1,+1 for size 2 -- without this, the rect preview draws one pixel offset to the top-left, which is not the same as when the filled rect is placed.
|
||||
|
@ -180,6 +182,7 @@
|
|||
for (let i = 0; i < shape.length; i++) {
|
||||
ctx.fillRect(offsetX*zoom+(mousePixelX+shape[i].x)*zoom, offsetY*zoom+(mousePixelY+shape[i].y)*zoom, zoom, zoom)
|
||||
}
|
||||
}
|
||||
// Draw zoomed pixel-sized square where mouse is.
|
||||
if (zoom > 1) {
|
||||
ctx.rect(offsetX*zoom+mousePixelX*zoom, offsetY*zoom+mousePixelY*zoom, 1*zoom, 1*zoom)
|
||||
|
@ -206,8 +209,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
export let currentTool: Tool
|
||||
|
||||
function canvasMousedown(node) {
|
||||
let buttons: Set<number> = new Set()
|
||||
let x: number = 0
|
||||
|
|
Loading…
Reference in New Issue