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

Replaced GTK3 palette font styling with CSS-compliant properties derived from PangoFontDescription, avoiding the deprecated Pango font: syntax in generated CSS.

Browse Source 
Added a GTK3-only helper to translate Pango font fields into font-family, font-size, font-style, font-weight, font-variant, and font-stretch CSS declarations while preserving GTK2 behavior under #if !HAVE_GTK3.
Reused the GTK3 font CSS helper in the main UI font styling path to eliminate remaining Pango font: shorthand usage that triggers GTK3 theme parsing warnings.
Exposed the GTK3 font CSS helper in gtkutil so callers can emit CSS-compliant font properties consistently.
This commit is contained in:
deepend
2026-01-31 16:37:15 -07:00
parent d8a8e6ce73
commit 8abc95205a
4 changed files with 159 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,7 @@ xtext_surface_from_window (GdkWindow *window)
int height;
cairo_t *cr;
if (!window)
if (!window || !GDK_IS_WINDOW (window))
return NULL;
width = gdk_window_get_width (window);
@@ -925,14 +925,39 @@ gtk_xtext_get_pointer (GdkWindow *window, gint *x, gint *y, GdkModifierType *mas
#if !HAVE_GTK3
gdk_window_get_pointer (window, x, y, mask);
#else
GdkDisplay *display = gdk_window_get_display (window);
GdkSeat *seat = gdk_display_get_default_seat (display);
GdkDevice *device = gdk_seat_get_pointer (seat);
GdkDisplay *display;
GdkSeat *seat;
GdkDevice *device;
gint root_x = 0;
gint root_y = 0;
gint win_x = 0;
gint win_y = 0;
if (!window || !GDK_IS_WINDOW (window))
{
if (x)
*x = 0;
if (y)
*y = 0;
if (mask)
*mask = 0;
return;
}
display = gdk_window_get_display (window);
if (!display)
{
if (x)
*x = 0;
if (y)
*y = 0;
if (mask)
*mask = 0;
return;
}
seat = gdk_display_get_default_seat (display);
device = gdk_seat_get_pointer (seat);
if (!device)
{
if (x)
@@ -1049,8 +1074,16 @@ gtk_xtext_realize (GtkWidget * widget)
xtext->ts_x = xtext->ts_y = 0;
}
xtext->hand_cursor = gdk_cursor_new_for_display (gdk_window_get_display (window), GDK_HAND1);
xtext->resize_cursor = gdk_cursor_new_for_display (gdk_window_get_display (window), GDK_LEFT_SIDE);
if (window && GDK_IS_WINDOW (window))
{
GdkDisplay *display = gdk_window_get_display (window);
if (display)
{
xtext->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND1);
xtext->resize_cursor = gdk_cursor_new_for_display (display, GDK_LEFT_SIDE);
}
}
gtk_xtext_clear_background (widget);
@@ -2712,9 +2745,11 @@ gtk_xtext_selection_get (GtkWidget * widget,
#if HAVE_GTK3
GdkWindow *window = gtk_widget_get_window (widget);
if (!window)
if (!window || !GDK_IS_WINDOW (window))
break;
display = gdk_window_get_display (window);
if (!display)
break;
#endif
#if !HAVE_GTK3
display = gdk_window_get_display (widget->window);