TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-08-04 02:07:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

gg: fix incorrect Event.mouse_x and Event.mouse_y on gg.Context.event_fn and gg.Context.on_event on HiDPI displays (#23668)

Browse Source
This commit is contained in:
Adam Oates 2025-02-08 04:20:46 -06:00 committed by GitHub
parent a4541c2351
commit 6e3f6acffc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vlib/gg/gg.c.v
View File

@ -377,12 +377,18 @@ fn gg_event_fn(ce voidptr, user_data voidptr) {
e.mouse_button = .middle e.mouse_button = .middle
} }
} }
ctx.mouse_pos_x = int(e.mouse_x / ctx.scale) e.mouse_x /= ctx.scale
ctx.mouse_pos_y = int(e.mouse_y / ctx.scale) e.mouse_y /= ctx.scale
ctx.mouse_dx = int(e.mouse_dx / ctx.scale) e.mouse_dx /= ctx.scale
ctx.mouse_dy = int(e.mouse_dy / ctx.scale) e.mouse_dy /= ctx.scale
ctx.scroll_x = int(e.scroll_x / ctx.scale) e.scroll_x /= ctx.scale
ctx.scroll_y = int(e.scroll_y / 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_modifiers = unsafe { Modifier(e.modifiers) }
ctx.key_repeat = e.key_repeat ctx.key_repeat = e.key_repeat
if e.typ in [.key_down, .key_up] { if e.typ in [.key_down, .key_up] {
@ -400,19 +406,17 @@ fn gg_event_fn(ce voidptr, user_data voidptr) {
match e.typ { match e.typ {
.mouse_move { .mouse_move {
if ctx.config.move_fn != unsafe { nil } { 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 { .mouse_down {
if ctx.config.click_fn != unsafe { nil } { 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.click_fn(e.mouse_x, e.mouse_y, e.mouse_button, ctx.config.user_data)
ctx.config.user_data)
} }
} }
.mouse_up { .mouse_up {
if ctx.config.unclick_fn != unsafe { nil } { 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.unclick_fn(e.mouse_x, e.mouse_y, e.mouse_button, ctx.config.user_data)
ctx.config.user_data)
} }
} }
.mouse_leave { .mouse_leave {