[mutter] meta-wayland-pointer: Remove the surface->window conditional



commit 657318d4d30bde24b4e1336345b7b8105c988dcf
Author: Adel Gadllah <adel gadllah gmail com>
Date:   Fri Apr 25 20:38:24 2014 +0200

    meta-wayland-pointer: Remove the surface->window conditional

 src/wayland/meta-wayland-pointer.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index d0c9024..57e07c0 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -719,17 +719,14 @@ meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
 {
   float xf = 0.0f, yf = 0.0f;
 
-  if (surface->window)
-    {
-      ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
+  ClutterActor *actor = CLUTTER_ACTOR (surface->surface_actor);
 
-      if (actor)
-        {
-          ClutterPoint pos;
-          clutter_input_device_get_coords (pointer->device, NULL, &pos);
+  if (actor)
+    {
+      ClutterPoint pos;
+      clutter_input_device_get_coords (pointer->device, NULL, &pos);
 
-          clutter_actor_transform_stage_point (actor, pos.x, pos.y, &xf, &yf);
-        }
+      clutter_actor_transform_stage_point (actor, pos.x, pos.y, &xf, &yf);
     }
 
   *sx = wl_fixed_from_double (xf);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]