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

Added GTK3-specific helpers for tray tooltip updates and embedded checks with a safe fallback when the embedded property is unavailable.

Browse Source 
Updated tooltip handling and tray restore detection to use GTK3 helpers while keeping GTK2-only APIs behind GTK2 guards.
This commit is contained in:
deepend
2026-01-30 19:30:02 -07:00
parent 4bd67e4933
commit dec2aff37d
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/fe-gtk/plugin-tray.c
View File

@@ -188,12 +188,36 @@ tray_set_custom_icon_state (TrayCustomIcon icon, TrayIconState state)
tray_icon_state = state; tray_icon_state = state;
} }
#if HAVE_GTK3
static void
tray_set_tooltip_text (GtkStatusIcon *icon, const char *text)
{
g_object_set (G_OBJECT (icon), "tooltip-text", text, NULL);
}
static gboolean
tray_is_embedded (GtkStatusIcon *icon)
{
GObjectClass *klass;
gboolean embedded = TRUE;
if (!icon)
return FALSE;
klass = G_OBJECT_GET_CLASS (icon);
if (klass && g_object_class_find_property (klass, "embedded"))
g_object_get (G_OBJECT (icon), "embedded", &embedded, NULL);
return embedded;
}
#endif
void void
fe_tray_set_tooltip (const char *text) fe_tray_set_tooltip (const char *text)
{ {
if (sticon) if (sticon)
#if HAVE_GTK3 #if HAVE_GTK3
g_object_set (G_OBJECT (sticon), "tooltip-text", text, NULL); tray_set_tooltip_text (sticon, text);
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3
gtk_status_icon_set_tooltip_text (sticon, text); gtk_status_icon_set_tooltip_text (sticon, text);
@@ -435,15 +459,10 @@ tray_menu_restore_cb (GtkWidget *item, gpointer userdata)
static void static void
tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data) tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data)
{ {
#if HAVE_GTK3
gboolean embedded = FALSE;
#endif
if (sticon) if (sticon)
{ {
#if HAVE_GTK3 #if HAVE_GTK3
g_object_get (G_OBJECT (sticon), "embedded", &embedded, NULL); if (!tray_is_embedded (sticon))
if (!embedded)
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3
if (!gtk_status_icon_is_embedded (sticon)) if (!gtk_status_icon_is_embedded (sticon))