Change splash plugins to honor configured background color

Previously, they were still using blue.

2 files changed, 29 insertions, 26 deletions

diff --git a/src/splash-plugins/fade-in/plugin.c b/src/splash-plugins/fade-in/plugin.c
index 503dc01..c30e943 100644
--- a/src/splash-plugins/fade-in/plugin.c
+++ b/src/splash-plugins/fade-in/plugin.c
@@ -235,8 +235,8 @@ animate_at_time (ply_boot_splash_plugin_t *plugin,
       opacity = .5 * sin (((plugin->now - star->start_time) / star->speed) * (2 * M_PI)) + .5;
       opacity = CLAMP (opacity, 0, 1.0);
 
-      ply_frame_buffer_fill_with_color (plugin->frame_buffer, &star_area,
-                                        0.1, 0.1, .7, 1.0);
+      ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, &star_area,
+                                            PLYMOUTH_BACKGROUND_COLOR);
       ply_frame_buffer_fill_with_argb32_data_at_opacity (plugin->frame_buffer, 
                                                          &star_area, 0, 0, 
                                                          star_data, opacity);
@@ -255,9 +255,9 @@ animate_at_time (ply_boot_splash_plugin_t *plugin,
 
   last_opacity = opacity;
 
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, &logo_area,
-                                    0.1, 0.1, .7, 1.0);
-  ply_frame_buffer_fill_with_argb32_data_at_opacity (plugin->frame_buffer, 
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, &logo_area,
+                                        PLYMOUTH_BACKGROUND_COLOR);
+  ply_frame_buffer_fill_with_argb32_data_at_opacity (plugin->frame_buffer,
                                                      &logo_area, 0, 0,
                                                      logo_data, opacity);
   ply_frame_buffer_unpause_updates (plugin->frame_buffer);
@@ -315,8 +315,8 @@ start_animation (ply_boot_splash_plugin_t *plugin)
                                     on_timeout, plugin);
 
   plugin->start_time = ply_get_timestamp ();
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL, 
-                                    0.1, 0.1, .7, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, NULL,
+                                        PLYMOUTH_BACKGROUND_COLOR);
 }
 
 static void
@@ -326,15 +326,17 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
 
   assert (plugin != NULL);
   assert (plugin->loop != NULL);
-    
+
   for (i = 0; i < 10; i++)
     {
-      ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
-                                        0.1, 0.1, .7, .1 + .1 * i);
+      ply_frame_buffer_fill_with_hex_color_at_opacity (plugin->frame_buffer,
+                                                       NULL,
+                                                       PLYMOUTH_BACKGROUND_COLOR,
+                                                       .1 + .1 * i);
     }
 
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
-                                    0.1, 0.1, 0.7, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, NULL,
+                                        PLYMOUTH_BACKGROUND_COLOR);
 
   for (i = 0; i < 20; i++)
     {
@@ -581,8 +583,8 @@ draw_password_entry (ply_boot_splash_plugin_t *plugin)
   entry_area.x = plugin->entry->x;
   entry_area.y = plugin->entry->y;
 
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, &entry_area,
-                                    0.1, 0.1, .7, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, &entry_area,
+                                        PLYMOUTH_BACKGROUND_COLOR);
 
   ply_frame_buffer_fill_with_argb32_data (plugin->frame_buffer,
                                           &entry_area, 0, 0,
@@ -597,8 +599,8 @@ draw_password_entry (ply_boot_splash_plugin_t *plugin)
 
   lock_area.x = x;
   lock_area.y = y;
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, &lock_area,
-                                    0.1, 0.1, .7, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, &lock_area,
+                                        PLYMOUTH_BACKGROUND_COLOR);
   ply_frame_buffer_fill_with_argb32_data (plugin->frame_buffer,
                                           &lock_area, 0, 0,
                                           lock_data);
@@ -641,8 +643,8 @@ show_password_entry (ply_boot_splash_plugin_t *plugin)
   y = area.height / 2.0 - entry_height / 2.0;
 
   plugin->entry = entry_new (x, y);
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
-                                    0.1, 0.1, .7, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, NULL,
+                                        PLYMOUTH_BACKGROUND_COLOR);
   draw_password_entry (plugin);
 }
 
diff --git a/src/splash-plugins/spinfinity/plugin.c b/src/splash-plugins/spinfinity/plugin.c
index 574b9b5..aab9ebd 100644
--- a/src/splash-plugins/spinfinity/plugin.c
+++ b/src/splash-plugins/spinfinity/plugin.c
@@ -161,8 +161,8 @@ draw_logo (ply_boot_splash_plugin_t *plugin)
   logo_area.height = height;
 
   ply_frame_buffer_pause_updates (plugin->frame_buffer);
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, &logo_area,
-                                    0.0, 0.43, .71, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, &logo_area,
+                                        PLYMOUTH_BACKGROUND_COLOR);
   ply_frame_buffer_fill_with_argb32_data (plugin->frame_buffer, 
                                           &logo_area, 0, 0,
                                           logo_data);
@@ -178,8 +178,8 @@ start_animation (ply_boot_splash_plugin_t *plugin)
   assert (plugin != NULL);
   assert (plugin->loop != NULL);
 
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
-                                    0.0, 0.43, .71, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, NULL,
+                                        PLYMOUTH_BACKGROUND_COLOR);
 
   draw_logo (plugin);
 
@@ -206,12 +206,13 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
 
   for (i = 0; i < 10; i++)
     {
-      ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
-                                        0.0, 0.43, .71, .1 + .1 * i);
+      ply_frame_buffer_fill_with_hex_color_at_opacity (plugin->frame_buffer, NULL,
+                                                       PLYMOUTH_BACKGROUND_COLOR,
+                                                       .1 + .1 * i);
     }
 
-  ply_frame_buffer_fill_with_color (plugin->frame_buffer, NULL,
-                                    0.0, 0.43, .71, 1.0);
+  ply_frame_buffer_fill_with_hex_color (plugin->frame_buffer, NULL,
+                                        PLYMOUTH_BACKGROUND_COLOR);
 
   for (i = 0; i < 20; i++)
     {