take scale mode into account for mouse events

haxeui · Sep 17, 2023 · 830aefa · 830aefa
1 parent ea7ec80
commit 830aefa
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/haxe/ui/backend/ScreenImpl.hx b/haxe/ui/backend/ScreenImpl.hx
@@ -46,6 +46,7 @@ class ScreenImpl extends ScreenBase {
     }
 
     private function onWindowResize() {
+        MouseHelper.updateScale(true);
         resizeRootComponents();
     }
 
@@ -63,6 +64,7 @@ class ScreenImpl extends ScreenBase {
     }
     private function set_root(value:Object):Object {
         _root = value;
+        MouseHelper.updateScale();
         return value;
     }
 

diff --git a/haxe/ui/backend/heaps/MouseHelper.hx b/haxe/ui/backend/heaps/MouseHelper.hx
@@ -108,9 +108,30 @@ class MouseHelper {
         }
     }
 
+    private static var scaleX:Null<Float> = null;
+    private static var scaleY:Null<Float> = null;
+    public static function updateScale(force:Bool = false) {
+        if (force) {
+            scaleX = null;
+            scaleY = null;
+        }
+        if (scaleX != null && scaleY != null) {
+            return;
+        }
+
+        switch (Screen.instance.scene.scaleMode) {
+            case LetterBox(width, height, integerScale, horizontalAlign, verticalAlign):
+                scaleX = hxd.Window.getInstance().width / width;
+                scaleY = hxd.Window.getInstance().height / height;
+            case _:    
+                scaleX = 1;
+                scaleY = 1;
+        }
+    }
+
     private static function onMouseMove(e:hxd.Event) {
-        currentMouseX = e.relX / Toolkit.scaleX;
-        currentMouseY = e.relY / Toolkit.scaleY;
+        currentMouseX = e.relX / (Toolkit.scaleX * scaleX);
+        currentMouseY = e.relY / (Toolkit.scaleY * scaleY);
 
         var list = _callbacks.get(MouseEvent.MOUSE_MOVE);
         if (list == null || list.length == 0) {
@@ -122,8 +143,8 @@ class MouseHelper {
 
         var event = new MouseEvent(MouseEvent.MOUSE_MOVE);
         @:privateAccess event._originalEvent = e;
-        event.screenX = e.relX / Toolkit.scaleX;
-        event.screenY = e.relY / Toolkit.scaleY;
+        event.screenX = e.relX / (Toolkit.scaleX * scaleX);
+        event.screenY = e.relY / (Toolkit.scaleY * scaleY);
         for (l in list) {
             l(event);
 			if (event.canceled) {
@@ -143,8 +164,8 @@ class MouseHelper {
 
         var event = new MouseEvent(MouseEvent.MOUSE_DOWN);
         @:privateAccess event._originalEvent = e;
-        event.screenX = e.relX / Toolkit.scaleX;
-        event.screenY = e.relY / Toolkit.scaleY;
+        event.screenX = e.relX / (Toolkit.scaleX * scaleX);
+        event.screenY = e.relY / (Toolkit.scaleX * scaleX);
         event.data = e.button;
         for (l in list) {
             l(event);
@@ -165,8 +186,8 @@ class MouseHelper {
 
         var event = new MouseEvent(MouseEvent.MOUSE_UP);
         @:privateAccess event._originalEvent = e;
-        event.screenX = e.relX / Toolkit.scaleX;
-        event.screenY = e.relY / Toolkit.scaleY;
+        event.screenX = e.relX / (Toolkit.scaleX * scaleX);
+        event.screenY = e.relY / (Toolkit.scaleX * scaleX);
         event.data = e.button;
         for (l in list) {
             l(event);