isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 21:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/shell: Restore minimized actor state in idle callback

Browse Source 
This fixes the following
1. Minimize window; minimize animation starts
2. Do something that immediately destroys the animated actor (e.g. terminate)
3. This triggered the timeline of the animation to emit a "stopped"
   signal while all transitions of the actor were destroyed

Previously we'd implicitly animate the scale again (set_scale(..)) which
created a new transition The hash table iterator didn't like this and
abort():ed

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3213>
This commit is contained in:
Jonas Ådahl 2023-08-25 18:41:29 +02:00
parent 1e25cb746a
commit baa0f62ced
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/tests/meta-test-shell.c
View File

@ -77,6 +77,8 @@ typedef struct _ActorPrivate
ClutterTimeline *minimize_timeline; ClutterTimeline *minimize_timeline;
ClutterTimeline *destroy_timeline; ClutterTimeline *destroy_timeline;
ClutterTimeline *map_timeline; ClutterTimeline *map_timeline;
guint minimize_stopped_id;
} ActorPrivate; } ActorPrivate;
typedef struct typedef struct
@ -101,6 +103,9 @@ static GQuark display_tile_preview_data_quark = 0;
static void static void
free_actor_private (gpointer data) free_actor_private (gpointer data)
{ {
ActorPrivate *actor_priv = data;
g_clear_handle_id (&actor_priv->minimize_stopped_id, g_source_remove);
g_free (data); g_free (data);
} }
@ -460,19 +465,20 @@ meta_test_shell_switch_workspace (MetaPlugin *plugin,
} }
static void static void
on_minimize_effect_stopped (ClutterTimeline *timeline, restore_scale_idle (gpointer user_data)
gboolean is_finished,
EffectCompleteData *data)
{ {
EffectCompleteData *data = user_data;
MetaPlugin *plugin = data->plugin; MetaPlugin *plugin = data->plugin;
ActorPrivate *actor_priv;
MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor); MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor);
double original_scale = *(double *) data->effect_data; double original_scale = *(double *) data->effect_data;
ActorPrivate *actor_priv;
actor_priv = get_actor_private (META_WINDOW_ACTOR (data->actor)); actor_priv = get_actor_private (META_WINDOW_ACTOR (data->actor));
actor_priv->minimize_timeline = NULL; actor_priv->minimize_timeline = NULL;
actor_priv->minimize_stopped_id = 0;
clutter_actor_hide (data->actor); clutter_actor_hide (data->actor);
clutter_actor_set_scale (data->actor, original_scale, original_scale); clutter_actor_set_scale (data->actor, original_scale, original_scale);
meta_plugin_minimize_completed (plugin, window_actor); meta_plugin_minimize_completed (plugin, window_actor);
@ -481,6 +487,18 @@ on_minimize_effect_stopped (ClutterTimeline *timeline,
g_free (data); g_free (data);
} }
static void
on_minimize_effect_stopped (ClutterTimeline *timeline,
gboolean is_finished,
EffectCompleteData *data)
{
MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor);
ActorPrivate *actor_priv = get_actor_private (window_actor);
actor_priv->minimize_stopped_id =
g_idle_add_once (restore_scale_idle, data);
}
static void static void
meta_test_shell_minimize (MetaPlugin *plugin, meta_test_shell_minimize (MetaPlugin *plugin,
MetaWindowActor *window_actor) MetaWindowActor *window_actor)
@ -521,6 +539,7 @@ meta_test_shell_minimize (MetaPlugin *plugin,
g_signal_connect (actor_priv->minimize_timeline, "stopped", g_signal_connect (actor_priv->minimize_timeline, "stopped",
G_CALLBACK (on_minimize_effect_stopped), G_CALLBACK (on_minimize_effect_stopped),
data); data);
g_clear_handle_id (&actor_priv->minimize_stopped_id, g_source_remove);
} }
else else
{ {