chore: small changes

liriliri · Feb 16, 2024 · 723ec67 · 723ec67
1 parent 5b1d20e
commit 723ec67
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/src/painter/index.ts b/src/painter/index.ts
@@ -245,8 +245,8 @@ export default class Painter extends Component<IOptions> {
 
  this.resizeSensor.addListener(this.onResize)
 
- this.zoom.on('change', (ratio) => {
- this.currentTool.onZoom(ratio)
+ this.zoom.on('change', () => {
+ this.currentTool.onZoom()
  this.resetViewport()
  })
  }

diff --git a/src/painter/tools/Brush.ts b/src/painter/tools/Brush.ts
@@ -113,8 +113,8 @@ export default class Brush extends Tool {
  this.commitDraw(this.ctx)
  }
  }
- onZoom(ratio: number) {
- super.onZoom(ratio)
+ onZoom() {
+ super.onZoom()
  this.cursorCircle.render()
  }
  private draw(x: number, y: number) {

diff --git a/src/painter/tools/Eraser.ts b/src/painter/tools/Eraser.ts
@@ -44,8 +44,8 @@ export default class Eraser extends Tool {
  onAfterRenderLayer(layer: Layer) {
  this.getTool().onAfterRenderLayer(layer)
  }
- onZoom(ratio: number) {
- super.onZoom(ratio)
+ onZoom() {
+ super.onZoom()
  this.cursorCircle.render()
  }
  private getTool(): Brush | Pencil {

diff --git a/src/painter/tools/Pencil.ts b/src/painter/tools/Pencil.ts
@@ -104,8 +104,8 @@ export default class Pencil extends Tool {
  this.commitDraw(this.ctx)
  }
  }
- onZoom(ratio: number) {
- super.onZoom(ratio)
+ onZoom() {
+ super.onZoom()
  this.cursorCircle.render()
  }
  protected renderToolbar() {

diff --git a/src/painter/tools/Tool.ts b/src/painter/tools/Tool.ts
@@ -3,6 +3,7 @@ import $ from 'licia/$'
 import h from 'licia/h'
 import Emitter from 'licia/Emitter'
 import types from 'licia/types'
+import Zoom from './Zoom'
 import { eventPage } from '../../share/util'
 import LunaToolbar from 'luna-toolbar'
 
@@ -24,7 +25,6 @@ export default class Tool extends Emitter {
  protected toolbar: LunaToolbar
  protected options: types.PlainObj<any> = {}
  protected isUsing = false
- private zoomRatio = 1
  constructor(painter: Painter) {
  super()
  this.painter = painter
@@ -101,9 +101,6 @@ export default class Tool extends Emitter {
  })
  }
  }
- onZoom(ratio: number) {
- this.zoomRatio = ratio
- }
  /* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
  onMouseEnter(e: any) {
  this.$cursor.css({
@@ -115,6 +112,7 @@ export default class Tool extends Emitter {
  opacity: 0,
  })
  }
+ onZoom() {}
  onAfterRenderLayer(layer: Layer) {}
  protected renderToolbar() {
  this.toolbar.clear()
@@ -125,7 +123,8 @@ export default class Tool extends Emitter {
  const pageX = eventPage('x', e)
  const pageY = eventPage('y', e)
 
- const ratio = this.zoomRatio
+ const zoom = this.painter.getTool('zoom') as Zoom
+ const ratio = zoom.getRatio()
  const x = Math.floor((pageX - offset.left) / ratio)
  const y = Math.floor((pageY - offset.top) / ratio)
 

diff --git a/src/painter/tools/Zoom.ts b/src/painter/tools/Zoom.ts
@@ -119,7 +119,7 @@ export default class Zoom extends Tool {
  })
  viewport.scrollLeft = target.scrollLeft
  viewport.scrollTop = target.scrollTop
- this.emit('change', this.ratio)
+ this.emit('change')
  })
  .on('end', () => {
  this.isZooming = false