diff --git a/Gtk4_Reset/res/style_dark.css b/Gtk4_Reset/res/style_dark.css index 81cc2a4..11db770 100644 --- a/Gtk4_Reset/res/style_dark.css +++ b/Gtk4_Reset/res/style_dark.css @@ -8,26 +8,26 @@ /* @import url("resource://org/gtk/daleclack/reset.css"); */ .finder_style box { - background-color: alpha(white, 0.5); + background-color: rgba(56, 60, 74, 0.5); } .dock_style grid { - background-color: alpha(white, 0.5); + background-color: rgba(56, 60, 74, 0.5); } .dock_style box { - background-color: alpha(white, 0.5); + background-color: rgba(56, 60, 74, 0.5); } .dock_style button.toggle { - background-color: white; + background-color: black; border-color: transparent; - color: black; + color: white; } .dock_style button.toggle:checked { background-color: rgba(0, 106, 255, 0.5); - color: white; + color: black; } .dock_style .stackswitcher{ @@ -37,36 +37,36 @@ /* Background color in the box should be transparent*/ .default_style box { background-color: transparent; - color: black; + color: white; } .default_style separator { background-color: transparent; - color: black; + color: white; } .default_style grid { background-color: transparent; - color: black; + color: white; } .default_style stackswitcher { color: transparent; background-color: transparent; - color: black; + color: white; } .default_style gridview { background-color: transparent; - color: black; + color: white; } .default_style popover contents { - background-color: alpha(white, 0.7); + background-color: rgba(56, 60, 74, 0.7); } popover contents { - background-color: alpha(white, 0.7); + background-color: rgba(56, 60, 74, 0.7); border-color: transparent; - color: black; + color: white; } diff --git a/Gtk4_Reset/src/ui/MyDock.cpp b/Gtk4_Reset/src/ui/MyDock.cpp index abbec02..9d94b58 100644 --- a/Gtk4_Reset/src/ui/MyDock.cpp +++ b/Gtk4_Reset/src/ui/MyDock.cpp @@ -1,6 +1,7 @@ #include "MyDock.h" #include "MyFinder.h" #include "AppView.h" +#include enum PadPage { @@ -266,7 +267,7 @@ static void my_dock_init(MyDock *self) gtk_orientable_set_orientation(GTK_ORIENTABLE(self->icons_box), GTK_ORIENTATION_HORIZONTAL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(self->icons_sw), - GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); + GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); gtk_widget_set_hexpand(self->icons_sw, TRUE); gtk_widget_set_halign(self->icons_sw, GTK_ALIGN_FILL); gtk_widget_set_halign(self->dock_box, GTK_ALIGN_FILL); @@ -287,8 +288,27 @@ static void my_dock_init(MyDock *self) // Create Css Provider for styling GtkCssProvider *provider = gtk_css_provider_new(); - gtk_css_provider_load_from_resource(provider, "/org/gtk/daleclack/style.css"); + GtkIconTheme *theme = gtk_icon_theme_get_for_display( + gtk_widget_get_display(GTK_WIDGET(self))); + char *theme_name = gtk_icon_theme_get_theme_name(theme); + + // Get Last 4 chars + char tmp_str[5] = {0}; + for(int i = 0; i < 4; i++) + { + tmp_str[i] = tolower(theme_name[strlen(theme_name) - 4 + i]); + } + g_print("%s", tmp_str); + if (strncmp(tmp_str, "dark", 4) == 0) + { + gtk_css_provider_load_from_resource(provider, "/org/gtk/daleclack/style_dark.css"); + } + else + { + gtk_css_provider_load_from_resource(provider, "/org/gtk/daleclack/style.css"); + } + g_free(theme_name); // Add Style for finder my_finder_add_style(MY_FINDER(self->finder), provider);