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

Added GTK3 input style state tracking (theme, dark mode, colors, and preference) so the CSS provider reloads when those values change, while preserving GTK2 one-time RC parsing

Browse Source
This commit is contained in:
deepend
2026-01-31 13:07:54 -07:00
parent f31ef7cfe2
commit 84647201b1
1 changed files with 116 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,6 +404,16 @@ create_input_style (InputStyle *style)
static int done_rc = FALSE; static int done_rc = FALSE;
#if HAVE_GTK3 #if HAVE_GTK3
static GtkCssProvider *input_css_provider = NULL; static GtkCssProvider *input_css_provider = NULL;
static char *last_theme_name = NULL;
static gboolean last_dark_mode = FALSE;
static gboolean last_input_style = FALSE;
static gboolean last_colors_set = FALSE;
static guint16 last_fg_red;
static guint16 last_fg_green;
static guint16 last_fg_blue;
static guint16 last_bg_red;
static guint16 last_bg_green;
static guint16 last_bg_blue;
#endif #endif
#if HAVE_GTK3 #if HAVE_GTK3
@@ -424,9 +434,11 @@ create_input_style (InputStyle *style)
style->font_desc = pango_font_description_from_string ("sans 11"); style->font_desc = pango_font_description_from_string ("sans 11");
} }
if (prefs.hex_gui_input_style && !done_rc) if (prefs.hex_gui_input_style)
{ {
#if !HAVE_GTK3 #if !HAVE_GTK3
if (!done_rc)
{
GtkSettings *settings = gtk_settings_get_default (); GtkSettings *settings = gtk_settings_get_default ();
char *theme_name; char *theme_name;
@@ -446,6 +458,8 @@ create_input_style (InputStyle *style)
sprintf (buf, cursor_color_rc, (red >> 8), (green >> 8), (blue >> 8)); sprintf (buf, cursor_color_rc, (red >> 8), (green >> 8), (blue >> 8));
} }
gtk_rc_parse_string (buf); gtk_rc_parse_string (buf);
done_rc = TRUE;
}
#else #else
GtkSettings *settings = gtk_settings_get_default (); GtkSettings *settings = gtk_settings_get_default ();
GdkScreen *screen = gdk_screen_get_default (); GdkScreen *screen = gdk_screen_get_default ();
@@ -459,14 +473,30 @@ create_input_style (InputStyle *style)
guint16 bg_red; guint16 bg_red;
guint16 bg_green; guint16 bg_green;
guint16 bg_blue; guint16 bg_blue;
gboolean dark_mode = fe_dark_mode_is_enabled ();
gboolean needs_reload;
g_object_get (settings, "gtk-theme-name", &theme_name, NULL); g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
palette_color_get_rgb16 (&colors[COL_FG], &fg_red, &fg_green, &fg_blue);
palette_color_get_rgb16 (&colors[COL_BG], &bg_red, &bg_green, &bg_blue);
needs_reload = !done_rc
|| !last_input_style
|| last_dark_mode != dark_mode
|| g_strcmp0 (last_theme_name, theme_name) != 0
|| !last_colors_set
|| last_fg_red != fg_red
|| last_fg_green != fg_green
|| last_fg_blue != fg_blue
|| last_bg_red != bg_red
|| last_bg_green != bg_green
|| last_bg_blue != bg_blue;
if (needs_reload)
{
if (!input_css_provider) if (!input_css_provider)
input_css_provider = gtk_css_provider_new (); input_css_provider = gtk_css_provider_new ();
palette_color_get_rgb16 (&colors[COL_FG], &fg_red, &fg_green, &fg_blue);
palette_color_get_rgb16 (&colors[COL_BG], &bg_red, &bg_green, &bg_blue);
g_snprintf (buf, sizeof (buf), "#%02x%02x%02x", g_snprintf (buf, sizeof (buf), "#%02x%02x%02x",
(fg_red >> 8), (fg_green >> 8), (fg_blue >> 8)); (fg_red >> 8), (fg_green >> 8), (fg_blue >> 8));
g_snprintf (cursor_rc, sizeof (cursor_rc), cursor_color_rc, g_snprintf (cursor_rc, sizeof (cursor_rc), cursor_color_rc,
@@ -516,10 +546,30 @@ create_input_style (InputStyle *style)
GTK_STYLE_PROVIDER (input_css_provider), GTK_STYLE_PROVIDER (input_css_provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
done_rc = TRUE;
last_input_style = TRUE;
last_dark_mode = dark_mode;
last_colors_set = TRUE;
last_fg_red = fg_red;
last_fg_green = fg_green;
last_fg_blue = fg_blue;
last_bg_red = bg_red;
last_bg_green = bg_green;
last_bg_blue = bg_blue;
g_free (last_theme_name);
last_theme_name = g_strdup (theme_name);
}
g_free (theme_name); g_free (theme_name);
#endif #endif
done_rc = TRUE;
} }
#if HAVE_GTK3
else
{
done_rc = FALSE;
last_input_style = FALSE;
}
#endif
#if !HAVE_GTK3 #if !HAVE_GTK3
style->bg[GTK_STATE_NORMAL] = colors[COL_FG]; style->bg[GTK_STATE_NORMAL] = colors[COL_FG];