[mutter/wip/carlosg/input-thread: 39/104] clutter/main: Drop dead code branches
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/input-thread: 39/104] clutter/main: Drop dead code branches
- Date: Thu, 8 Oct 2020 21:41:41 +0000 (UTC)
commit 5c6ba19513127196a89cd91ea90ec9c4f20c29cd
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Jun 5 18:31:55 2020 +0200
clutter/main: Drop dead code branches
We shouldn't get an input event that has not a device.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403
clutter/clutter/clutter-main.c | 40 ++++++----------------------------------
1 file changed, 6 insertions(+), 34 deletions(-)
---
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 2f6f4d1462..6162db2e24 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -1774,25 +1774,9 @@ _clutter_process_event_details (ClutterActor *stage,
break;
}
- /* if the backend provides a device then we should
- * already have everything we need to update it and
- * get the actor underneath
- */
- if (device != NULL)
- {
- actor = clutter_input_device_update (device, NULL,
- CLUTTER_STAGE (stage),
- TRUE);
- }
- else
- {
- CLUTTER_NOTE (EVENT, "No device found: picking");
-
- actor = _clutter_stage_do_pick (CLUTTER_STAGE (stage),
- x, y,
- CLUTTER_PICK_REACTIVE);
- }
-
+ actor = clutter_input_device_update (device, NULL,
+ CLUTTER_STAGE (stage),
+ TRUE);
if (actor == NULL)
break;
@@ -1900,21 +1884,9 @@ _clutter_process_event_details (ClutterActor *stage,
break;
}
- if (device != NULL)
- {
- actor = clutter_input_device_update (device, sequence,
- CLUTTER_STAGE (stage),
- TRUE);
- }
- else
- {
- CLUTTER_NOTE (EVENT, "No device found: picking");
-
- actor = _clutter_stage_do_pick (CLUTTER_STAGE (stage),
- x, y,
- CLUTTER_PICK_REACTIVE);
- }
-
+ actor = clutter_input_device_update (device, sequence,
+ CLUTTER_STAGE (stage),
+ TRUE);
if (actor == NULL)
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]