diff options
| author | emersion <contact@emersion.fr> | 2018-04-02 15:57:04 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-04-02 15:57:04 -0400 |
| commit | 8836b4f024f957971cae28a0fdc567ff16c8fbc8 (patch) | |
| tree | 23be1fc669c4fc721a521691ce182041cc7c5237 /backend/libinput/tablet_tool.c | |
| parent | cadfccf1fde164646b175401a3fb1d3108b4af9a (diff) | |
| parent | d466cc117f95d34e239049a5af701b7ba696d336 (diff) | |
| download | wlroots-8836b4f024f957971cae28a0fdc567ff16c8fbc8.tar.xz | |
Merge branch 'master' into xwayland-dnd
Diffstat (limited to 'backend/libinput/tablet_tool.c')
| -rw-r--r-- | backend/libinput/tablet_tool.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c index 27cf7c81..815c4daf 100644 --- a/backend/libinput/tablet_tool.c +++ b/backend/libinput/tablet_tool.c @@ -34,14 +34,13 @@ void handle_tablet_tool_axis(struct libinput_event *event, wlr_event.device = wlr_dev; wlr_event.time_msec = usec_to_msec(libinput_event_tablet_tool_get_time_usec(tevent)); - libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm); if (libinput_event_tablet_tool_x_has_changed(tevent)) { wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_X; - wlr_event.x_mm = libinput_event_tablet_tool_get_x(tevent); + wlr_event.x = libinput_event_tablet_tool_get_x_transformed(tevent, 1); } if (libinput_event_tablet_tool_y_has_changed(tevent)) { wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_Y; - wlr_event.y_mm = libinput_event_tablet_tool_get_y(tevent); + wlr_event.y = libinput_event_tablet_tool_get_y_transformed(tevent, 1); } if (libinput_event_tablet_tool_pressure_has_changed(tevent)) { wlr_event.updated_axes |= WLR_TABLET_TOOL_AXIS_PRESSURE; |