brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland-pointer: Remove the conditional around the surface actor too

Browse Source 
The actor should always exist.
This commit is contained in:
Jasper St. Pierre 2014-04-27 10:38:16 -04:00
parent c8d0a66921
commit d1619e4f53
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wayland/meta-wayland-pointer.c
View File

@ -718,16 +718,11 @@ meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
wl_fixed_t *sy) wl_fixed_t *sy)
{ {
float xf = 0.0f, yf = 0.0f; float xf = 0.0f, yf = 0.0f;
ClutterPoint pos;
ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor); clutter_input_device_get_coords (pointer->device, NULL, &pos);
clutter_actor_transform_stage_point (CLUTTER_ACTOR (surface->surface_actor),
if (actor) pos.x, pos.y, &xf, &yf);
{
ClutterPoint pos;
clutter_input_device_get_coords (pointer->device, NULL, &pos);
clutter_actor_transform_stage_point (actor, pos.x, pos.y, &xf, &yf);
}
*sx = wl_fixed_from_double (xf); *sx = wl_fixed_from_double (xf);
*sy = wl_fixed_from_double (yf); *sy = wl_fixed_from_double (yf);