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

Fix channel tree font ownership/lifetime

Browse Source
This commit is contained in:
deepend-tildeclub
2026-07-02 13:08:48 -06:00
parent 5469c30b75
commit 9a6c913d89
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/fe-gtk/chanview.c
View File

@@ -79,6 +79,8 @@ struct _chanview
guint theme_listener_id; guint theme_listener_id;
}; };
static void chanview_set_font_desc (chanview *cv, const PangoFontDescription *font_desc);
struct _chan struct _chan
{ {
chanview *cv; /* our owner */ chanview *cv; /* our owner */
@@ -169,6 +171,7 @@ chanview_apply_theme (chanview *cv)
w = GTK_WIDGET (tv->tree); w = GTK_WIDGET (tv->tree);
if (input_style) if (input_style)
font = input_style->font_desc; font = input_style->font_desc;
chanview_set_font_desc (cv, font);
theme_manager_apply_channel_tree_style (w, theme_manager_apply_channel_tree_style (w,
theme_manager_get_channel_tree_palette_behavior (font)); theme_manager_get_channel_tree_palette_behavior (font));
@@ -313,6 +316,14 @@ chanview_free_ch (chanview *cv, GtkTreeIter *iter)
g_free (ch); g_free (ch);
} }
static void
chanview_set_font_desc (chanview *cv, const PangoFontDescription *font_desc)
{
if (cv->font_desc)
pango_font_description_free (cv->font_desc);
cv->font_desc = font_desc ? pango_font_description_copy (font_desc) : NULL;
}
static void static void
chanview_destroy_store (chanview *cv) /* free every (chan *) in the store */ chanview_destroy_store (chanview *cv) /* free every (chan *) in the store */
{ {
@@ -335,6 +346,9 @@ chanview_destroy (chanview *cv)
if (cv->box) if (cv->box)
gtk_widget_destroy (cv->box); gtk_widget_destroy (cv->box);
if (cv->font_desc)
pango_font_description_free (cv->font_desc);
chanview_destroy_store (cv); chanview_destroy_store (cv);
g_free (cv); g_free (cv);
} }
@@ -356,7 +370,7 @@ chanview_new (int type, int trunc_len, gboolean sort, gboolean use_icons,
cv = g_new0 (chanview, 1); cv = g_new0 (chanview, 1);
cv->store = gtk_tree_store_new (5, G_TYPE_STRING, G_TYPE_POINTER, cv->store = gtk_tree_store_new (5, G_TYPE_STRING, G_TYPE_POINTER,
PANGO_TYPE_ATTR_LIST, GDK_TYPE_PIXBUF, G_TYPE_INT); PANGO_TYPE_ATTR_LIST, GDK_TYPE_PIXBUF, G_TYPE_INT);
cv->font_desc = font_desc; cv->font_desc = font_desc ? pango_font_description_copy (font_desc) : NULL;
cv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); cv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
cv->trunc_len = trunc_len; cv->trunc_len = trunc_len;
cv->sorted = sort; cv->sorted = sort;