isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/widget: Use ClutterEvent getter methods in StWidget

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2860>
This commit is contained in:
Carlos Garnacho 2023-08-04 14:24:00 +02:00 committed by Marge Bot
parent 23b439dc50
commit aac0e0e802
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/st/st-widget.c
View File

@ -697,7 +697,7 @@ st_widget_enter (ClutterActor *actor,
ClutterStage *stage; ClutterStage *stage;
ClutterActor *target; ClutterActor *target;
stage = clutter_event_get_stage ((ClutterEvent *) event); stage = CLUTTER_STAGE (clutter_actor_get_stage (actor));
target = clutter_stage_get_event_actor (stage, (ClutterEvent *) event); target = clutter_stage_get_event_actor (stage, (ClutterEvent *) event);
if (clutter_actor_contains (actor, target)) if (clutter_actor_contains (actor, target))
@ -726,7 +726,11 @@ st_widget_leave (ClutterActor *actor,
if (priv->track_hover) if (priv->track_hover)
{ {
if (!event->related || !clutter_actor_contains (actor, event->related)) ClutterActor *related;
related = clutter_event_get_related ((ClutterEvent *) event);
if (!related || !clutter_actor_contains (actor, related))
st_widget_set_hover (ST_WIDGET (actor), FALSE); st_widget_set_hover (ST_WIDGET (actor), FALSE);
} }
@ -756,9 +760,15 @@ static gboolean
st_widget_key_press_event (ClutterActor *actor, st_widget_key_press_event (ClutterActor *actor,
ClutterKeyEvent *event) ClutterKeyEvent *event)
{ {
if (event->keyval == CLUTTER_KEY_Menu || ClutterModifierType state;
(event->keyval == CLUTTER_KEY_F10 && uint32_t keyval;
(event->modifier_state & CLUTTER_SHIFT_MASK)))
state = clutter_event_get_state ((ClutterEvent *) event);
keyval = clutter_event_get_key_symbol ((ClutterEvent *) event);
if (keyval == CLUTTER_KEY_Menu ||
(keyval == CLUTTER_KEY_F10 &&
(state & CLUTTER_SHIFT_MASK)))
{ {
st_widget_popup_menu (ST_WIDGET (actor)); st_widget_popup_menu (ST_WIDGET (actor));
return TRUE; return TRUE;