diff --git a/Flos_Gtk4/res/style_dark.css b/Flos_Gtk4/res/style_dark.css index 6891277..4df0ece 100644 --- a/Flos_Gtk4/res/style_dark.css +++ b/Flos_Gtk4/res/style_dark.css @@ -13,6 +13,7 @@ .main_style menubar { background-color: alpha(gray, 0.7); + color: white; } .main_style box { @@ -44,6 +45,14 @@ color: white; } +.main_style item { + color: white; +} + +.main_style item:hover { + color: black; +} + .dock_button { background-color: transparent; } @@ -64,7 +73,11 @@ background-color: transparent; } -.btn_style{ +.btn_style { background-color: transparent; color: white; } + +.label_style { + color: white; +} \ No newline at end of file diff --git a/Flos_Gtk4/src/core/MainWin.cpp b/Flos_Gtk4/src/core/MainWin.cpp index 95c9dc2..eae43ef 100644 --- a/Flos_Gtk4/src/core/MainWin.cpp +++ b/Flos_Gtk4/src/core/MainWin.cpp @@ -205,23 +205,6 @@ static void main_win_init(MainWin *win) gtk_popover_set_has_arrow(GTK_POPOVER(win->context_menu), FALSE); gtk_widget_set_parent(win->context_menu, win->overlay); - // Apply Style for menubar and the button - gtk_widget_add_css_class(GTK_WIDGET(menubar), "main_style"); - gtk_widget_add_css_class(home_button, "btn_style"); - // gtk_widget_add_css_class(GTK_WIDGET(home_button), "main_style"); - win->provider = GTK_STYLE_PROVIDER(gtk_css_provider_new()); - // if (win->dark_mode) - // { - gtk_css_provider_load_from_resource(GTK_CSS_PROVIDER(win->provider), "/org/gtk/daleclack/style_dark.css"); - // } - // else - // { - // gtk_css_provider_load_from_resource(GTK_CSS_PROVIDER(win->provider), "/org/gtk/daleclack/style.css"); - // } - // gtk_widget_set_opacity(menubar, 0.7); - gtk_style_context_add_provider((menubar), win->provider, G_MAXINT); - gtk_style_context_add_provider((home_button), win->provider, G_MAXINT); - // Add Label for time GtkWidget *time_label = gtk_label_new("12:21 2022/1/9"); g_timeout_add(1000, label_timer, time_label); @@ -236,6 +219,25 @@ static void main_win_init(MainWin *win) gtk_widget_set_margin_top(time_label, 3); gtk_overlay_add_overlay(GTK_OVERLAY(win->overlay), time_label); + // Apply Style for menubar and the button + gtk_widget_add_css_class(GTK_WIDGET(menubar), "main_style"); + gtk_widget_add_css_class(home_button, "btn_style"); + gtk_widget_add_css_class(time_label, "label_style"); + // gtk_widget_add_css_class(GTK_WIDGET(home_button), "main_style"); + win->provider = GTK_STYLE_PROVIDER(gtk_css_provider_new()); + // if (win->dark_mode) + // { + gtk_css_provider_load_from_resource(GTK_CSS_PROVIDER(win->provider), "/org/gtk/daleclack/style_dark.css"); + // } + // else + // { + // gtk_css_provider_load_from_resource(GTK_CSS_PROVIDER(win->provider), "/org/gtk/daleclack/style.css"); + // } + // gtk_widget_set_opacity(menubar, 0.7); + gtk_style_context_add_provider((menubar), win->provider, G_MAXINT); + gtk_style_context_add_provider((home_button), win->provider, G_MAXINT); + gtk_style_context_add_provider((time_label), win->provider, G_MAXINT); + // Add a dock add_dock(win);