add mouse position scale factor

prime-slam · Jun 8, 2024 · 58f4ef8 · 58f4ef8
1 parent f629fa5
commit 58f4ef8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,7 +75,9 @@ application {
         "--add-opens", "javafx.graphics/javafx.scene.image=ALL-UNNAMED",
         "--add-exports", "javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED",
         "-Xms2g",
-        "-Xmx4g"
+        "-Xmx4g",
+        "-Dglass.win.uiScale=1.0",
+        "-Dsun.java2d.uiScale=1.0"
     )
 }
 

diff --git a/src/main/kotlin/solve/scene/view/SceneView.kt b/src/main/kotlin/solve/scene/view/SceneView.kt
@@ -3,6 +3,7 @@ package solve.scene.view
 import javafx.application.Platform
 import javafx.beans.InvalidationListener
 import javafx.scene.input.MouseEvent
+import javafx.stage.Screen
 import org.joml.Vector2i
 import solve.rendering.canvas.SceneCanvas
 import solve.rendering.engine.core.input.MouseButton
@@ -23,6 +24,7 @@ class SceneView : View() {
     private var mouseScreenPoint = Vector2i()
 
     private var wasMouseDragging = false
+    private var screen = Screen.getPrimary()
 
     override val root = canvas.canvas
 
@@ -38,8 +40,12 @@ class SceneView : View() {
         addBindings()
     }
 
-    private fun extrudeEventMousePosition(event: MouseEvent) = Vector2i(event.x.toInt(), event.y.toInt())
-
+    private fun extrudeEventMousePosition(event: MouseEvent) : Vector2i {
+        return Vector2i(
+            (event.x * screen.outputScaleX).toInt(),
+            (event.y * screen.outputScaleY).toInt()
+        )
+    }
     private fun addBindings() {
         addSceneParamsBindings()
         addSceneFramesBindings()