FIX Improve epileptic by more flash removal - improve darkmode detection

3 files changed, 13 insertions, 9 deletions

diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c
index 218b4298..f0729d44 100644
--- a/hardinfo2/hardinfo.c
+++ b/hardinfo2/hardinfo.c
@@ -93,9 +93,12 @@ int main(int argc, char **argv)
         }
     }
 
-	/* load all modules */
-	DEBUG("loading all modules");
-	modules = modules_load_all();
+    //Get DarkMode state from system
+    g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &params.darkmode, NULL);
+
+    /* load all modules */
+    DEBUG("loading all modules");
+    modules = modules_load_all();
 
     /* initialize vendor database */
     vendor_init();
diff --git a/modules/benchmark/guibench.c b/modules/benchmark/guibench.c
index 635f2f53..54b10493 100644
--- a/modules/benchmark/guibench.c
+++ b/modules/benchmark/guibench.c
@@ -19,12 +19,12 @@
 #include <gtk/gtk.h>
 #include <cairo.h>
 
-#include "hardinfo.h"
 #include "iconcache.h"
 #include "config.h"
 
 #define CRUNCH_TIME 3
 
+static int darkmode;
 static int count=0;
 static int testnumber=0;
 static GTimer *timer,*frametimer;
@@ -72,10 +72,10 @@ gboolean on_draw (GtkWidget *widget, GdkEventExpose *event, gpointer data) {
 		break;
 	  case 2 : //Filled Shape Drawing
 	        cairo_rectangle(cr,g_rand_int_range(r,0,1024-200),g_rand_int_range(r,0,800-200),g_rand_int_range(r,0,400),g_rand_int_range(r,0,300));
-		if(!params.darkmode){
-		    cairo_set_source_rgb(cr,g_rand_double_range(r,0.3,0.5),g_rand_double_range(r,0.3,0.5),g_rand_double_range(r,0.3,0.5));
+		if(darkmode){
+		    cairo_set_source_rgb(cr,g_rand_double_range(r,0.0,0.3),g_rand_double_range(r,0.0,0.3),g_rand_double_range(r,0.0,0.3));
 		}else{
-		    cairo_set_source_rgb(cr,g_rand_double_range(r,0.5,0.7),g_rand_double_range(r,0.5,0.7),g_rand_double_range(r,0.5,0.7));
+		    cairo_set_source_rgb(cr,g_rand_double_range(r,0.7,0.9),g_rand_double_range(r,0.7,0.9),g_rand_double_range(r,0.7,0.9));
 		}
 		cairo_fill(cr);
 		break;
@@ -131,6 +131,9 @@ double guibench(double *frameTime, int *frameCount)
     GtkWindow * window;
     cairo_t *cr;
 
+    //Get DarkMode state from system
+    g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &darkmode, NULL);
+
     frametime=frameTime;
     framecount=frameCount;
     
diff --git a/shell/shell.c b/shell/shell.c
index 667a0ce4..91190021 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -512,8 +512,6 @@ static void create_window(void)
     shell->notebook = gtk_notebook_new();
     gtk_paned_add2(GTK_PANED(shell->vpaned), shell->notebook);
 
-    g_object_get(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", &params.darkmode, NULL);
-
     GKeyFile *key_file = g_key_file_new();
     gchar *conf_path = g_build_filename(g_get_user_config_dir(), "hardinfo2","settings.ini", NULL);
     g_key_file_load_from_file(key_file, conf_path, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, NULL);