[mutter] clutter/click-action: Do not process captured event if action is disabled
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/click-action: Do not process captured event if action is disabled
- Date: Thu, 2 Apr 2020 17:08:49 +0000 (UTC)
commit 5f5ce08ba4f6320f27e53440a0ee8d9799e05cf6
Author: Andre Moreira Magalhaes <andre endlessm com>
Date: Thu Apr 2 13:12:43 2020 -0300
clutter/click-action: Do not process captured event if action is disabled
Disabling a click action after a button-press but before a
button-release is captured makes ClutterClickAction connect to
captured-event and never disconnect.
This change fixes it by making sure the captured-event is only
processed if the action is still enabled, otherwise releasing
the action (reset state) and propagating the event.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1170
clutter/clutter/clutter-click-action.c | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/clutter/clutter/clutter-click-action.c b/clutter/clutter/clutter-click-action.c
index 6b523b033..cb35d7253 100644
--- a/clutter/clutter/clutter-click-action.c
+++ b/clutter/clutter/clutter-click-action.c
@@ -346,6 +346,12 @@ on_captured_event (ClutterActor *stage,
ClutterModifierType modifier_state;
gboolean has_button = TRUE;
+ if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
+ {
+ clutter_click_action_release (action);
+ return CLUTTER_EVENT_PROPAGATE;
+ }
+
actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action));
switch (clutter_event_type (event))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]