Fix KDE Wayland headerbar button layout

Apply app theme CSS to menubar everywhere

changelog.rst

@@ -1,6 +1,28 @@
 ZoiteChat ChangeLog
 =================
 
+2.18.0~pre5 (2026-03-22)
+------------------------
+- Overhauled preferences/config saving: fully staged and transactional, debounced
+  with flush on close, write failures now surfaced.
+- Overhauled GTK theme handling: live preview, correct colour reset persistence,
+  proper file:// import paths, consistent menubar CSS.
+- Fixed GTK entry scroll artifact in the input box.
+- Hardened tray menu lifetime; fixed stale pointer crash on menu destruction.
+- Fixed AppIndicator tray init for Wayland/source builds; skip redundant X11
+  tray probe for AppIndicator builds.
+- Split topic/mode rows in channel bar, tighten spacing, persist userlist column widths.
+- Preserve saved right-pane size on first layout.
+- Fixed sounds prefs section.
+- Fixed chanview tree layout and header alignment; tighten topic URL hit-testing.
+- Dropped realpath() in favour of GLib-only absolute path build.
+- Made About dialog links explicit; added GPL licence URL.
+- Added licence headers to new source files.
+- Windows installer: fixed VC++ redist URL, added non-plugin download fallback,
+  switched to registry-based runtime detection.
+- Made libayatana-appindicator a required dep in PKGBUILD.
+- Cleaned up Meson libperl detection.
+
 2.18.0~pre4 (2026-03-15)
 ------------------------
 

data/misc/net.zoite.Zoitechat.appdata.xml.in

@@ -29,6 +29,45 @@
     <id>zoitechat.desktop</id>
   </provides>
 <releases>
+  <release date="2026-03-22" version="2.18.0~pre5">
+    <description>
+      <p>Preferences and config saving:</p>
+      <ul>
+        <li>Overhauled preferences/config saving: fully staged and transactional, debounced with flush on close, write failures now surfaced.</li>
+      </ul>
+      <p>GTK theme and UI:</p>
+      <ul>
+        <li>Overhauled GTK theme handling: live preview, correct colour reset persistence, proper <code>file://</code> import paths, consistent menubar CSS.</li>
+        <li>Fixed GTK entry scroll artifact in the input box.</li>
+        <li>Split topic/mode rows in channel bar, tighten spacing, persist userlist column widths.</li>
+        <li>Preserve saved right-pane size on first layout.</li>
+        <li>Fixed sounds prefs section.</li>
+        <li>Fixed chanview tree layout and header alignment; tighten topic URL hit-testing.</li>
+      </ul>
+      <p>Tray:</p>
+      <ul>
+        <li>Hardened tray menu lifetime; fixed stale pointer crash on menu destruction.</li>
+        <li>Fixed AppIndicator tray init for Wayland/source builds; skip redundant X11 tray probe for AppIndicator builds.</li>
+      </ul>
+      <p>Build and packaging:</p>
+      <ul>
+        <li>Dropped <code>realpath()</code> in favour of GLib-only absolute path build.</li>
+        <li>Made About dialog links explicit; added GPL licence URL.</li>
+        <li>Added licence headers to new source files.</li>
+        <li>Windows installer: fixed VC++ redist URL, added non-plugin download fallback, switched to registry-based runtime detection.</li>
+        <li>Made <code>libayatana-appindicator</code> a required dep in PKGBUILD.</li>
+        <li>Cleaned up Meson libperl detection.</li>
+      </ul>
+    </description>
+  </release>
+  <release date="2026-03-22" version="2.18.0~pre5">
+    <description>
+      <p>Version metadata update:</p>
+      <ul>
+        <li>Bumped release version references to <code>2.18.0~pre5</code> across build and packaging files.</li>
+      </ul>
+    </description>
+  </release>
   <release date="2026-03-14" version="2.18.0~pre4">
     <description>
       <p>UI fixes, topic bar improvements, and selection styling updates:</p>

meson.build

@@ -1,5 +1,5 @@
 project('zoitechat', 'c',
-  version: '2.18.0~pre4',
+  version: '2.18.0~pre5',
   meson_version: '>= 0.55.0',
   default_options: [
     'c_std=c17',

plugins/python/python.py

@@ -19,7 +19,7 @@ else:
 if not hasattr(sys, 'argv'):
     sys.argv = ['<zoitechat>']
 
-VERSION = b'2.18.0~pre4'
+VERSION = b'2.18.0~pre5'
 PLUGIN_NAME = ffi.new('char[]', b'Python')
 PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
 PLUGIN_VERSION = ffi.new('char[]', VERSION)

src/fe-gtk/gtkutil.c

@@ -1120,7 +1120,9 @@ gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...)
 gboolean
 gtkutil_tray_icon_supported (GtkWindow *window)
 {
-#ifdef GDK_WINDOWING_X11
+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_APPINDICATOR)
+	return TRUE;
+#elif defined(GDK_WINDOWING_X11)
 	GdkScreen *screen = gtk_window_get_screen (window);
 	GdkDisplay *display = gdk_screen_get_display (screen);
 	if (!GDK_IS_X11_DISPLAY (display))

src/fe-gtk/maingui.c

@@ -2803,6 +2803,43 @@ mg_apply_entry_style (GtkWidget *entry)
 	theme_manager_apply_entry_palette (entry, input_style->font_desc);
 }
 
+static void
+mg_apply_entry_scroll_artifact_fix (GtkWidget *entry)
+{
+	GtkStyleContext *context;
+	GtkCssProvider *provider;
+
+	if (!entry || !GTK_IS_ENTRY (entry))
+		return;
+
+	context = gtk_widget_get_style_context (entry);
+	if (!context)
+		return;
+
+	provider = g_object_get_data (G_OBJECT (entry), "mg-entry-scroll-artifact-provider");
+	if (!provider)
+	{
+		provider = gtk_css_provider_new ();
+		g_object_set_data_full (G_OBJECT (entry), "mg-entry-scroll-artifact-provider", provider, g_object_unref);
+		gtk_css_provider_load_from_data (provider,
+			"entry.zoitechat-no-undershoot undershoot,\n"
+			"entry.zoitechat-no-undershoot undershoot.left,\n"
+			"entry.zoitechat-no-undershoot undershoot.right,\n"
+			".zoitechat-no-undershoot undershoot,\n"
+			".zoitechat-no-undershoot undershoot.left,\n"
+			".zoitechat-no-undershoot undershoot.right {\n"
+			"  background-image: none;\n"
+			"  background-color: transparent;\n"
+			"  border: none;\n"
+			"  box-shadow: none;\n"
+			"}\n",
+			-1, NULL);
+	}
+
+	gtk_style_context_add_class (context, "zoitechat-no-undershoot");
+	theme_css_apply_widget_provider (entry, GTK_STYLE_PROVIDER (provider));
+}
+
 static gboolean
 mg_entry_select_all (GtkWidget *entry, GdkEventKey *event, gpointer userdata)
 {
@@ -2842,6 +2879,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 
         if (prefs.hex_gui_input_style)
                 mg_apply_entry_style (gui->key_entry);
+        mg_apply_entry_scroll_artifact_fix (gui->key_entry);
 
         gui->flag_l = mg_create_flagbutton (_("User Limit"), box, "l");
         gui->limit_entry = gtk_entry_new ();
@@ -2858,6 +2896,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 
         if (prefs.hex_gui_input_style)
                 mg_apply_entry_style (gui->limit_entry);
+        mg_apply_entry_scroll_artifact_fix (gui->limit_entry);
 }
 
 /*static void
@@ -3955,6 +3994,7 @@ mg_create_search(session *sess, GtkWidget *box)
         gtk_box_pack_start(GTK_BOX(gui->shbox), entry, FALSE, FALSE, 0);
         gtk_widget_set_size_request (gui->shentry, 180, -1);
         mg_apply_emoji_fallback_widget (entry);
+        mg_apply_entry_scroll_artifact_fix (entry);
         gui->search_changed_signal = g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(search_handle_change), sess);
         g_signal_connect (G_OBJECT (entry), "key-press-event", G_CALLBACK (search_handle_esc), sess);
         g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(mg_search_handle_next), sess);
@@ -4050,6 +4090,7 @@ mg_create_entry (session *sess, GtkWidget *box)
 
         if (prefs.hex_gui_input_style)
                 mg_apply_entry_style (entry);
+        mg_apply_entry_scroll_artifact_fix (entry);
 
         g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL);
 
@@ -4165,7 +4206,7 @@ mg_create_menu (session_gui *gui, GtkWidget *table, int away_state)
                                                                                         gui->menu_item);
         gtk_widget_set_hexpand (gui->menu, TRUE);
         gtk_widget_set_vexpand (gui->menu, FALSE);
-        gtk_widget_set_halign (gui->menu, GTK_ALIGN_FILL);
+        gtk_widget_set_halign (gui->menu, GTK_ALIGN_START);
         gtk_widget_set_valign (gui->menu, GTK_ALIGN_FILL);
         gtk_grid_attach (GTK_GRID (table), gui->menu, 0, 0, 3, 1);
 }

src/fe-gtk/meson.build

@@ -65,8 +65,8 @@ if host_machine.system() != 'windows'
       if appindicator_dep.found()
         zoitechat_gtk_deps += appindicator_dep
         zoitechat_gtk_cflags += '-DHAVE_APPINDICATOR'
-      elif appindicator_opt.enabled()
-        error('appindicator=enabled, but neither ayatana-appindicator3-0.1 nor appindicator3-0.1 was found')
+      elif appindicator_opt.enabled() or (appindicator_opt.auto() and host_machine.system() == 'linux')
+        error('tray support requires ayatana-appindicator3-0.1 or appindicator3-0.1 on Linux (use -Dappindicator=disabled to override)')
       endif
     endif
   endif

src/fe-gtk/plugin-tray.c

@@ -125,6 +125,7 @@ static void tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user
 static void tray_update_toggle_item_label (void);
 static gboolean tray_window_state_cb (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata);
 static void tray_window_visibility_cb (GtkWidget *widget, gpointer userdata);
+static void tray_toggle_item_destroy_cb (GtkWidget *widget, gpointer userdata);
 #if HAVE_APPINDICATOR_BACKEND
 static void tray_menu_show_cb (GtkWidget *menu, gpointer userdata) G_GNUC_UNUSED;
 #endif
@@ -364,8 +365,8 @@ tray_app_indicator_set_icon (TrayIcon icon)
 	if (!icon_name)
 		return;
 
-	app_indicator_set_icon_full (tray_indicator, icon_name, _(DISPLAY_NAME));
 	app_indicator_set_status (tray_indicator, APP_INDICATOR_STATUS_ACTIVE);
+	app_indicator_set_icon_full (tray_indicator, icon_name, _(DISPLAY_NAME));
 
 	g_free (icon_name_alloc);
 }
@@ -408,7 +409,8 @@ tray_app_indicator_cleanup (void)
 
 	if (tray_menu)
 	{
-		gtk_widget_destroy (tray_menu);
+		if (GTK_IS_WIDGET (tray_menu))
+			gtk_widget_destroy (tray_menu);
 		tray_menu = NULL;
 	}
 }
@@ -431,7 +433,6 @@ tray_app_indicator_init (void)
 	g_signal_connect (G_OBJECT (tray_menu), "map",
 		G_CALLBACK (tray_menu_show_cb), NULL);
 	app_indicator_set_menu (tray_indicator, GTK_MENU (tray_menu));
-	app_indicator_set_status (tray_indicator, APP_INDICATOR_STATUS_ACTIVE);
 
 	klass = G_OBJECT_GET_CLASS (tray_indicator);
 	if (klass && g_object_class_find_property (klass, "connected"))
@@ -1027,10 +1028,15 @@ blink_item (unsigned int *setting, GtkWidget *menu, char *label)
 static void
 tray_menu_destroy (GtkWidget *menu, gpointer userdata)
 {
-	(void)userdata;
+	GtkWidget **menu_ptr = userdata;
 
-	gtk_widget_destroy (menu);
-	g_object_unref (menu);
+	if (menu_ptr && *menu_ptr == menu)
+		*menu_ptr = NULL;
+
+	if (GTK_IS_WIDGET (menu))
+		gtk_widget_destroy (menu);
+	if (G_IS_OBJECT (menu))
+		g_object_unref (menu);
 #ifdef WIN32
 	g_source_remove (tray_menu_timer);
 #endif
@@ -1090,6 +1096,8 @@ tray_menu_populate (GtkWidget *menu)
 	zoitechat_set_context (ph, zoitechat_find_context (ph, NULL, NULL));
 
 	tray_toggle_item = tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL);
+	g_signal_connect (G_OBJECT (tray_toggle_item), "destroy",
+		G_CALLBACK (tray_toggle_item_destroy_cb), NULL);
 	tray_update_toggle_item_label ();
 	tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
 
@@ -1130,12 +1138,22 @@ tray_menu_clear (GtkWidget *menu)
 
 	children = gtk_container_get_children (GTK_CONTAINER (menu));
 	for (iter = children; iter; iter = iter->next)
-		gtk_widget_destroy (GTK_WIDGET (iter->data));
+		if (GTK_IS_WIDGET (iter->data))
+			gtk_widget_destroy (GTK_WIDGET (iter->data));
 	g_list_free (children);
 	tray_toggle_item = NULL;
 }
 #endif
 
+static void
+tray_toggle_item_destroy_cb (GtkWidget *widget, gpointer userdata)
+{
+	(void)userdata;
+
+	if (tray_toggle_item == widget)
+		tray_toggle_item = NULL;
+}
+
 static void
 tray_update_toggle_item_label (void)
 {
@@ -1143,6 +1161,11 @@ tray_update_toggle_item_label (void)
 
 	if (!tray_toggle_item)
 		return;
+	if (!GTK_IS_MENU_ITEM (tray_toggle_item))
+	{
+		tray_toggle_item = NULL;
+		return;
+	}
 
 	if (tray_get_window_status () == WS_HIDDEN)
 		label = _("_Restore Window");
@@ -1195,10 +1218,9 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
 	(void)time;
 	(void)userdata;
 
-	/* close any old menu */
-	if (G_IS_OBJECT (menu))
+	if (menu)
 	{
-		tray_menu_destroy (menu, NULL);
+		tray_menu_destroy (menu, &menu);
 	}
 
 	menu = gtk_menu_new ();
@@ -1208,8 +1230,9 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
 	g_object_ref (menu);
 	g_object_ref_sink (menu);
 	g_object_unref (menu);
+	g_object_add_weak_pointer (G_OBJECT (menu), (gpointer *)&menu);
 	g_signal_connect (G_OBJECT (menu), "selection-done",
-		G_CALLBACK (tray_menu_destroy), NULL);
+		G_CALLBACK (tray_menu_destroy), &menu);
 #ifdef WIN32
 	g_signal_connect (G_OBJECT (menu), "leave-notify-event",
 		G_CALLBACK (tray_menu_left_cb), NULL);
@@ -1390,9 +1413,14 @@ tray_apply_setup (void)
 	}
 	else
 	{
+#if HAVE_APPINDICATOR_BACKEND
+		if (prefs.hex_gui_tray)
+			tray_init ();
+#else
 		GtkWindow *window = GTK_WINDOW(zoitechat_get_info (ph, "gtkwin_ptr"));
 		if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window))
 			tray_init ();
+#endif
 	}
 }
 
@@ -1439,7 +1467,11 @@ tray_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name,
 			G_CALLBACK (tray_window_visibility_cb), NULL);
 	}
 
+#if HAVE_APPINDICATOR_BACKEND
+	if (prefs.hex_gui_tray)
+#else
 	if (prefs.hex_gui_tray && gtkutil_tray_icon_supported (window))
+#endif
 		tray_init ();
 
 	return 1;       /* return 1 for success */

src/fe-gtk/setup.c

@@ -1714,11 +1714,11 @@ setup_create_sound_page (void)
 
         vbox2 = gtkutil_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_widget_show (vbox2);
-        gtk_container_add (GTK_CONTAINER (vbox1), vbox2);
+        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, TRUE, TRUE, 0);
 
         scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
         gtk_widget_show (scrolledwindow1);
-        gtk_container_add (GTK_CONTAINER (vbox2), scrolledwindow1);
+        gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow1, TRUE, TRUE, 0);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1),
                                                                                           GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
         gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1),
@@ -1793,7 +1793,7 @@ setup_add_page (const char *title, GtkWidget *book, GtkWidget *tab)
         gtk_widget_set_margin_bottom (label, 1);
         gtk_box_pack_start (GTK_BOX (vvbox), label, FALSE, FALSE, 2);
 
-        gtk_container_add (GTK_CONTAINER (vvbox), tab);
+        gtk_box_pack_start (GTK_BOX (vvbox), tab, TRUE, TRUE, 0);
 
         sw = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new (NULL, NULL));
         gtk_scrolled_window_set_shadow_type (sw, GTK_SHADOW_IN);
@@ -2197,8 +2197,8 @@ setup_ok_cb (GtkWidget *but, GtkWidget *win)
         char buffer[192];
 
         memcpy (&old_prefs, &prefs, sizeof (prefs));
-        theme_preferences_stage_apply ();
         setup_apply (&setup_prefs);
+        theme_preferences_stage_apply ();
         save_result = preferences_persistence_save_all ();
         if (save_result.success)
         {

src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c

@@ -68,6 +68,16 @@ theme_get_color (ThemeSemanticToken token, GdkRGBA *color)
         return TRUE;
 }
 
+void
+theme_get_widget_style_values_for_widget (GtkWidget *widget, ThemeWidgetStyleValues *out_values)
+{
+        (void)widget;
+        if (!out_values)
+                return;
+        gdk_rgba_parse (&out_values->foreground, "#111111");
+        gdk_rgba_parse (&out_values->background, "#f0f0f0");
+}
+
 void
 theme_manager_set_token_color (unsigned int dark_mode, ThemeSemanticToken token, const GdkRGBA *color, gboolean *changed)
 {
@@ -92,6 +102,12 @@ theme_manager_save_preferences (void)
 	return TRUE;
 }
 
+void
+theme_manager_dispatch_changed (ThemeChangedReason reasons)
+{
+        (void)reasons;
+}
+
 ThemePaletteBehavior
 theme_manager_get_userlist_palette_behavior (const PangoFontDescription *font_desc)
 {

src/fe-gtk/theme/theme-application.c

@@ -26,16 +26,29 @@
 #include "theme-runtime.h"
 #include "theme-gtk3.h"
 #include "../maingui.h"
-
-#ifdef G_OS_WIN32
 #include <gtk/gtk.h>
 
+#if defined(__GNUC__) || defined(__clang__)
+extern char *theme_css_build_toplevel_classes (void) __attribute__ ((weak));
+#else
+extern char *theme_css_build_toplevel_classes (void);
+#endif
+
+static char *
+theme_application_build_toplevel_css (void)
+{
+	if (theme_css_build_toplevel_classes)
+		return theme_css_build_toplevel_classes ();
+
+	return g_strdup ("");
+}
+
 static void
-theme_application_apply_windows_theme (gboolean dark)
+theme_application_apply_toplevel_theme (gboolean dark)
 {
 	GtkSettings *settings = gtk_settings_get_default ();
-	static GtkCssProvider *win_theme_provider = NULL;
-	static gboolean win_theme_provider_installed = FALSE;
+	static GtkCssProvider *theme_provider = NULL;
+	static gboolean theme_provider_installed = FALSE;
 	GdkScreen *screen;
 	gboolean prefer_dark = dark;
 	char *css;
@@ -56,33 +69,21 @@ theme_application_apply_windows_theme (gboolean dark)
 	if (!screen)
 		return;
 
-	if (theme_gtk3_is_active ())
-	{
-		if (win_theme_provider_installed && win_theme_provider)
-		{
-			gtk_style_context_remove_provider_for_screen (screen,
-				GTK_STYLE_PROVIDER (win_theme_provider));
-			win_theme_provider_installed = FALSE;
-		}
-		return;
-	}
+	if (!theme_provider)
+		theme_provider = gtk_css_provider_new ();
 
-	if (!win_theme_provider)
-		win_theme_provider = gtk_css_provider_new ();
-
-	css = theme_css_build_toplevel_classes ();
-	gtk_css_provider_load_from_data (win_theme_provider, css, -1, NULL);
+	css = theme_application_build_toplevel_css ();
+	gtk_css_provider_load_from_data (theme_provider, css, -1, NULL);
 	g_free (css);
 
-	if (!win_theme_provider_installed)
+	if (!theme_provider_installed)
 	{
 		gtk_style_context_add_provider_for_screen (screen,
-			GTK_STYLE_PROVIDER (win_theme_provider),
+			GTK_STYLE_PROVIDER (theme_provider),
 			GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1);
-		win_theme_provider_installed = TRUE;
+		theme_provider_installed = TRUE;
 	}
 }
-#endif
 
 gboolean
 theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
@@ -91,10 +92,7 @@ theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
 
 	theme_runtime_load ();
 	dark = theme_runtime_apply_mode (mode, palette_changed);
-
-#ifdef G_OS_WIN32
-	theme_application_apply_windows_theme (dark);
-#endif
+	theme_application_apply_toplevel_theme (dark);
 
 	theme_application_reload_input_style ();
 

src/fe-gtk/theme/theme-css.c

@@ -361,20 +361,22 @@ theme_css_build_toplevel_classes (void)
 		"color: #f0f0f0;"
 		"border-color: #202020;"
 		"}"
-		"window.%s menubar, window.%s menubar:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
-		"background-color: #202020;"
-		"color: #f0f0f0;"
-		"border-color: #202020;"
+		"window.%s menubar, window.%s menubar:backdrop, window.%s menubar box, window.%s menubar box:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
+		"background-color: @theme_bg_color;"
+		"background-image: none;"
+		"color: @theme_fg_color;"
+		"border-color: @theme_bg_color;"
 		"}"
 		"window.%s, window.%s:backdrop, .%s {"
 		"background-color: #f6f6f6;"
 		"color: #101010;"
 		"border-color: #f6f6f6;"
 		"}"
-		"window.%s menubar, window.%s menubar:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
-		"background-color: #f6f6f6;"
-		"color: #101010;"
-		"border-color: #f6f6f6;"
+		"window.%s menubar, window.%s menubar:backdrop, window.%s menubar box, window.%s menubar box:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
+		"background-color: @theme_bg_color;"
+		"background-image: none;"
+		"color: @theme_fg_color;"
+		"border-color: @theme_bg_color;"
 		"}",
 		theme_css_selector_dark_class,
 		theme_css_selector_dark_class,
@@ -383,6 +385,10 @@ theme_css_build_toplevel_classes (void)
 		theme_css_selector_dark_class,
 		theme_css_selector_dark_class,
 		theme_css_selector_dark_class,
+		theme_css_selector_dark_class,
+		theme_css_selector_dark_class,
+		theme_css_selector_light_class,
+		theme_css_selector_light_class,
 		theme_css_selector_light_class,
 		theme_css_selector_light_class,
 		theme_css_selector_light_class,

src/fe-gtk/theme/theme-manager.c

@@ -216,8 +216,6 @@ theme_manager_queue_auto_refresh (GtkSettings *settings, GParamSpec *pspec, gpoi
 void
 theme_manager_init (void)
 {
-	GtkSettings *settings;
-
 	if (!theme_manager_listeners)
 		theme_manager_listeners = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
 									 theme_listener_free);
@@ -225,21 +223,10 @@ theme_manager_init (void)
 	if (!theme_manager_setup_listener_id)
 		theme_manager_setup_listener_id = theme_listener_register ("setup.apply", theme_manager_setup_apply_listener, NULL);
 
-	settings = gtk_settings_get_default ();
-	if (settings)
-		fe_set_auto_dark_mode_state (theme_policy_system_prefers_dark ());
-
+	fe_set_auto_dark_mode_state (FALSE);
 	theme_application_apply_mode (prefs.hex_gui_dark_mode, NULL);
 	theme_gtk3_init ();
 	zoitechat_set_theme_post_apply_callback (theme_manager_handle_theme_applied);
-
-	if (settings)
-	{
-		g_signal_connect (settings, "notify::gtk-application-prefer-dark-theme",
-					  G_CALLBACK (theme_manager_queue_auto_refresh), NULL);
-		g_signal_connect (settings, "notify::gtk-theme-name",
-					  G_CALLBACK (theme_manager_queue_auto_refresh), NULL);
-	}
 }
 
 gboolean
@@ -407,18 +394,15 @@ theme_manager_handle_theme_applied (void)
 static gboolean
 theme_manager_is_kde_wayland (void)
 {
-	const char *wayland_display;
 	const char *desktop;
 	char *desktop_lower;
 	gboolean is_kde;
 
-	wayland_display = g_getenv ("WAYLAND_DISPLAY");
-	if (!wayland_display || !wayland_display[0])
-		return FALSE;
-
 	desktop = g_getenv ("XDG_CURRENT_DESKTOP");
 	if (!desktop || !desktop[0])
 		desktop = g_getenv ("XDG_SESSION_DESKTOP");
+	if ((!desktop || !desktop[0]) && g_getenv ("KDE_FULL_SESSION"))
+		return TRUE;
 	if (!desktop || !desktop[0])
 		return FALSE;
 
@@ -454,7 +438,7 @@ theme_manager_apply_wayland_kde_csd (GtkWidget *window)
 
 			headerbar = gtk_header_bar_new ();
 			gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
-			gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (headerbar), "menu:minimize,maximize,close");
+			gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (headerbar), ":minimize,maximize,close");
 			icon_pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.svg", 32, 32, TRUE, NULL);
 			if (!icon_pixbuf)
 				icon_pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.png", 32, 32, TRUE, NULL);
@@ -494,7 +478,6 @@ theme_manager_apply_wayland_kde_csd (GtkWidget *window)
 static void
 theme_manager_apply_platform_window_theme (GtkWidget *window)
 {
-#ifdef G_OS_WIN32
 	GtkStyleContext *context;
 	gboolean dark;
 
@@ -516,6 +499,7 @@ theme_manager_apply_platform_window_theme (GtkWidget *window)
 		gtk_style_context_remove_class (context, "zoitechat-light");
 		gtk_style_context_add_class (context, dark ? "zoitechat-dark" : "zoitechat-light");
 	}
+#ifdef G_OS_WIN32
 	fe_win32_apply_native_titlebar (window, dark);
 #else
 	theme_manager_apply_wayland_kde_csd (window);

src/fe-gtk/theme/theme-policy.c

@@ -27,38 +27,7 @@
 gboolean
 theme_policy_system_prefers_dark (void)
 {
-	GtkSettings *settings = gtk_settings_get_default ();
-	gboolean prefer_dark = FALSE;
-	char *theme_name = NULL;
-#ifdef G_OS_WIN32
-	gboolean have_win_pref = FALSE;
-
-	if (fe_win32_high_contrast_is_enabled ())
-		return FALSE;
-
-	have_win_pref = fe_win32_try_get_system_dark (&prefer_dark);
-	if (!have_win_pref)
-#endif
-	if (settings && g_object_class_find_property (G_OBJECT_GET_CLASS (settings),
-	                                              "gtk-application-prefer-dark-theme"))
-	{
-		g_object_get (settings, "gtk-application-prefer-dark-theme", &prefer_dark, NULL);
-	}
-
-	if (settings && !prefer_dark)
-	{
-		g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
-		if (theme_name)
-		{
-			char *lower = g_ascii_strdown (theme_name, -1);
-			if (g_str_has_suffix (lower, "-dark") || g_strrstr (lower, "dark"))
-				prefer_dark = TRUE;
-			g_free (lower);
-			g_free (theme_name);
-		}
-	}
-
-	return prefer_dark;
+	return FALSE;
 }
 
 gboolean

src/fe-gtk/theme/theme-preferences.c

@@ -723,6 +723,7 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
                 if (theme_preferences_stage.active)
                 {
                         ThemeSemanticToken token;
+                        ThemeWidgetStyleValues style_values;
 
                         for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
                         {
@@ -733,6 +734,12 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
                                 theme_preferences_stage.staged[token] = rgba;
                                 theme_preferences_stage.staged_valid[token] = TRUE;
                         }
+                        theme_get_widget_style_values_for_widget (GTK_WIDGET (dialog), &style_values);
+                        theme_preferences_stage.staged[THEME_TOKEN_TEXT_FOREGROUND] = style_values.foreground;
+                        theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_FOREGROUND] = TRUE;
+                        theme_preferences_stage.staged[THEME_TOKEN_TEXT_BACKGROUND] = style_values.background;
+                        theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_BACKGROUND] = TRUE;
+                        theme_preferences_stage_sync_runtime_to_staged ();
                         theme_preferences_stage_recompute_changed ();
                         if (ui->color_change_flag)
                                 *ui->color_change_flag = theme_preferences_stage.changed;
@@ -1343,6 +1350,19 @@ theme_preferences_gtk3_sync_remove_state (theme_preferences_ui *ui)
         gtk_widget_set_sensitive (ui->gtk3_remove, source == ZOITECHAT_GTK3_THEME_SOURCE_USER);
 }
 
+static gboolean
+theme_preferences_gtk3_apply_and_refresh (GError **error)
+{
+        if (!theme_gtk3_apply_current (error))
+                return FALSE;
+        theme_manager_dispatch_changed (THEME_CHANGED_REASON_THEME_PACK |
+                                        THEME_CHANGED_REASON_PALETTE |
+                                        THEME_CHANGED_REASON_WIDGET_STYLE |
+                                        THEME_CHANGED_REASON_USERLIST |
+                                        THEME_CHANGED_REASON_MODE);
+        return TRUE;
+}
+
 static void
 theme_preferences_gtk3_changed_cb (GtkComboBox *combo, gpointer user_data)
 {
@@ -1373,7 +1393,7 @@ theme_preferences_gtk3_changed_cb (GtkComboBox *combo, gpointer user_data)
                 ui->setup_prefs->hex_gui_gtk3_variant = prefs.hex_gui_gtk3_variant;
         }
 
-        if (selection_changed && !theme_gtk3_apply_current (&error))
+        if (selection_changed && !theme_preferences_gtk3_apply_and_refresh (&error))
         {
                 theme_preferences_show_message (ui, GTK_MESSAGE_ERROR,
                                                 error ? error->message : _("Failed to apply GTK3 theme."));
@@ -1550,7 +1570,7 @@ theme_preferences_populate_gtk3 (theme_preferences_ui *ui)
                 g_free (final_id);
         }
 
-        if (should_apply && !theme_gtk3_apply_current (&error))
+        if (should_apply && !theme_preferences_gtk3_apply_and_refresh (&error))
         {
                 theme_preferences_show_message (ui, GTK_MESSAGE_ERROR,
                                                 error ? error->message : _("Failed to apply GTK3 theme."));

win32/version.txt

@@ -1 +1 @@
-2.18.0~pre4
+2.18.0~pre5