From 6e3f6acffc28f70056c1770231d692d177c1515d Mon Sep 17 00:00:00 2001
From: Adam Oates <adamsoates@protonmail.com>
Date: Sat, 8 Feb 2025 04:20:46 -0600
Subject: [PATCH]  gg: fix incorrect Event.mouse_x and Event.mouse_y on
 gg.Context.event_fn and gg.Context.on_event on HiDPI displays (#23668)

---
 vlib/gg/gg.c.v | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/vlib/gg/gg.c.v b/vlib/gg/gg.c.v
index 1da6579312..7162da0165 100644
--- a/vlib/gg/gg.c.v
+++ b/vlib/gg/gg.c.v
@@ -377,12 +377,18 @@ fn gg_event_fn(ce voidptr, user_data voidptr) {
 			e.mouse_button = .middle
 		}
 	}
-	ctx.mouse_pos_x = int(e.mouse_x / ctx.scale)
-	ctx.mouse_pos_y = int(e.mouse_y / ctx.scale)
-	ctx.mouse_dx = int(e.mouse_dx / ctx.scale)
-	ctx.mouse_dy = int(e.mouse_dy / ctx.scale)
-	ctx.scroll_x = int(e.scroll_x / ctx.scale)
-	ctx.scroll_y = int(e.scroll_y / ctx.scale)
+	e.mouse_x /= ctx.scale
+	e.mouse_y /= ctx.scale
+	e.mouse_dx /= ctx.scale
+	e.mouse_dy /= ctx.scale
+	e.scroll_x /= ctx.scale
+	e.scroll_y /= ctx.scale
+	ctx.mouse_pos_x = int(e.mouse_x)
+	ctx.mouse_pos_y = int(e.mouse_y)
+	ctx.mouse_dx = int(e.mouse_dx)
+	ctx.mouse_dy = int(e.mouse_dy)
+	ctx.scroll_x = int(e.scroll_x)
+	ctx.scroll_y = int(e.scroll_y)
 	ctx.key_modifiers = unsafe { Modifier(e.modifiers) }
 	ctx.key_repeat = e.key_repeat
 	if e.typ in [.key_down, .key_up] {
@@ -400,19 +406,17 @@ fn gg_event_fn(ce voidptr, user_data voidptr) {
 	match e.typ {
 		.mouse_move {
 			if ctx.config.move_fn != unsafe { nil } {
-				ctx.config.move_fn(e.mouse_x / ctx.scale, e.mouse_y / ctx.scale, ctx.config.user_data)
+				ctx.config.move_fn(e.mouse_x, e.mouse_y, ctx.config.user_data)
 			}
 		}
 		.mouse_down {
 			if ctx.config.click_fn != unsafe { nil } {
-				ctx.config.click_fn(e.mouse_x / ctx.scale, e.mouse_y / ctx.scale, e.mouse_button,
-					ctx.config.user_data)
+				ctx.config.click_fn(e.mouse_x, e.mouse_y, e.mouse_button, ctx.config.user_data)
 			}
 		}
 		.mouse_up {
 			if ctx.config.unclick_fn != unsafe { nil } {
-				ctx.config.unclick_fn(e.mouse_x / ctx.scale, e.mouse_y / ctx.scale, e.mouse_button,
-					ctx.config.user_data)
+				ctx.config.unclick_fn(e.mouse_x, e.mouse_y, e.mouse_button, ctx.config.user_data)
 			}
 		}
 		.mouse_leave {