space-flares: Replace ConsoleViewerPreserveBackground with ConsoleLogBackgroundColor

diff --git a/src/plugins/splash/space-flares/plugin.c b/src/plugins/splash/space-flares/plugin.c
index abda9056ccebb092cd6486becf816a06e409bcf0..e7ab76d5387de05e4d28cb94f0e2f480a5b44a27 100644 (file)
--- a/src/plugins/splash/space-flares/plugin.c
+++ b/src/plugins/splash/space-flares/plugin.c
@@ -211,7 +211,7 @@ struct _ply_boot_splash_plugin
         uint32_t                       should_show_console_messages : 1;
         ply_buffer_t                  *boot_buffer;
         uint32_t                       console_text_color;
-        uint32_t                       console_viewer_preserve_background;
+        uint32_t                       console_background_color;
 };
 
 ply_boot_splash_plugin_interface_t *ply_boot_splash_plugin_get_interface (void);
@@ -638,8 +638,10 @@ create_plugin (ply_key_file_t *key_file)
                                        "ConsoleLogTextColor",
                                        PLY_CONSOLE_VIEWER_LOG_TEXT_COLOR);
 
-        plugin->console_viewer_preserve_background =
-                ply_key_file_get_bool (key_file, "space-flares", "ConsoleViewerPreserveBackground");
+        plugin->console_background_color =
+                ply_key_file_get_long (key_file, "space-flares",
+                                       "ConsoleLogBackgroundColor",
+                                       0x00000000);
 
         plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL;
         plugin->progress = 0;
@@ -1482,15 +1484,15 @@ draw_background (view_t             *view,
         image_area.width = ply_image_get_width (view->scaled_background_image);
         image_area.height = ply_image_get_height (view->scaled_background_image);
 
-        if (plugin->should_show_console_messages && plugin->console_viewer_preserve_background == false) {
-                ply_pixel_buffer_fill_with_hex_color (pixel_buffer, &area, 0);
-                return;
-        }
-
         ply_pixel_buffer_fill_with_argb32_data_with_clip (pixel_buffer,
                                                           &image_area, &area,
                                                           ply_image_get_data (view->scaled_background_image));
 
+        if (plugin->should_show_console_messages) {
+                ply_pixel_buffer_fill_with_hex_color (pixel_buffer, &area, plugin->console_background_color);
+                return;
+        }
+
         if (plugin->should_show_console_messages)
                 return;
 

diff --git a/themes/solar/solar.plymouth.in b/themes/solar/solar.plymouth.in
index 6794294be20d6143a29a27697089eced97815fb5..08facec9b61666a5d27422d4f0bd46243204109f 100644 (file)
--- a/themes/solar/solar.plymouth.in
+++ b/themes/solar/solar.plymouth.in
@@ -5,4 +5,4 @@ ModuleName=space-flares
 
 [space-flares]
 ImageDir=@PLYMOUTH_THEME_PATH@/solar
-ConsoleViewerPreserveBackground=false
+ConsoleLogBackgroundColor=0x00000000