deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-20 04:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a new internal state flag, app_set_prefer_dark, and now set it whenever fe_set_gtk_prefer_dark_theme() writes gtk-application-prefer-dark-theme, so AUTO detection can distinguish app-authored writes from system/user signals.

Browse Source 
Reworked fe_system_prefers_dark() to prioritize non-app-written sources in AUTO flow:

        first: gtk-theme-name dark-variant heuristic,

        then (Windows): native platform detection via fe_win32_try_get_system_dark,

        only then fallback to gtk-application-prefer-dark-theme when no theme-name signal was available and the app has not written that property.

    Kept manual LIGHT/DARK behavior unchanged by preserving the existing mode application path (fe_apply_theme_for_mode() still drives fe_set_gtk_prefer_dark_theme() directly).

    Verified fe_auto_dark_mode_changed() and fe_init() signal wiring still trigger AUTO palette/theme refreshes on system theme changes (notify::gtk-theme-name and existing notify callback flow remain in place).
This commit is contained in:
deepend
2026-02-25 20:03:20 -07:00
parent 97c6f36b20
commit bbde2e5578
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/fe-gtk/fe-gtk.c
View File

@@ -533,11 +533,14 @@ fe_win32_apply_native_titlebar (GtkWidget *window, gboolean dark_mode)
} }
#endif #endif
static gboolean app_set_prefer_dark = FALSE;
static gboolean static gboolean
fe_system_prefers_dark (void) fe_system_prefers_dark (void)
{ {
GtkSettings *settings = gtk_settings_get_default (); GtkSettings *settings = gtk_settings_get_default ();
gboolean prefer_dark = FALSE; gboolean prefer_dark = FALSE;
gboolean has_theme_name = FALSE;
char *theme_name = NULL; char *theme_name = NULL;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gboolean have_win_pref = FALSE; gboolean have_win_pref = FALSE;
@@ -549,27 +552,32 @@ fe_system_prefers_dark (void)
if (!settings) if (!settings)
return FALSE; return FALSE;
#ifdef G_OS_WIN32 g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
have_win_pref = fe_win32_try_get_system_dark (&prefer_dark); if (theme_name)
if (!have_win_pref)
#endif
if (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); char *lower = g_ascii_strdown (theme_name, -1);
has_theme_name = TRUE;
if (g_str_has_suffix (lower, "-dark") || g_strrstr (lower, "dark"))
prefer_dark = TRUE;
g_free (lower);
g_free (theme_name);
if (prefer_dark)
return TRUE;
} }
if (!prefer_dark) #ifdef G_OS_WIN32
have_win_pref = fe_win32_try_get_system_dark (&prefer_dark);
if (have_win_pref)
return prefer_dark;
#endif
if (!has_theme_name
&& !app_set_prefer_dark
&& g_object_class_find_property (G_OBJECT_GET_CLASS (settings),
"gtk-application-prefer-dark-theme"))
{ {
g_object_get (settings, "gtk-theme-name", &theme_name, NULL); g_object_get (settings, "gtk-application-prefer-dark-theme", &prefer_dark, 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 prefer_dark;
@@ -586,6 +594,7 @@ fe_set_gtk_prefer_dark_theme (gboolean dark)
"gtk-application-prefer-dark-theme")) "gtk-application-prefer-dark-theme"))
{ {
g_object_set (settings, "gtk-application-prefer-dark-theme", dark, NULL); g_object_set (settings, "gtk-application-prefer-dark-theme", dark, NULL);
app_set_prefer_dark = TRUE;
} }
} }