[mutter] Revert "Revert "wayland-pointer: Just use the pointer actor instead of doing a full repick""
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Revert "Revert "wayland-pointer: Just use the pointer actor instead of doing a full repick""
- Date: Fri, 6 Feb 2015 17:45:47 +0000 (UTC)
commit 1f0ed5483a1705ef8c779c2dc09c2a1e1ba4695e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Feb 6 09:44:08 2015 -0800
Revert "Revert "wayland-pointer: Just use the pointer actor instead of doing a full repick""
The Clutter bug has now been fixed.
This reverts commit ead79f834c7eada35228d27b694d8050302981d6.
src/wayland/meta-wayland-pointer.c | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index a74df8c..b74842a 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -279,25 +279,12 @@ static void
repick_for_event (MetaWaylandPointer *pointer,
const ClutterEvent *for_event)
{
- ClutterActor *actor = NULL;
+ ClutterActor *actor;
if (for_event)
- {
- actor = clutter_event_get_source (for_event);
- }
+ actor = clutter_event_get_source (for_event);
else
- {
- ClutterStage *stage = clutter_input_device_get_pointer_stage (pointer->device);
-
- if (stage)
- {
- ClutterPoint pos;
-
- clutter_input_device_get_coords (pointer->device, NULL, &pos);
- actor = clutter_stage_get_actor_at_pos (stage, CLUTTER_PICK_REACTIVE,
- pos.x, pos.y);
- }
- }
+ actor = clutter_input_device_get_pointer_actor (pointer->device);
if (META_IS_SURFACE_ACTOR_WAYLAND (actor))
pointer->current = meta_surface_actor_wayland_get_surface (META_SURFACE_ACTOR_WAYLAND (actor));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]