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

Consolidated gtk_xtext_size_allocate to use a guarded window pointer before resizing, preserving GTK3 gtk_widget_get_window and GTK2 direct access paths.

Browse Source 
Aligned GTK3/GTK2 window selection blocks in scrolling/selection and render routines (including gtk_xtext_render_page) to use #else guards for GTK2 direct access.
This commit is contained in:
deepend
2026-01-29 21:57:50 -07:00
parent 31130197eb
commit 1584764809
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -940,6 +940,7 @@ gtk_xtext_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
{ {
GtkXText *xtext = GTK_XTEXT (widget); GtkXText *xtext = GTK_XTEXT (widget);
int height_only = FALSE; int height_only = FALSE;
GdkWindow *window;
if (allocation->width == xtext->buffer->window_width) if (allocation->width == xtext->buffer->window_width)
height_only = TRUE; height_only = TRUE;
@@ -956,17 +957,14 @@ gtk_xtext_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
xtext->buffer->window_height = allocation->height; xtext->buffer->window_height = allocation->height;
#if HAVE_GTK3 #if HAVE_GTK3
{ window = gtk_widget_get_window (widget);
GdkWindow *window = gtk_widget_get_window (widget);
if (window)
gdk_window_move_resize (window, allocation->x, allocation->y,
allocation->width, allocation->height);
}
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3
gdk_window_move_resize (widget->window, allocation->x, allocation->y, window = widget->window;
allocation->width, allocation->height);
#endif #endif
if (window)
gdk_window_move_resize (window, allocation->x, allocation->y,
allocation->width, allocation->height);
dontscroll (xtext->buffer); /* force scrolling off */ dontscroll (xtext->buffer); /* force scrolling off */
if (!height_only) if (!height_only)
gtk_xtext_calc_lines (xtext->buffer, FALSE); gtk_xtext_calc_lines (xtext->buffer, FALSE);
@@ -1644,8 +1642,7 @@ gtk_xtext_scrolldown_timeout (GtkXText * xtext)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif #else
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -1687,8 +1684,7 @@ gtk_xtext_scrollup_timeout (GtkXText * xtext)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif #else
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -1739,8 +1735,7 @@ gtk_xtext_selection_update (GtkXText * xtext, GdkEventMotion * event, int p_y, g
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif #else
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -4034,8 +4029,7 @@ gtk_xtext_render_ents (GtkXText * xtext, textentry * enta, textentry * entb)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif #else
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)
@@ -4132,8 +4126,7 @@ gtk_xtext_render_page (GtkXText * xtext)
#if HAVE_GTK3 #if HAVE_GTK3
window = gtk_widget_get_window (GTK_WIDGET (xtext)); window = gtk_widget_get_window (GTK_WIDGET (xtext));
#endif #else
#if !HAVE_GTK3
window = GTK_WIDGET (xtext)->window; window = GTK_WIDGET (xtext)->window;
#endif #endif
if (!window) if (!window)