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

clutter: Notify grab changes on the key focus

Browse Source 
Dissociate clutter_stage_set_key_focus() from the actors focused
state, so that it obeys stage grabs. The key focus actor state may
also change due to grab changes, add the code to notify about this.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2068>
This commit is contained in:
Carlos Garnacho 2021-10-27 18:00:25 +02:00 committed by Marge Bot
parent ec3b8fe85b
commit 3e9d14c5c7
1 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
clutter/clutter/clutter-stage.c
View File

@ -2026,13 +2026,23 @@ clutter_stage_set_key_focus (ClutterStage *stage,
* intended. The order of events would be:
* 1st focus-out, 2nd focus-out (on stage), 2nd focus-in, 1st focus-in
*/
if (actor != NULL)
{
priv->key_focused_actor = actor;
/* If the key focused actor is allowed to receive key events according
* to the given grab (or there is none) set key focus on it, otherwise
* key focus is delayed until there are grabbing conditions that allow
* it to get key focus.
*/
if (!priv->topmost_grab ||
priv->topmost_grab->actor == CLUTTER_ACTOR (stage) ||
priv->topmost_grab->actor == actor ||
(actor && clutter_actor_contains (priv->topmost_grab->actor, actor)))
{
if (actor != NULL)
_clutter_actor_set_has_key_focus (actor, TRUE);
}
else
_clutter_actor_set_has_key_focus (CLUTTER_ACTOR (stage), TRUE);
}
g_object_notify_by_pspec (G_OBJECT (stage), obj_props[PROP_KEY_FOCUS]);
}
@ -3754,6 +3764,33 @@ clutter_stage_notify_grab_on_pointer_entry (ClutterStage *stage,
}
}
static void
clutter_stage_notify_grab_on_key_focus (ClutterStage *stage,
ClutterActor *grab_actor,
ClutterActor *old_grab_actor)
{
ClutterStagePrivate *priv = stage->priv;
ClutterActor *key_focus;
gboolean focus_in_grab, focus_in_old_grab;
key_focus = priv->key_focused_actor ?
priv->key_focused_actor : CLUTTER_ACTOR (stage);
focus_in_grab =
!grab_actor ||
grab_actor == key_focus ||
clutter_actor_contains (grab_actor, key_focus);
focus_in_old_grab =
!old_grab_actor ||
old_grab_actor == key_focus ||
clutter_actor_contains (old_grab_actor, key_focus);
if (focus_in_grab && !focus_in_old_grab)
_clutter_actor_set_has_key_focus (CLUTTER_ACTOR (key_focus), TRUE);
else if (!focus_in_grab && focus_in_old_grab)
_clutter_actor_set_has_key_focus (CLUTTER_ACTOR (key_focus), FALSE);
}
static void
clutter_stage_notify_grab (ClutterStage *stage,
ClutterGrab *cur,
@ -3792,6 +3829,8 @@ clutter_stage_notify_grab (ClutterStage *stage,
cur_actor,
old_actor);
}
clutter_stage_notify_grab_on_key_focus (stage, cur_actor, old_actor);
}
ClutterGrab *