godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

[Linux/Windows] Set pressure to 1.0f when primary button is pressed and device is not pressure sensitive.

Browse Source
This commit is contained in:
bruvzg
2020-05-03 15:38:58 +03:00
parent 78db7824b7
commit 0128947894
4 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/linuxbsd/display_server_x11.cpp
View File

@@ -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 :)