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

Added the xtext_adjustment_apply helper to consolidate GTK2/GTK3 adjustment updates and direct field assignments.

Browse Source 
Updated adjustment setup and GTK3 buffer refresh logic to use the new helper and keep page increment/signaling handling consistent.
This commit is contained in:
deepend
2026-01-30 07:26:54 -07:00
parent 4cfe5274b5
commit 5f8dcd286e
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,6 +259,22 @@ xtext_adj_get_page_increment (GtkAdjustment *adj)
#endif #endif
} }
static void
xtext_adjustment_apply (GtkAdjustment *adj, gdouble lower, gdouble upper, gdouble value, gdouble page_size)
{
#if HAVE_GTK3
gtk_adjustment_set_lower (adj, lower);
gtk_adjustment_set_upper (adj, upper);
gtk_adjustment_set_page_size (adj, page_size);
gtk_adjustment_set_value (adj, value);
#else
adj->lower = lower;
adj->upper = upper;
adj->page_size = page_size;
adj->value = value;
#endif
}
static inline void static inline void
xtext_adj_set_page_increment (GtkAdjustment *adj, gdouble page_increment) xtext_adj_set_page_increment (GtkAdjustment *adj, gdouble page_increment)
{ {
@@ -689,11 +705,6 @@ gtk_xtext_adjustment_set (xtext_buffer *buf, int fire_signal)
buf->xtext->fontsize; buf->xtext->fontsize;
#endif #endif
xtext_adj_set_lower (adj, lower);
xtext_adj_set_upper (adj, upper);
xtext_adj_set_page_size (adj, page_size);
xtext_adj_set_page_increment (adj, page_size);
if (value > upper - page_size) if (value > upper - page_size)
{ {
buf->scrollbar_down = TRUE; buf->scrollbar_down = TRUE;
@@ -703,7 +714,8 @@ gtk_xtext_adjustment_set (xtext_buffer *buf, int fire_signal)
if (value < 0) if (value < 0)
value = 0; value = 0;
xtext_adj_set_value (adj, value); xtext_adjustment_apply (adj, lower, upper, value, page_size);
xtext_adj_set_page_increment (adj, page_size);
if (fire_signal) if (fire_signal)
{ {
@@ -5597,11 +5609,6 @@ gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render)
gtk_widget_get_allocation (GTK_WIDGET (xtext), &allocation); gtk_widget_get_allocation (GTK_WIDGET (xtext), &allocation);
page_size = allocation.height / xtext->fontsize; page_size = allocation.height / xtext->fontsize;
gtk_adjustment_set_lower (xtext->adj, lower);
gtk_adjustment_set_upper (xtext->adj, upper);
gtk_adjustment_set_page_size (xtext->adj, page_size);
gtk_adjustment_set_page_increment (xtext->adj, page_size);
if (value > upper - page_size) if (value > upper - page_size)
{ {
buf->scrollbar_down = TRUE; buf->scrollbar_down = TRUE;
@@ -5611,7 +5618,8 @@ gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render)
if (value < 0) if (value < 0)
value = 0; value = 0;
gtk_adjustment_set_value (xtext->adj, value); xtext_adjustment_apply (xtext->adj, lower, upper, value, page_size);
gtk_adjustment_set_page_increment (xtext->adj, page_size);
gtk_adjustment_value_changed (xtext->adj); gtk_adjustment_value_changed (xtext->adj);
} }
#else #else