summaryrefslogtreecommitdiff
path: root/gtk/gtktextdisplay.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-03-31 20:43:19 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-03-31 20:43:19 -0400
commitc2c4133eb0efdb3d407deec65a3014dda868f44d (patch)
tree80c6448833154ab8816b2d884a271483522a1e65 /gtk/gtktextdisplay.c
parent058986714c5e21b91d3a4d85a410ee2e940394e0 (diff)
downloadgtk+-c2c4133eb0efdb3d407deec65a3014dda868f44d.tar.gz
Fix up the border/background-color removal
I overlooked one level of indirection here. Oops.
Diffstat (limited to 'gtk/gtktextdisplay.c')
-rw-r--r--gtk/gtktextdisplay.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index 3f38112c88..de02bd3b47 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -569,7 +569,7 @@ render_para (GtkTextRenderer *text_renderer,
int byte_offset = 0;
PangoLayoutIter *iter;
int screen_width;
- GdkRGBA selection;
+ GdkRGBA *selection;
gboolean first = TRUE;
GtkCssNode *selection_node;
@@ -627,7 +627,7 @@ render_para (GtkTextRenderer *text_renderer,
cairo_t *cr = text_renderer->cr;
cairo_save (cr);
- gdk_cairo_set_source_rgba (cr, &selection);
+ gdk_cairo_set_source_rgba (cr, selection);
cairo_rectangle (cr,
line_display->left_margin, selection_y,
screen_width, selection_height);
@@ -683,7 +683,7 @@ render_para (GtkTextRenderer *text_renderer,
cairo_clip (cr);
cairo_region_destroy (clip_region);
- gdk_cairo_set_source_rgba (cr, &selection);
+ gdk_cairo_set_source_rgba (cr, selection);
cairo_rectangle (cr,
PANGO_PIXELS (line_rect.x),
selection_y,
@@ -706,7 +706,7 @@ render_para (GtkTextRenderer *text_renderer,
{
cairo_save (cr);
- gdk_cairo_set_source_rgba (cr, &selection);
+ gdk_cairo_set_source_rgba (cr, selection);
cairo_rectangle (cr,
line_display->left_margin,
selection_y,
@@ -730,7 +730,7 @@ render_para (GtkTextRenderer *text_renderer,
cairo_save (cr);
- gdk_cairo_set_source_rgba (cr, &selection);
+ gdk_cairo_set_source_rgba (cr, selection);
cairo_rectangle (cr,
PANGO_PIXELS (line_rect.x) + PANGO_PIXELS (line_rect.width),
selection_y,
@@ -771,11 +771,11 @@ render_para (GtkTextRenderer *text_renderer,
/* draw text under the cursor if any */
if (!line_display->cursor_at_line_end)
{
- GdkRGBA color;
+ GdkRGBA *color;
gtk_style_context_get (context, "background-color", &color, NULL);
- gdk_cairo_set_source_rgba (cr, &color);
+ gdk_cairo_set_source_rgba (cr, color);
text_renderer_set_state (text_renderer, CURSOR);
@@ -783,6 +783,7 @@ render_para (GtkTextRenderer *text_renderer,
line,
line_rect.x,
baseline);
+ gdk_rgba_free (color);
}
cairo_restore (cr);
@@ -793,6 +794,7 @@ render_para (GtkTextRenderer *text_renderer,
}
while (pango_layout_iter_next_line (iter));
+ gdk_rgba_free (selection);
pango_layout_iter_free (iter);
}