]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
fade-throbber: reshow label after changing message
authorRay Strode <rstrode@redhat.com>
Wed, 24 Oct 2012 19:40:48 +0000 (15:40 -0400)
committerRay Strode <rstrode@redhat.com>
Wed, 24 Oct 2012 19:44:10 +0000 (15:44 -0400)
We should call ply_label_show any time we have a message
to show, so that if the root filesystem gets mounted, we
can try to load the label plugin again.

This should prevent weird situations where the text shows up
invisible unless the user hits escape twice.

http://bugs.freedesktop.org/show_bug.cgi?id=55669

src/plugins/splash/fade-throbber/plugin.c

index b26e5e242ff46febfef613e720b8fcd8db39c29b..4af6cae7af05877203601320d4a73c70f958c969 100644 (file)
@@ -255,8 +255,6 @@ view_new (ply_boot_splash_plugin_t *plugin,
   view->label = ply_label_new ();
 
   view->message_label = ply_label_new ();
-  ply_label_set_text (view->message_label, "");
-  ply_label_show (view->message_label, view->display, 10, 10);
 
   return view;
 }
@@ -951,6 +949,8 @@ show_message (ply_boot_splash_plugin_t *plugin,
       view = ply_list_node_get_data (node);
       next_node = ply_list_get_next_node (plugin->views, node);
       ply_label_set_text (view->message_label, message);
+      ply_label_show (view->message_label, view->display, 10, 10);
+
       ply_pixel_display_draw_area (view->display, 10, 10,
                                    ply_label_get_width (view->message_label),
                                    ply_label_get_height(view->message_label));