isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Base tablet tool coordinates on the current event

Browse Source 
Instead of the last device position. This was copied a little bit too
straight from MetaWaylandPointer.

https://bugzilla.gnome.org/show_bug.cgi?id=783535
This commit is contained in:
Carlos Garnacho 2017-06-30 14:06:26 +02:00
parent a70ae50ca9
commit 529e5adb2e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wayland/meta-wayland-tablet-tool.c
View File

@ -621,17 +621,16 @@ repick_for_event (MetaWaylandTabletTool *tool,
static void static void
meta_wayland_tablet_tool_get_relative_coordinates (MetaWaylandTabletTool *tool, meta_wayland_tablet_tool_get_relative_coordinates (MetaWaylandTabletTool *tool,
ClutterInputDevice *device, const ClutterEvent *event,
MetaWaylandSurface *surface, MetaWaylandSurface *surface,
wl_fixed_t *sx, wl_fixed_t *sx,
wl_fixed_t *sy) wl_fixed_t *sy)
{ {
float xf = 0.0f, yf = 0.0f; float xf, yf;
ClutterPoint pos;
clutter_input_device_get_coords (device, NULL, &pos); clutter_event_get_coords (event, &xf, &yf);
clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)), clutter_actor_transform_stage_point (CLUTTER_ACTOR (meta_surface_actor_get_texture (surface->surface_actor)),
pos.x, pos.y, &xf, &yf); xf, yf, &xf, &yf);
*sx = wl_fixed_from_double (xf) / surface->scale; *sx = wl_fixed_from_double (xf) / surface->scale;
*sy = wl_fixed_from_double (yf) / surface->scale; *sy = wl_fixed_from_double (yf) / surface->scale;
@ -642,11 +641,9 @@ broadcast_motion (MetaWaylandTabletTool *tool,
const ClutterEvent *event) const ClutterEvent *event)
{ {
struct wl_resource *resource; struct wl_resource *resource;
ClutterInputDevice *device;
wl_fixed_t sx, sy; wl_fixed_t sx, sy;
device = clutter_event_get_source_device (event); meta_wayland_tablet_tool_get_relative_coordinates (tool, event,
meta_wayland_tablet_tool_get_relative_coordinates (tool, device,
tool->focus_surface, tool->focus_surface,
&sx, &sy); &sx, &sy);