AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

textutil: Do a little better on retro X servers

Browse Source 
When running on a non-composited, non-rgba X server
(such as Xnest), force the drag icons for text selections
to have a background, so we don't end up with black
text on black background.

Fixes: #3048
This commit is contained in:
Matthias Clasen 2020-08-08 18:06:12 -04:00
parent 765fe201ce
commit 75ad180c78
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtktextutil.c
View File

@ -108,10 +108,12 @@ gtk_text_util_create_drag_icon (GtkWidget *widget,
GtkCssStyle *style; GtkCssStyle *style;
GtkSnapshot *snapshot; GtkSnapshot *snapshot;
PangoContext *context; PangoContext *context;
PangoLayout *layout; PangoLayout *layout;
GdkPaintable *paintable; GdkPaintable *paintable;
int layout_width; int layout_width;
int layout_height;
const GdkRGBA *color; const GdkRGBA *color;
GdkDisplay *display;
g_return_val_if_fail (widget != NULL, NULL); g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (text != NULL, NULL); g_return_val_if_fail (text != NULL, NULL);
@ -133,6 +135,24 @@ gtk_text_util_create_drag_icon (GtkWidget *widget,
style = gtk_css_node_get_style (gtk_widget_get_css_node (widget)); style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
color = gtk_css_color_value_get_rgba (style->core->color); color = gtk_css_color_value_get_rgba (style->core->color);
display = gtk_widget_get_display (widget);
if (!gdk_display_is_rgba (display) ||
!gdk_display_is_composited (display))
{
GtkWidget *bg_widget;
if (GTK_IS_TEXT (widget))
bg_widget = gtk_widget_get_parent (widget);
else
bg_widget = widget;
pango_layout_get_size (layout, &layout_width, &layout_height);
gtk_snapshot_render_background (snapshot,
gtk_widget_get_style_context (bg_widget),
0, 0, layout_width / PANGO_SCALE,
layout_height / PANGO_SCALE);
}
gtk_snapshot_append_layout (snapshot, layout, color); gtk_snapshot_append_layout (snapshot, layout, color);
paintable = gtk_snapshot_free_to_paintable (snapshot, NULL); paintable = gtk_snapshot_free_to_paintable (snapshot, NULL);
@ -194,6 +214,7 @@ gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
GtkTextAttributes *style; GtkTextAttributes *style;
PangoContext *ltr_context, *rtl_context; PangoContext *ltr_context, *rtl_context;
GtkTextIter iter; GtkTextIter iter;
GdkDisplay *display;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL); g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
@ -251,6 +272,16 @@ gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
snapshot = gtk_snapshot_new (); snapshot = gtk_snapshot_new ();
display = gtk_widget_get_display (widget);
if (!gdk_display_is_rgba (display) ||
!gdk_display_is_composited (display))
{
gtk_snapshot_render_background (snapshot,
gtk_widget_get_style_context (widget),
0, 0, layout_width, layout_height);
}
gtk_text_layout_snapshot (layout, widget, snapshot, &(GdkRectangle) { 0, 0, layout_width, layout_height }, 1.0); gtk_text_layout_snapshot (layout, widget, snapshot, &(GdkRectangle) { 0, 0, layout_width, layout_height }, 1.0);
g_object_unref (layout); g_object_unref (layout);