fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-05 18:08:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

two-step: Fold ply_progress_animation_hide call into view_start_end_animation

Browse source 
We should always disable (hide) the progress-animation when
starting the end-animation. Instead of having all callers of
view_start_end_animation do this themselves, do it at the beginning
of view_start_end_animation.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2019-09-26 10:15:23 +02:00
parent 9202b6939a
commit 48227ed8af
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/plugins/splash/two-step/plugin.c
View file

@ -766,13 +766,12 @@ static void
view_start_end_animation (view_t *view,
ply_trigger_t *trigger)
{
ply_boot_splash_plugin_t *plugin;
long x, y;
long width, height;
ply_boot_splash_plugin_t *plugin = view->plugin;
unsigned long screen_width, screen_height;
long x, y, width, height;
plugin = view->plugin;
if (view->progress_animation != NULL)
ply_progress_animation_hide (view->progress_animation);
screen_width = ply_pixel_display_get_width (view->display);
screen_height = ply_pixel_display_get_height (view->display);
@ -791,9 +790,6 @@ view_start_end_animation (view_t *view,
static void
on_view_throbber_stopped (view_t *view)
{
ply_trace ("hiding progress animation");
if (view->progress_animation != NULL)
ply_progress_animation_hide (view->progress_animation);
view_start_end_animation (view, view->end_trigger);
view->end_trigger = NULL;
}
@ -1241,10 +1237,6 @@ start_end_animation (ply_boot_splash_plugin_t *plugin,
view);
ply_throbber_stop (view->throbber, throbber_trigger);
} else {
if (view->progress_animation != NULL) {
ply_trace ("hiding progress animation");
ply_progress_animation_hide (view->progress_animation);
}
view_start_end_animation (view, trigger);
}