]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
script: only support one message at a time
authorRay Strode <rstrode@redhat.com>
Mon, 26 Oct 2015 17:28:33 +0000 (13:28 -0400)
committerRay Strode <rstrode@redhat.com>
Fri, 20 May 2016 20:40:08 +0000 (16:40 -0400)
That's the other themes do, and callers
expect it.

themes/script/script.script

index 7ea9d5e9e5105686f06421e7aa8b7cf7d1f9a869..25a2f2b5bab44126e737033569a211e1c4efed68 100644 (file)
@@ -152,27 +152,19 @@ Plymouth.SetQuitFunction(quit_callback);
 
 #----------------------------------------- Message --------------------------------
 
-message_sprites = [];
-message_sprite_count = 0;
-message_sprite_y = 10;
+message_sprite = Sprite();
+message_sprite.SetPosition(10, 10, 10000);
 
 fun display_message_callback (text)
 {
   my_image = Image.Text(text, 1, 1, 1);
-  message_sprites[message_sprite_count] = Sprite(my_image);
-  message_sprites[message_sprite_count].SetPosition(10, message_sprite_y, 10000);
-  message_sprites[message_sprite_count].text = text;
-  message_sprite_count++;
-  message_sprite_y += my_image.GetHeight();
+  message_sprite.SetImage(my_image);
 }
 
 fun hide_message_callback (text)
 {
-  for (i = 0; i < message_sprite_count; i++)
-    {
-      if (message_sprites[i].text == text)
-        message_sprites[i] = NULL;
-    }
+  message_sprite = Sprite();
+  message_sprite.SetPosition(10, 10, 10000);
 }
 
 Plymouth.SetDisplayMessageFunction (display_message_callback);