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

Guarded cursor unref with a null check while keeping GTK2/GTK3-specific cleanup behavior centralized.

Browse Source 
Added a helper to clear window backgrounds using GTK2/GTK3-specific APIs and used it during widget realize.
This commit is contained in:
deepend
2026-01-23 00:32:59 -07:00
parent 7ac74220c4
commit 796c991dd8
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/fe-gtk/xtext.c
View File

@@ -153,11 +153,11 @@ static char * gtk_xtext_get_word (GtkXText * xtext, int x, int y, textentry ** r
static inline void static inline void
gtk_xtext_cursor_unref (GdkCursor *cursor) gtk_xtext_cursor_unref (GdkCursor *cursor)
{ {
if (!cursor)
return;
#if !HAVE_GTK3 #if !HAVE_GTK3
gdk_cursor_unref (cursor); gdk_cursor_unref (cursor);
#else #else
if (!cursor)
return;
g_object_unref (cursor); g_object_unref (cursor);
#endif #endif
} }
@@ -771,6 +771,16 @@ gtk_xtext_get_pointer (GdkWindow *window, gint *x, gint *y, GdkModifierType *mas
#endif #endif
} }
static inline void
gtk_xtext_clear_background (GtkWidget *widget)
{
#if !HAVE_GTK3
gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
#else
gdk_window_set_background_pattern (widget->window, NULL);
#endif
}
static void static void
gtk_xtext_realize (GtkWidget * widget) gtk_xtext_realize (GtkWidget * widget)
{ {
@@ -836,11 +846,7 @@ gtk_xtext_realize (GtkWidget * widget)
xtext->hand_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_HAND1); xtext->hand_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_HAND1);
xtext->resize_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_LEFT_SIDE); xtext->resize_cursor = gdk_cursor_new_for_display (gdk_window_get_display (widget->window), GDK_LEFT_SIDE);
#if !HAVE_GTK3 gtk_xtext_clear_background (widget);
gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
#else
gdk_window_set_background_pattern (widget->window, NULL);
#endif
backend_init (xtext); backend_init (xtext);
} }