diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-04 12:49:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 12:49:29 +0200 |
| commit | a6d83f7f3d856929156e4c56e33b95920a24283c (patch) | |
| tree | ad464182bc9a5d2d2dd9d2302b5a91106dfdd067 /platform/linuxbsd/display_server_x11.cpp | |
| parent | 2df844d5b311fc8d8b18040020df82c73d4365dd (diff) | |
| parent | 012894789443dbb4f1882c11fd08b4c2f1618a0f (diff) | |
| download | redot-engine-a6d83f7f3d856929156e4c56e33b95920a24283c.tar.gz | |
Merge pull request #38439 from bruvzg/mouse_pressure
Make non pressure sensitive device behavior consistent.
Diffstat (limited to 'platform/linuxbsd/display_server_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index b5052667a7..dd9298d667 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -2359,6 +2359,7 @@ void DisplayServerX11::process_events() { xi.pressure = 0; xi.tilt = Vector2(); + xi.pressure_supported = false; while (XPending(x11_display) > 0) { XEvent event; @@ -2421,9 +2422,11 @@ void DisplayServerX11::process_events() { Map<int, Vector2>::Element *pen_pressure = xi.pen_pressure_range.find(device_id); if (pen_pressure) { Vector2 pen_pressure_range = pen_pressure->value(); - if (pen_pressure_range != Vector2()) + if (pen_pressure_range != Vector2()) { + xi.pressure_supported = true; xi.pressure = (*values - pen_pressure_range[0]) / (pen_pressure_range[1] - pen_pressure_range[0]); + } } values++; @@ -2782,7 +2785,11 @@ void DisplayServerX11::process_events() { mm.instance(); mm->set_window_id(window_id); - mm->set_pressure(xi.pressure); + if (xi.pressure_supported) { + mm->set_pressure(xi.pressure); + } else { + mm->set_pressure((mouse_get_button_state() & (1 << (BUTTON_LEFT - 1))) ? 1.0f : 0.0f); + } mm->set_tilt(xi.tilt); // Make the absolute position integral so it doesn't look _too_ weird :) |