[PATCH 15/20] [fade-throbber] resume animations on display_normal
Scott James Remnant
scott at ubuntu.com
Thu Mar 18 13:58:57 PDT 2010
Change the display_normal() function so that rather than being a no-op
if we already saved the state as normal, it restarts any animations and
redraws the views.
The only thing we now do if the state is not previously the same is
hide any prompt.
This allows this to be used to reanimate the plugin on reactivate.
---
src/plugins/splash/fade-throbber/plugin.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/plugins/splash/fade-throbber/plugin.c b/src/plugins/splash/fade-throbber/plugin.c
index 2e3221e..639fce8 100644
--- a/src/plugins/splash/fade-throbber/plugin.c
+++ b/src/plugins/splash/fade-throbber/plugin.c
@@ -1038,14 +1038,12 @@ static void
display_normal (ply_boot_splash_plugin_t *plugin)
{
pause_views (plugin);
- if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY ||
- plugin->state == PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY)
- {
- plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
- hide_prompt (plugin);
- start_animation (plugin);
- redraw_views (plugin);
- }
+ if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL)
+ hide_prompt (plugin);
+
+ plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
+ start_animation (plugin);
+ redraw_views (plugin);
unpause_views (plugin);
}
--
1.7.0
More information about the plymouth
mailing list