refactor: Use painter.getPosition method

warxander · Nov 13, 2023 · 7842e2b · 7842e2b
1 parent 1370f38
commit 7842e2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/core/painter.ts b/src/core/painter.ts
@@ -119,12 +119,8 @@ export class Painter {
 		this.setMouseCursor(MouseCursor.Grab);
 	}
 
-	getX(): number {
-		return this.position.x;
-	}
-
-	getY(): number {
-		return this.position.y;
+	getPosition(): Vector2 {
+		return this.position;
 	}
 
 	beginRow() {

diff --git a/src/exports.ts b/src/exports.ts
@@ -103,8 +103,8 @@ export function getContext(): IContext {
 				},
 
 				getPosition(): [number, number] {
-					const painter = context.getPainter();
-					return [painter.getX(), painter.getY()];
+					const position = context.getPainter().getPosition();
+					return [position.x, position.y];
 				},
 
 				setPosition(x: number, y: number) {

diff --git a/src/items/slider.ts b/src/items/slider.ts
@@ -24,13 +24,13 @@ export function slider(min: number, value: number, max: number, w: number): ISli
 	if (
 		(input.isKeyDown(InputKey.LeftMouseButton) || input.isKeyPressed(InputKey.LeftMouseButton)) &&
 		new Rect(
-			new Vector2(painter.getX() - sliderStyle.tickMarkSize.x / 2, painter.getY()),
+			new Vector2(painter.getPosition().x - sliderStyle.tickMarkSize.x / 2, painter.getPosition().y),
 			new Vector2(w + sliderStyle.tickMarkSize.x, h)
 		).contains(input.getMousePosition())
 	)
 		newValue = Math.min(
 			max,
-			Math.max(min, min + ((input.getMousePosition().x - painter.getX()) / w) * (max + min))
+			Math.max(min, min + ((input.getMousePosition().x - painter.getPosition().x) / w) * (max + min))
 		);
 
 	const sh = (h - sliderStyle.height) / 2;